Merge branch 'upstream/latest' into debian/master

243 files changed, 64150 insertions, 47937 deletions

diff --git a/ChangeLog b/ChangeLog
index a4e5502..aeed6e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,1369 @@
 # Generated by Makefile. Do not edit.
 
+commit 6783d2946f41a9afea3fa3870dbbd75a7013f0e1
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Jul 26 10:27:25 2016 -0300
+
+    Adding libseed gresources and .in to DIST
+
+ jsextensions/Makefile.am | 9 +++++++--
+ libseed/Makefile.am      | 5 +++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+commit afc7cb9a10355fcebc6b3f9e98f8e89f0ee781be
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Jul 26 10:09:42 2016 -0300
+
+    removing /debian
+
+ debian/changelog |  59 --------------------
+ debian/control   |  47 ----------------
+ debian/copyright | 165 -------------------------------------------------------
+ debian/rules     |  61 --------------------
+ 4 files changed, 332 deletions(-)
+
+commit 5b73181d92c5f6910b12eeac5f3496cdfd982092
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed Jun 22 21:55:21 2016 -0300
+
+    Minor Cleanup (g_prints) in some GJS modules
+
+ modules/gjs/_gi/seed-gi.c        | 5 -----
+ modules/gjs/system/seed-system.c | 2 --
+ 2 files changed, 7 deletions(-)
+
+commit 0a2cce27c33c6041f8745184480adac38e2788e1
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed Jun 22 21:52:22 2016 -0300
+
+    Fixing ProgramInvocationName in system module
+    
+    The older module used to return a dummy "GnomeWeather" for string,
+    which was wrong.
+
+ libseed/seed-engine.c            | 53 ++++++++++++++++++++++------------------
+ libseed/seed-engine.h            |  2 +-
+ libseed/seed-private.h           |  1 +
+ libseed/seed.h                   |  1 +
+ modules/gjs/system/seed-system.c | 15 +-----------
+ 5 files changed, 33 insertions(+), 39 deletions(-)
+
+commit 224a69fb2a9f13b334f2e8315cb08ee4d48ca7f0
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed Jun 22 20:39:32 2016 -0300
+
+    Proper handling of null terminated C_TYPE_ARRAYS
+    
+    * implementation from GJS -> gi/arg.cpp
+
+ libseed/seed-types.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 88 insertions(+), 5 deletions(-)
+
+commit 6bd605370f3f3e1f19368c191a25aea336d987bc
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Fri Jun 17 14:11:29 2016 -0300
+
+    Moving all JS files to a GResource to improve uninstalled setup.
+    
+    At the current moment, uninstalled usage is really hard with seed.
+    If you try to run with: ./src/seed it runs, but it tries to read the
+    javascript files and native modules from the INSTALL PATH.
+    
+    This commit solve that issue for the javascript files, however native
+    modules still have the same issue.
+
+ .gitignore                          | 14 ++++---
+ Makefile.am                         |  6 +--
+ configure.ac                        |  1 -
+ jsextensions/Makefile.am            | 29 +++++++++----
+ jsextensions/Seed.js.in             |  5 ++-
+ jsextensions/gjs/Makefile.am        |  4 --
+ jsextensions/libseed.gresources.xml | 20 +++++++++
+ libseed/Makefile.am                 |  5 ++-
+ libseed/seed-api.c                  |  2 +-
+ libseed/seed-builtins.c             |  9 ++--
+ libseed/seed-engine.c               |  2 +-
+ libseed/seed-importer.c             | 83 ++++++++++++++++++++++++++++++++-----
+ libseed/seed-importer.h             |  5 +++
+ 13 files changed, 143 insertions(+), 42 deletions(-)
+
+commit abace8eec0ff693f38f0d8fab391d6e0bb846bbe
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jun 20 15:25:27 2016 -0300
+
+    Renaming extensions to jsextensions
+
+ Makefile.am                  |   2 +-
+ configure.ac                 |   4 +-
+ extensions/Clutter.js        |  67 -------
+ extensions/GLib.js           | 282 -----------------------------
+ extensions/GObject.js        |  31 ----
+ extensions/Gio.js            |  35 ----
+ extensions/Gst.js            |   8 -
+ extensions/Gtk.js            |  39 ----
+ extensions/Makefile.am       |  12 --
+ extensions/Seed.js.in        | 213 ----------------------
+ extensions/gjs/GLib.js       | 285 -----------------------------
+ extensions/gjs/GObject.js    | 413 -------------------------------------------
+ extensions/gjs/Gio.js        | 394 -----------------------------------------
+ extensions/gjs/Gtk.js        | 113 ------------
+ extensions/gjs/Makefile.am   |   4 -
+ extensions/repl.js           |  49 -----
+ jsextensions/Clutter.js      |  67 +++++++
+ jsextensions/GLib.js         | 282 +++++++++++++++++++++++++++++
+ jsextensions/GObject.js      |  31 ++++
+ jsextensions/Gio.js          |  35 ++++
+ jsextensions/Gst.js          |   8 +
+ jsextensions/Gtk.js          |  39 ++++
+ jsextensions/Makefile.am     |  12 ++
+ jsextensions/Seed.js.in      | 213 ++++++++++++++++++++++
+ jsextensions/gjs/GLib.js     | 285 +++++++++++++++++++++++++++++
+ jsextensions/gjs/GObject.js  | 413 +++++++++++++++++++++++++++++++++++++++++++
+ jsextensions/gjs/Gio.js      | 394 +++++++++++++++++++++++++++++++++++++++++
+ jsextensions/gjs/Gtk.js      | 113 ++++++++++++
+ jsextensions/gjs/Makefile.am |   4 +
+ jsextensions/repl.js         |  49 +++++
+ 30 files changed, 1948 insertions(+), 1948 deletions(-)
+
+commit 816a49e1edf6a087e67cf1779cdee9626fdc59fe
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jun 13 11:26:24 2016 -0300
+
+    minor coding style fix using chang-format
+
+ libseed/seed-engine.c |  5 ++---
+ libseed/seed-types.c  | 25 +++++++++++++++----------
+ 2 files changed, 17 insertions(+), 13 deletions(-)
+
+commit 5fe14cc348c51d0b4bee4e1e8be110fb6b8a97a1
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jun 13 11:25:48 2016 -0300
+
+    Proper deal with array returns when they are strings
+
+ libseed/seed-types.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+commit 0c00dc367ad4c38ded6e518eca7be2daf9628e36
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jun 13 11:23:51 2016 -0300
+
+    Make seed return an Array and not a "array like" object
+    
+    Returning an array like might work most of the cases,
+    however it fails to deal with:
+    
+    [r1, r2, r3] = something_from_c()
+
+ libseed/seed-engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cb868bcdfd5032adda003371a755748b5f903884
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jun 9 18:42:25 2016 -0300
+
+    Fix a issue when converting JSStrings to C arrays
+    
+    When transforming a string into an array we probably don't want the \0
+    character.
+    This behavior change make it more compatible to GJS, as GJS uses arrays
+    in that way. (see egJSON.js and gjs/example/http-server.js) example.
+
+ libseed/seed-types.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+commit 2614bdf076f5e90e1ce91ca3d86b540322f98d17
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed Jun 8 12:03:09 2016 -0300
+
+    Convert GValue to basic types whenever it's possible.
+    
+    GValues are cool, but not soo cool on javascrip.
+    So, whenever we can we should translate GValue to their basic types
+    before returning them to the JavaScript engine.
+
+ libseed/seed-types.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+commit 9e45c19695f40a4bfebdff584e7952dfb169fa5d
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Jun 7 10:54:47 2016 -0300
+
+    Add missing handler
+    
+    This fix a crash where a g_assert_not_reached() was called.
+
+ libseed/seed-types.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit eb749b146d81c26550999c3f1206a33888669ce7
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Jun 7 10:52:21 2016 -0300
+
+    Void function with one OUT arg should use arg as return value
+    
+    A void method with only one OUT argument should return this argument
+    itself. The old logic returns an array with only one index, which is
+    weird and not compatible with the gjs approach.
+
+ libseed/seed-engine.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+commit edcc73307f2a519fa6ddeb31fbfda40f5ae0771f
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jun 6 18:41:23 2016 -0300
+
+    Return objects as array starting from index zero
+    
+    When a method returns void but has OUT arguments, seed would return
+    an object similar as an Array, but the starting index is be 1 instead
+    of zero.
+    
+    This behavior is not correct, the starting index should always be zero.
+
+ libseed/seed-engine.c | 29 ++++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+commit 9e1266222b4e91fb115ed9e4c3dad7c8dfb2c129
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu May 26 15:55:05 2016 -0300
+
+    bumping seed version to major 4.0.0 release
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6af8554e61b1c16aa3e2fe0c1049303295a55086
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu May 26 15:54:45 2016 -0300
+
+    Making default webkit=4.0
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 4d859dc61590a4d5b3991ceee4b9ff279f1768a4
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed May 25 22:24:57 2016 -0300
+
+    Improving arguments prediction logic.
+    
+    Old system works only when the length arguments appears before the
+    array.
+    This commit makes it work for both cases (after and before).
+
+ libseed/seed-engine.c | 104 +++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 77 insertions(+), 27 deletions(-)
+
+commit 2d441004af6d556d79713ecd1dea3ea2fc64ea91
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed May 4 14:20:34 2016 -0300
+
+    Removing g_autofree usage
+    
+    g_autofree is not supported on all platforms
+
+ libseed/seed-engine.c   | 4 ++--
+ libseed/seed-importer.c | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+commit b5ba834f64838ad586447c114fe409ba2fcb1ef0
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Mar 17 14:27:13 2016 -0300
+
+    Implementing a dymmy _gi module
+    
+    Adding a module missing to deal with seed/gjs compatibility
+
+ configure.ac                |   1 +
+ modules/gjs/Makefile.am     |   2 +-
+ modules/gjs/_gi/Makefile.am |  22 ++++++
+ modules/gjs/_gi/seed-gi.c   | 181 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 205 insertions(+), 1 deletion(-)
+
+commit e64dbd22f8db5bda917978755f5d7f5c62f406fc
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Mar 14 11:38:18 2016 -0300
+
+    Making seed gjs-compatible by default
+
+ Makefile.am                    |  7 -------
+ configure.ac                   | 14 --------------
+ extensions/Makefile.am         |  2 --
+ libseed/seed-engine.c          | 18 +-----------------
+ libseed/seed-importer.c        | 20 ++++++++------------
+ libseed/seed-private.h         |  4 ----
+ modules/Makefile.am            |  2 --
+ modules/gjs/Makefile.am        |  4 ----
+ modules/gjs/system/Makefile.am |  6 ------
+ 9 files changed, 9 insertions(+), 68 deletions(-)
+
+commit 8cfcbe0caed11f780b50f2f99d835e3b270b92c4
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Mar 8 15:49:36 2016 -0300
+
+    Calling _init on external GI modules
+
+ extensions/gjs/GObject.js | 43 ++++++++++++++++++++++++-------------------
+ libseed/seed-importer.c   | 21 +++++++++++++++++----
+ 2 files changed, 41 insertions(+), 23 deletions(-)
+
+commit 2f018889098bfc545199ecd4fcfd73ecc6bbfe1d
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Mar 8 15:49:01 2016 -0300
+
+    Fixing a build issue with webkit3 and webkit4
+    
+    This avoids the issue when the build tries to import GTK2 and GTK3
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b8bd0859870d00a29ea33775e5cf7f73f1f4b8e8
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Mar 3 15:34:05 2016 -0300
+
+    Adding GjsPrivate module to Seed
+    
+    This GjsPrivate module will be accessed via GI for modules
+    inside the gjs extension in Seed.
+
+ Makefile.am                        |   2 +
+ configure.ac                       |   3 +
+ extensions/Seed.js.in              |   6 +
+ libgjs-private/Makefile.am         |  54 ++++++
+ libgjs-private/gjs-gdbus-wrapper.c | 336 +++++++++++++++++++++++++++++++++++++
+ libgjs-private/gjs-gdbus-wrapper.h |  74 ++++++++
+ libgjs-private/gjs-gtk-util.c      |  63 +++++++
+ libgjs-private/gjs-gtk-util.h      |  37 ++++
+ libgjs-private/gjs-util.c          | 110 ++++++++++++
+ libgjs-private/gjs-util.h          |  58 +++++++
+ 10 files changed, 743 insertions(+)
+
+commit 91ce78cd26d026724d20ecbbd55d6bab25d96abb
+Author: Alan Knowles <alan@roojs.com>
+Date:   Wed Mar 9 17:13:58 2016 +0800
+
+    remove g_autofree - its not well supported - needs to handle older complier/libs
+
+ libseed/seed-engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e1606109d724216552a69864c84612ddd2d5e666
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Feb 25 20:37:50 2016 -0300
+
+    Improving GJS compatibility mode (fixing returned Array).
+    
+    GJS returns OUT values as array:
+     array[0] is the real return valuer
+     array[1] is the first OUT value
+     array[2] is the second OUT value... and so on...
+    
+    So, basically I adapted the current way seed works
+    (using array["propertyName"]) to use array[NUMBER] instead.
+    
+    This patch was created in a way that no behavior shouldn't change
+    in case the experimental GJS_COMPATIBILITY_MODE is disabled.
+
+ libseed/seed-engine.c | 43 ++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 38 insertions(+), 5 deletions(-)
+
+commit 2cf5841a6eba1c8d7240a9482ed6944105d75e60
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed Feb 3 16:31:29 2016 -0200
+
+    Adding support for array lengh prediction.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=761517
+    
+    When user sends a string to a GI method that expects a regular gchar
+    array, usually it requires the user to also send the length of that
+    array.
+    
+    That shouldn't be necessary as the engine can guess that size.
+    
+    This is the behaviour this patch is implementing.
+
+ libseed/seed-closure.c |  1 +
+ libseed/seed-engine.c  | 43 +++++++++++++++++++++++++++++++------------
+ libseed/seed-structs.c |  2 ++
+ libseed/seed-types.c   | 41 ++++++++++++++++++++++++++++++++---------
+ libseed/seed-types.h   |  8 ++++++++
+ 5 files changed, 74 insertions(+), 21 deletions(-)
+
+commit bea6140cc0e678244a701c6c9effffefab7095d6
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Wed Feb 3 11:53:09 2016 -0200
+
+    new style rules based on clang-format
+    
+    By using clang-format, we're now able to enforce a single set
+    of rules for coyding style.
+    
+    There's no functionality change in this commit.
+
+ .clang-format                                  |    9 +
+ DEVELOPERS                                     |   20 +
+ libseed/seed-api.c                             |  496 ++--
+ libseed/seed-builtins.c                        |  982 ++++---
+ libseed/seed-builtins.h                        |    7 +-
+ libseed/seed-closure.c                         |  747 +++--
+ libseed/seed-closure.h                         |   83 +-
+ libseed/seed-debug.h                           |   54 +-
+ libseed/seed-engine.c                          | 2935 +++++++++----------
+ libseed/seed-engine.h                          |   60 +-
+ libseed/seed-exceptions.c                      |  207 +-
+ libseed/seed-exceptions.h                      |   27 +-
+ libseed/seed-gtype.c                           | 1658 +++++------
+ libseed/seed-gtype.h                           |    2 +-
+ libseed/seed-importer.c                        | 1609 +++++------
+ libseed/seed-importer.h                        |    7 +-
+ libseed/seed-module.h                          |   27 +-
+ libseed/seed-private.h                         |    8 +-
+ libseed/seed-signals.c                         |  631 ++--
+ libseed/seed-signals.h                         |   52 +-
+ libseed/seed-structs.c                         | 1181 ++++----
+ libseed/seed-structs.h                         |   63 +-
+ libseed/seed-types.c                           | 3666 +++++++++++-------------
+ libseed/seed-types.h                           |  327 ++-
+ libseed/seed.h                                 |  823 +++---
+ modules/DynamicObject/seed-DynamicObject.c     |  180 +-
+ modules/cairo/seed-cairo-enums.c               |  231 +-
+ modules/cairo/seed-cairo-enums.h               |    2 +-
+ modules/cairo/seed-cairo-image-surface.c       |  204 +-
+ modules/cairo/seed-cairo-image-surface.h       |    2 +-
+ modules/cairo/seed-cairo-matrix.c              |  401 +--
+ modules/cairo/seed-cairo-matrix.h              |   13 +-
+ modules/cairo/seed-cairo-pattern.c             |  269 +-
+ modules/cairo/seed-cairo-pattern.h             |   17 +-
+ modules/cairo/seed-cairo-pdf-surface.c         |  166 +-
+ modules/cairo/seed-cairo-pdf-surface.h         |    2 +-
+ modules/cairo/seed-cairo-surface.c             |  569 ++--
+ modules/cairo/seed-cairo-surface.h             |   11 +-
+ modules/cairo/seed-cairo.c                     | 2581 +++++++++--------
+ modules/cairo/seed-cairo.h                     |   11 +-
+ modules/canvas/seed-canvas.c                   | 1505 +++++-----
+ modules/dbus/dbus-exports.c                    |  714 +++--
+ modules/dbus/dbus-exports.h                    |    6 +-
+ modules/dbus/dbus-values.c                     | 1450 +++++-----
+ modules/dbus/dbus-values.h                     |   49 +-
+ modules/dbus/module.c                          | 1745 ++++++-----
+ modules/dbus/util/dbus-private.h               |   53 +-
+ modules/dbus/util/dbus-proxy.c                 |  471 ++-
+ modules/dbus/util/dbus-proxy.h                 |   95 +-
+ modules/dbus/util/dbus-signals.c               |  747 ++---
+ modules/dbus/util/dbus.c                       | 1707 +++++------
+ modules/dbus/util/dbus.h                       |  274 +-
+ modules/dbus/util/log.h                        |    2 +-
+ modules/example/seed-example.c                 |    6 +-
+ modules/ffi/seed-ffi.c                         |  825 +++---
+ modules/gettext/seed-gettext.c                 |  427 ++-
+ modules/gjs/system/seed-system.c               |  174 +-
+ modules/gtkbuilder/seed-gtkbuilder.c           |  117 +-
+ modules/libxml/seed-libxml.c                   |  772 +++--
+ modules/mpfr/seed-mpfr-arithmetic.c            |  817 +++---
+ modules/mpfr/seed-mpfr-cmp.c                   |  274 +-
+ modules/mpfr/seed-mpfr-trig.c                  |  840 +++---
+ modules/mpfr/seed-mpfr.c                       |  952 +++---
+ modules/mpfr/seed-mpfr.h                       |   36 +-
+ modules/multiprocessing/seed-multiprocessing.c |  271 +-
+ modules/os/seed-os.c                           | 1442 +++++-----
+ modules/readline/seed-readline.c               |  216 +-
+ modules/sandbox/seed-sandbox.c                 |  167 +-
+ modules/sqlite/seed-sqlite.c                   |  285 +-
+ modules/xorg/seed-xorg.c                       |   72 +-
+ src/args.c                                     |   71 +-
+ src/main.c                                     |  168 +-
+ tests/c/api-closure.c                          |   66 +-
+ tests/c/api-js-signal-from-c.c                 |   70 +-
+ tests/c/api-types.c                            |  205 +-
+ tests/c/basic.c                                |    5 +-
+ tests/c/main.c                                 |   59 +-
+ tests/c/test-common.h                          |   14 +-
+ 78 files changed, 18193 insertions(+), 19316 deletions(-)
+
+commit a12161e82b860264c668f61de2431737420fe1da
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 28 14:52:17 2016 -0200
+
+    Fixing some leaks
+
+ libseed/seed-engine.c   | 2 +-
+ libseed/seed-importer.c | 9 ++++++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 8af07e6ec714ba4d1167706b9d68d75047851b08
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 28 13:46:53 2016 -0200
+
+    Fixing some build warnings in seed-types.c
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=761150
+    
+    After a quick discussion we concluded that this was the best way to
+    get ride of those build warnings.
+
+ libseed/seed-types.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit e219ec213d20397b8ee01630e3d92144186d08d9
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 28 13:28:16 2016 -0200
+
+    Fixing seed_gi_make_array_from_string usage
+
+ libseed/seed-types.c | 29 ++++++++++++-----------------
+ 1 file changed, 12 insertions(+), 17 deletions(-)
+
+commit 9605b892f9de4bd38bc1eb095d629d7efe77e077
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Jan 26 10:55:27 2016 -0200
+
+    Adding support to convert from JSString to gi array
+    
+    When running some examples like the http-server from GJS, seed
+    failed to convert a string into an array, to serve as argument for
+    libsoup. This patch should fix that behavior.
+
+ libseed/seed-types.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 56 insertions(+)
+
+commit 5cbbebaa46a0fed4a21d380ebe353186820b9c9a
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Tue Jan 26 09:28:47 2016 -0200
+
+    Proper handle GHash
+
+ libseed/seed-closure.c | 2 ++
+ libseed/seed-types.c   | 9 ++++++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+commit abf3a105b0fd2d48440270df359417ee64e02101
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Fri Jan 8 17:35:04 2016 -0200
+
+    Adding support for YouCompleteMe vim plugin
+    
+    YouCompleteMe is a vim/atom plugin that uses clang-completer to provide
+    auto-completion, jump-to-definition and other developer tools on vim.
+    
+    There're a bunch of other opensource projects using it, such as firefox
+    and webkit.
+
+ .gitignore                  |   2 +
+ .ycm_extra_conf.py          | 114 ++++++++++++++++++++++++++++++++++++++++++++
+ doc/reference/xml/index.xml |   0
+ 3 files changed, 116 insertions(+)
+
+commit 0c87961e53352dbee7f5230bca586cbaac1e173b
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 14 14:23:22 2016 -0200
+
+    Implementing the gjs/system clearDateCache method
+
+ modules/gjs/system/seed-system.c | 23 +++++------------------
+ 1 file changed, 5 insertions(+), 18 deletions(-)
+
+commit c2776a684222220fee4d85e5a64849dd7183e939
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 14 14:12:37 2016 -0200
+
+    Implementing the gjs/system exit method
+
+ modules/gjs/system/seed-system.c | 29 +++++++++++++++++------------
+ 1 file changed, 17 insertions(+), 12 deletions(-)
+
+commit 339ac729b4fe7dc2d16a660b62ae29c050b90367
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 14 13:54:31 2016 -0200
+
+    Implementing the gjs/system gc method
+
+ modules/gjs/system/seed-system.c | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
+
+commit ef4098faaa5afcbf8011b44a442ae5c998d8c54b
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 14 13:47:33 2016 -0200
+
+    Implementing the gjs/system breakpoint method
+
+ modules/gjs/system/seed-system.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+commit f5b53fd9fb0c77db32683be5fad88a0ade198109
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 14 13:43:44 2016 -0200
+
+    Implementing the gjs/system refcount method
+
+ modules/gjs/system/seed-system.c | 32 +++++++++-----------------------
+ 1 file changed, 9 insertions(+), 23 deletions(-)
+
+commit 6295f62bc1447f2e7aa93a865567e9656bfb0f55
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Thu Jan 14 13:28:05 2016 -0200
+
+    Implementing the gjs/system addressOf method
+
+ modules/gjs/system/seed-system.c | 39 +++++++++++++++++----------------------
+ 1 file changed, 17 insertions(+), 22 deletions(-)
+
+commit a17bdc78aa8d6f8342b482c0fc58a32bcc3bf5c1
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 16:28:17 2016 -0200
+
+    Fixing cairo_curve_to method
+    
+    y1 value wasn't being used. y2 was being used twice.
+
+ modules/cairo/seed-cairo.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 32609fc19f7738846a919463054c49b3be13959b
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 16:05:24 2016 -0200
+
+    Fixing "unused code" warning
+    
+    Removed some code and use others to give some warnings if needed.
+
+ libseed/seed-signals.c      |  7 +------
+ libseed/seed-structs.c      |  4 ++++
+ modules/dbus/dbus-exports.c |  3 ---
+ modules/dbus/module.c       | 11 ++++-------
+ 4 files changed, 9 insertions(+), 16 deletions(-)
+
+commit 64956a6c042c045fbdf76da80c83eb7c4214e381
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 16:02:05 2016 -0200
+
+    minor: removing some unused code
+    
+    C = format is already being done by the next for loop.
+
+ libseed/seed-api.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+commit ade49dbc60fbecc28285063d4a95f409f241c52c
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 13:17:46 2016 -0200
+
+    Fixing some uninitialized buffer
+
+ libseed/seed-builtins.c | 4 ++--
+ modules/dbus/module.c   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 37c70b82487785bae940ea795edfe72acdf3cd89
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:40:45 2016 -0200
+
+    Fixing a 'not defined inline function' error
+
+ modules/mpfr/seed-mpfr.c | 2 +-
+ modules/mpfr/seed-mpfr.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 350f89e39c2ec4974681e3f1fb8ee69e21b1922d
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:38:52 2016 -0200
+
+    Using the ret value for mpfr operations
+
+ modules/mpfr/seed-mpfr-arithmetic.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 55f2b92e3537a3158a89b75c507544800fb410b3
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:28:52 2016 -0200
+
+    Fixing build warnings by avoid using deprecated/unsecure code.
+
+ libseed/seed-types.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 87a14cc39112f6da3ceaac22a1992bb382c0d4dc
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:26:30 2016 -0200
+
+    Fixing minor build warnings due to deprecated symbols
+
+ libseed/seed-engine.c | 2 ++
+ src/main.c            | 2 ++
+ 2 files changed, 4 insertions(+)
+
+commit 5b06dc2e02d430ce23ce5d354b45909c74b36c72
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:23:51 2016 -0200
+
+    Fixing minor build warnings
+
+ libseed/seed-engine.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit eb31dac6a2918034fc17da2faa2f61e0b08199c2
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:17:46 2016 -0200
+
+    Fixing incorrect header ifndef
+    
+    The ifdnef rule is incorrect for those files
+
+ modules/cairo/seed-cairo-image-surface.h | 2 +-
+ modules/cairo/seed-cairo-pdf-surface.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 47d6a8325dd6f2608f6af256f4802ea8c689047e
+Author: Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+Date:   Mon Jan 11 11:14:21 2016 -0200
+
+    Fixing importer
+    
+    After caab25e4c8ae5a463eb256e3012c7e4f4d7be7bc the import system of
+    native modules got broken.
+    
+    By checking the caab25e4c8ae5a463eb256e3012c7e4f4d7be7bc, seems like
+    the logic was a bit changed, allowing the importer to keep importing
+    things after the module was successfully loaded.
+    
+    This commit should fix that.
+
+ libseed/seed-importer.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 53b6d3841ce4975e3f353eda68e405799f40dcc1
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Thu Dec 17 15:23:05 2015 +0000
+
+    Add the native gjs module dummy "system" for compatibility
+    
+    This is just a dummy. The functions should be implemented.
+    It shows how to implement native gjs compatibility modules.
+    It has the flaw, that the js compatibility modules do not recognice
+    native gjs compatibility  modules, this should be solved.
+    I get this running gjs code:
+    
+    ** (seed:27750): CRITICAL **: Line 49 in
+    /usr/local/share/seed-gtk4/gjs/package.js:
+    TypeError undefined is not an object
+    (evaluating 'System.programInvocationName')
+    
+    It do not harm to integrate this
+    patch, even when it is just a dummy.
+
+ Makefile.am                      |  11 ++
+ configure.ac                     |   1 +
+ modules/gjs/Makefile.am          |   2 +
+ modules/gjs/system/Makefile.am   |  28 ++++
+ modules/gjs/system/seed-system.c | 267 +++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 309 insertions(+)
+
+commit 5adba6cbffd39fe9dea801e4974eb2282d4efae2
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Thu Dec 17 15:16:45 2015 +0000
+
+    Add the gjs native module "window" for compatibility
+    
+    This adds an empty window object to the global namespace.
+    Some JS gjs modules expect it to be there.
+
+ libseed/seed-engine.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit caab25e4c8ae5a463eb256e3012c7e4f4d7be7bc
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Thu Dec 17 14:33:31 2015 +0000
+
+    Add gjs compatibility layer to seed
+    
+    This Adds the following:
+     * Add all js modules and extensions from gjs to the
+       seed codebase.
+     * Add a compile time flag to build with and without support.
+     * Add a runtime commandline to switch compatibility mode on and off.
+     * Loads the gjs modules first if commandline switch is given and do
+       not load seed modules if a gjs module is present.
+    
+    Note:
+    Not all gjs modules are working because of missing native modules in seed.
+    There are: window, system, cairo and console.
+    They need to be ported.
+    The gjs modules are expected to start working when they are ported.
+    
+    This patch will not change current behaviour of seed when
+    --seed-gjs-compatibility commandline is not given or when gjs support
+    is not build in.
+    Current seed code should still work.
+
+ configure.ac               |  17 +
+ extensions/Makefile.am     |   4 +
+ extensions/gjs/GLib.js     | 285 +++++++++++++
+ extensions/gjs/GObject.js  | 408 +++++++++++++++++++
+ extensions/gjs/Gio.js      | 394 ++++++++++++++++++
+ extensions/gjs/Gtk.js      | 113 ++++++
+ extensions/gjs/Makefile.am |   4 +
+ libseed/Makefile.am        |   1 +
+ libseed/seed-engine.c      |  10 +
+ libseed/seed-importer.c    |  97 +++--
+ libseed/seed-private.h     |   4 +
+ modules/Makefile.am        |   4 +
+ modules/gjs/Makefile.am    |   8 +
+ modules/gjs/cairo.js       | 147 +++++++
+ modules/gjs/coverage.js    | 978 +++++++++++++++++++++++++++++++++++++++++++++
+ modules/gjs/format.js      |  86 ++++
+ modules/gjs/gettext.js     |  99 +++++
+ modules/gjs/jsUnit.js      | 473 ++++++++++++++++++++++
+ modules/gjs/lang.js        | 488 ++++++++++++++++++++++
+ modules/gjs/mainloop.js    |  87 ++++
+ modules/gjs/package.js     | 247 ++++++++++++
+ modules/gjs/signals.js     | 146 +++++++
+ 22 files changed, 4064 insertions(+), 36 deletions(-)
+
+commit 4941addf6d0967391ee6c9db8ab253ca3bce900d
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Wed Dec 9 12:24:05 2015 +0000
+
+    Made named constuctors compatible with gjs
+    
+    In gjs you can call named constuctors like this:
+    var x = Object.new(parameter)
+    var x = Object.new_from_file(parameter)
+    In seed this is:
+    var x = new Object.c_new(parameter)
+    var x = new Object.from_file(parameter)
+    
+    This patch adds the possibility to call named constructors as methods,
+    register a version of constructors named "new" as "c_new" and "new" and
+    register constructors named new_* also with their native names.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ libseed/seed-engine.c   |  9 +++++++--
+ libseed/seed-importer.c | 32 ++++++++++++++++++++++++--------
+ 2 files changed, 31 insertions(+), 10 deletions(-)
+
+commit 15fcda0eee42ea1aa31ed149aad85064ceacaada
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Tue Dec 8 09:32:14 2015 +0000
+
+    Add support for the global ARGV object
+    
+    In seed command line parameter will be provided by the Seed.argv
+    object. In gjs this is done with the global ARGV object. Also,
+    the count of parameter is different. While in seed the command
+    line is completly provided, in gjs the first 2 parameter are obmitted.
+    
+    This patch add support for the ARGV object in seed.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ libseed/seed-builtins.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-engine.c   |  1 +
+ 2 files changed, 64 insertions(+), 3 deletions(-)
+
+commit 1601af1546e5705d7c8721db926964425705acc2
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Mon Dec 7 16:05:35 2015 +0000
+
+    Made GLib variable in seed.js scoped
+    
+    In seed.js the GLib variable is global. This is no problem as long
+    there is no const or let keyword in jsc.
+    After adding this keywords by supporting the new webkit2gtk4.0 port,
+    you get the following error.
+    
+    SyntaxError Can't create duplicate variable that shadows a global
+    property: 'GLib'
+    
+    This patch make the GLib variable const which also limit the scope
+    of it.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ extensions/Seed.js.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 478153d22c8a615af019dc5d7e8885752253a4f2
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Mon Dec 7 15:51:27 2015 +0000
+
+    Add missing log and logError functions to global object
+    
+    Gjs has log and logError functions on global object.
+    To make seed more compatible to gjs, this function were added
+    to the global object.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ libseed/seed-builtins.c | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+commit cfec9907ca6063f2574ac6f8a000ede87550a441
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Mon Dec 7 11:55:13 2015 +0000
+
+    Add support for NULL value in init function
+    
+    In gjs it is possible to provide NULL to init functions.
+    With this patch seed is also able to handle NULL as empty array in
+    init functions.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ libseed/seed-engine.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit 08df6507d7702f39224253891f696e9d12f2f124
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Mon Dec 7 11:48:39 2015 +0000
+
+    Add support for gjs signal connections
+    
+    In gjs signals will be connected with:
+    Object.connect("signal-name", function)
+    In seed it is:
+    Object.signal.signal_name.connect(function) or
+    Object.signal["signal-name"].connect(function)
+    With this patch seed is also able to process gjs style
+    signal connections.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ libseed/seed-engine.c  | 3 +++
+ libseed/seed-signals.c | 2 +-
+ libseed/seed-signals.h | 7 +++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+commit 6d512b5c4d774a9853b51dae464a10cea7e3423a
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Mon Dec 7 11:40:05 2015 +0000
+
+    Add support for new webkit version 4.0 to build system
+    
+    Add new configure value for option --with-webkit.
+    Now you can add 4.0 as value to --with-webkit.
+    Default is still 3.0.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759171
+
+ configure.ac | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+commit 8012eea197d4366bd7ec72cc57aaf0db897509ec
+Author: Peter Rustler <peter.rustler@basyskom.com>
+Date:   Mon Dec 7 16:52:41 2015 +0000
+
+    Bugfix: Made Seed.argv check for invalid array parameter
+    
+    Seed.argv will drop a segfault when you access the array out of
+    range.
+    
+    This patch add checking for valid value of array index.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=759172
+
+ libseed/seed-builtins.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+commit a015bdb33c3bdd7f250a842c7be8062d483598b8
+Author: Sebastian Dröge <sebastian@centricular.com>
+Date:   Thu Jan 8 10:20:46 2015 +0100
+
+    engine: Don't call JSValueUnprotect() from the finalizer of the object
+    
+    JSValueUnprotect() would be called from g_object_set_data_full() via the
+    destroy notify we set for the data before. Steal the qdata instead as this
+    won't call the destroy notify, and we don't have to clean up anything here.
+    
+    We would not get here at all anyway if the object still had a "protect count"
+    higher than 0, as that would prevent the GC from cleaning up the object.
+    
+    Also the docs say:
+    
+    You must not call any function that may cause a garbage collection or an allocation
+    of a garbage collected object from within a JSObjectFinalizeCallback. This includes
+    all functions that have a JSContextRef parameter.
+    
+    Also consistently use the qdata variants of the functions instead of the data
+    variants that take a string instead of a quark.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=742574
+
+ libseed/seed-engine.c | 9 +++++++--
+ libseed/seed-types.c  | 2 +-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 5a8d67438843c82eb9493114b7214b98c2c66431
+Author: Sebastian Dröge <sebastian@centricular.com>
+Date:   Thu Jan 8 10:16:47 2015 +0100
+
+    closure: Don't call JSValueUnprotect() from a finalizer
+    
+    We would not get here at all anyway if the object still had a "protect count"
+    higher than 0, as that would prevent the GC from cleaning up the object.
+    
+    Also the docs say:
+    
+    You must not call any function that may cause a garbage collection or an allocation
+    of a garbage collected object from within a JSObjectFinalizeCallback. This includes
+    all functions that have a JSContextRef parameter.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=742574
+
+ libseed/seed-closure.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+commit 0b2df4d5b17f1034a058cd8d0069807a3cefeba1
+Author: Nirbheek Chauhan <nirbheek@centricular.com>
+Date:   Mon Nov 10 18:38:09 2014 +0530
+
+    modules/DynamicObject: Add missing LIBS
+
+ modules/DynamicObject/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit d114ef8e1c2c42e1e8e70381cbbca6f9ef7f3166
+Author: Sebastian Dröge <sebastian@centricular.com>
+Date:   Mon Nov 10 14:09:13 2014 +0100
+
+    seed-types: Keep another reference around for seed when handling (transfer full) function arguments
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=739879
+
+ libseed/seed-closure.c | 2 +-
+ libseed/seed-engine.c  | 4 +++-
+ libseed/seed-structs.c | 6 +++---
+ libseed/seed-types.c   | 5 +++++
+ libseed/seed-types.h   | 1 +
+ libseed/seed.h         | 1 +
+ 6 files changed, 14 insertions(+), 5 deletions(-)
+
+commit ad66195e1bb6d7cccabdaa0173895a631cdf141d
+Author: Laurent Bigonville <bigon@bigon.be>
+Date:   Wed Oct 8 00:25:22 2014 +0200
+
+    Only export symbols starting with seed_
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=710732
+
+ libseed/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit deba4fc2da293ee8f6cf6cb372737d59ca7614d1
+Author: Pino Toscano <toscano.pino@tiscali.it>
+Date:   Mon Aug 4 16:20:16 2014 +0800
+
+    Fix Bug #733393 - Fails to run on GNU/Hurd
+    
+    reverts BSD changes to use realpath with NULL (which allocates the path)
+    
+    Patch by Pino Toscano
+
+ libseed/seed-importer.c | 19 +++++--------------
+ modules/os/seed-os.c    | 14 ++------------
+ 2 files changed, 7 insertions(+), 26 deletions(-)
+
+commit c8988773f309c2fb8bbd41ee9fb38172a2706073
+Author: Andre Klapper <a9016009@gmx.de>
+Date:   Thu Jul 31 21:30:26 2014 +0200
+
+    doap: add <programming-language>
+
+ seed.doap | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9dc7e7b202bd99ab3c48c72e73bd879b2c1a8bf8
+Author: Olav Vitters <olav@vitters.nl>
+Date:   Wed Jul 30 20:42:33 2014 +0200
+
+    doap category core
+
+ seed.doap | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit cf772e792fd64f70ee2c714e0b5eaf527ce35467
+Author: Alan Knowles <alan@roojs.com>
+Date:   Tue Mar 25 18:14:03 2014 +0800
+
+    Fix Bug 725602 - typedef int Function () is removed in readline 6.3
+    
+    as per readline documents use rl_command_func_t
+
+ modules/readline/seed-readline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 76483e5784807e12279fc4c0be86d89a63c61beb
+Author: Alan Knowles <alan@roojs.com>
+Date:   Tue Jan 14 12:25:29 2014 +0800
+
+    Bug 722116 - Some LC_* variables are not portable
+    
+    wrap with ifdefs
+
+ modules/gettext/seed-gettext.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+commit 3197ab017938ea6d3b344da6268a83ed5692631a
+Author: Ting-Wei Lan <lantw@gmail.com>
+Date:   Tue Jan 14 12:18:11 2014 +0800
+
+    Bug 722080 - Use -ldl is not portable
+    
+    (missed a part of the patch)
+
+ libseed/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 32a74b581a159e965f059454c30d36775be8cc7b
+Author: Ting-Wei Lan <lantw@gmail.com>
+Date:   Tue Jan 14 11:44:03 2014 +0800
+
+    Bug 722115 - %Zd is not portable
+    
+    It seems %Zd is recognized by Linux libc 5, but it is not portable. %zd should
+    be used instead.
+
+ doc/reference/tmpl/seed-exception.sgml | 2 +-
+ libseed/seed-module.h                  | 2 +-
+ modules/cairo/seed-cairo.h             | 2 +-
+ modules/ffi/seed-ffi.c                 | 4 ++--
+ modules/mpfr/seed-mpfr.c               | 4 ++--
+ modules/os/seed-os.c                   | 2 +-
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
+commit ae57b166a515b38b28bd04b00987588f196f09ba
+Author: Ting-Wei Lan <lantw@gmail.com>
+Date:   Tue Jan 14 11:21:55 2014 +0800
+
+    Bug 722080 - Use -ldl is not portable
+    
+    Some systems do not have libdl, and functions such as dlsym() may already exist
+    in libc. We should check whether it is required to link to libdl, or it will
+    cause error on systems which does not have libdl.
+
+ configure.ac        | 5 +++++
+ libseed/Makefile.am | 1 +
+ 2 files changed, 6 insertions(+)
+
+commit 18f573e2af099936363a309141e264d1ccf447b2
+Author: Laurent Bigonville <l.bigonville@edpnet.be>
+Date:   Mon Oct 28 16:08:56 2013 +0800
+
+    Bug 710670 - Missing explicit link against libgmodule
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=710670
+    
+    Libseed is explicitly using using g_modules_* function but it's not linking
+    against it libgmodule.
+
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 117b9d1bc42e9a7ac12207084473be1b6520a5cb
+Author: Laurent Bigonville <l.bigonville@edpnet.be>
+Date:   Mon Oct 28 16:06:27 2013 +0800
+
+    Bug 710658 - Fix seed_make_exception format string
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=710658
+    
+    Fixes seed 3.8.1 which is FTBFS when compiled with the -Werror=format-security
+
+ libseed/seed-types.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+commit 24c5968e2ae3bdc49811329fa722035dba76db01
+Author: Seán de Búrca <leftmostcat@gmail.com>
+Date:   Mon Aug 26 15:16:45 2013 -0600
+
+    Fix autogen and configure
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=706833
+
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit e0fa4100054b10707e46f65a793b455d0e0c27dc
+Author: Alban Crequy <alban.crequy@collabora.co.uk>
+Date:   Wed Jul 31 15:03:49 2013 +0100
+
+    printing gobjects: print the address in memory in addition to the gtype
+    
+    It is useful for debugging. The output will be this:
+    
+    > print (file_chooser);
+    [gobject GtkFileChooserDialog 0x211c230]
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=705205
+
+ libseed/seed-engine.c | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+commit c8f3c1cabcea5976ca6c46804281725b207390a3
+Author: Alban Crequy <alban.crequy@collabora.co.uk>
+Date:   Fri Apr 5 17:49:28 2013 +0100
+
+    Support static methods on interfaces
+    
+    Static methods on a GObject can be called on Namespace.Type.Function() but
+    static methods on an interface cannot be called on
+    Namespace.Interface.Function().
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=697377
+
+ libseed/seed-importer.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 54 insertions(+)
+
+commit c4c4fcf762a461c23b55e9da1ffc743285b50e4c
+Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
+Date:   Wed Jun 12 11:13:36 2013 +0200
+
+    seed_exception_to_string: don't leak the stack msg
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=702081
+
+ libseed/seed-exceptions.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 96e375f91cdeb48dc4d5da7f24d4ce0f8a1b54e9
+Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
+Date:   Wed Jun 12 11:10:12 2013 +0200
+
+    seed_script_destroy: only unref source_url if it exists
+    
+    Fixes a crash when creating a script with a NULL source_url,
+    which is documented to be fine.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=702082
+
+ libseed/seed-api.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 430a457e3e29eacdb2f93bcd234545fad6191fe6
+Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
+Date:   Wed Jun 12 15:39:12 2013 +0200
+
+    Publicly export seed_exception_get_stack
+    
+    It is documented as a public function and exposed in the ABI,
+    but not exported in the public headers.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=702090
+
+ libseed/seed.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b8732050680386182c7a7e700e49443484ec582c
+Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
+Date:   Wed Jun 12 11:12:06 2013 +0200
+
+    seed_create_script: fix line_number param documentation
+    
+    seed_create_script takes an int for line_number, so it can't
+    be passed NULL.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=702094
+
+ libseed/seed-api.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a7a2627b527000749d595b6aa8dcfe018ff306dd
+Author: Alban Crequy <alban.crequy@collabora.co.uk>
+Date:   Fri Apr 26 19:18:51 2013 +0100
+
+    fix toggle refs
+    
+    When an object is unreffed from other C code and the last reference is the seed
+    toggle reference, g_object_remove_toggle_ref() could be called from
+    seed_gobject_finalize() through the javascript garbage collector.
+    
+    The "data" parameter given to g_object_remove_toggle_ref() must be the same as
+    the one used at g_object_add_toggle_ref-time in seed_wrap_object(), otherwise
+    the toggle callback seed_toggle_ref will not be called and a critical warning
+    "couldn't find toggle ref" might be printed.
+    
+    Additionally, g_object_run_dispose() must not be called after
+    g_object_remove_toggle_ref() since gobject will be freed by then.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=698988
+
+ libseed/seed-engine.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+commit e43d6c82c7b61ed2fc643fde03d21404d126e0d7
+Author: Alan Knowles <alan@akbkhome.com>
+Date:   Wed Apr 17 00:44:11 2013 +0800
+
+    modules.js test fixed = use Seed.argv to do remote call
+
+ tests/javascript/modules.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c140c89c4b99fc9734b34267236ada8bd0bc5aa4
+Author: Alan Knowles <alan@akbkhome.com>
+Date:   Wed Apr 17 00:42:12 2013 +0800
+
+    fix sqlite test - not a perfect way of doing this.. but it works.. - we should really avoid naming the test files the same as the modules - it confuses the importer a bit.
+
+ tests/javascript/sqlite.js | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit f73efe952e589e3be1508722eb1ec08c064a6fd1
+Author: Alan Knowles <alan@akbkhome.com>
+Date:   Wed Apr 17 00:26:24 2013 +0800
+
+    down to 1 failure on make check - this patch fixes the argv failure - when run under make check
+
+ tests/javascript/argv.js | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 8aa5a15ee3743028a0b79c0cef3534dbe2f0bdce
+Author: Alan Knowles <alan@akbkhome.com>
+Date:   Wed Apr 17 00:16:46 2013 +0800
+
+    window.signal.draw.connect only tirggers once now, to twice
+
+ tests/javascript/gdk-event.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 05267e3f011abd808bae9e65c6039168e959dea5
+Author: Alan Knowles <alan@akbkhome.com>
+Date:   Wed Apr 17 00:10:58 2013 +0800
+
+     fix function-info.js test - base_info_info should be GIRepoistory.BaseInfo now - however if enabled, the code goes into a recursive loop and crashes
+
+ libseed/seed-engine.c             | 7 ++++---
+ tests/javascript/function-info.js | 9 +++++----
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+commit 0230776ce7753f43df3e6d40336c48c784840fbd
+Author: Tim Horton <hortont424@gmail.com>
+Date:   Tue Apr 16 03:15:03 2013 -0700
+
+    Post-release version bump.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cdb710756e4c7b0c519824dab60395eda6655f13
+Author: Tim Horton <hortont424@gmail.com>
+Date:   Tue Apr 16 03:14:21 2013 -0700
+
+    Add a missing file to extensions' EXTRA_DIST
+
+ extensions/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit e76fa5e078b80a3d76a0eb57861dcd659ce30bad
 Author: Tim Horton <hortont424@gmail.com>
 Date:   Tue Apr 16 01:48:58 2013 -0700
 
     Add Alan to maintainers
 
- MAINTAINERS |    5 +++++
- seed.doap   |    9 ++++++++-
+ MAINTAINERS | 5 +++++
+ seed.doap   | 9 ++++++++-
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 3e3a98162f9fd3d3359d64dfd20ce5a9cbeccb1e
@@ -16,7 +1372,7 @@ Date:   Tue Apr 16 01:00:03 2013 -0700
 
     Post-release version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8d2d46cb16232a9c9744c7cf67dd496e62bd9adb
@@ -25,8 +1381,8 @@ Date:   Tue Apr 16 00:59:24 2013 -0700
 
     Seed 3.8
 
- NEWS         |    4 ++++
- configure.ac |    2 +-
+ NEWS         | 4 ++++
+ configure.ac | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit e03106d8d3ae328186d35eb41bb47048d7dadd31
@@ -42,7 +1398,7 @@ Date:   Sun Mar 31 22:45:52 2013 +0800
     
     Still not close to gjs memory but a small improvement..
 
- ondemand.namespace.diff |  697 +++++++++++++++++++++++++++++++++++++++++++++++
+ ondemand.namespace.diff | 697 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 697 insertions(+)
 
 commit d4c63f31cb0d310754df21e4150a838604ac07ba
@@ -53,11 +1409,11 @@ Date:   Wed Feb 6 14:49:10 2013 +0000
     
     https://bugzilla.gnome.org/show_bug.cgi?id=695857
 
- libseed/seed-closure.c |   16 ++++++++++++---
- libseed/seed-closure.h |    8 ++++++++
- libseed/seed-signals.c |   26 +++++++++++++++++++++---
- libseed/seed-types.c   |   51 +++++++++++++++++++++++++++++++++++++++++++++---
- libseed/seed-types.h   |    4 ++++
+ libseed/seed-closure.c | 16 +++++++++++++---
+ libseed/seed-closure.h |  8 ++++++++
+ libseed/seed-signals.c | 26 ++++++++++++++++++++++---
+ libseed/seed-types.c   | 51 +++++++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-types.h   |  4 ++++
  5 files changed, 96 insertions(+), 9 deletions(-)
 
 commit c4ee2c531c577622b61d4bb4b8908d186f69be83
@@ -68,7 +1424,7 @@ Date:   Fri Mar 29 20:59:45 2013 +0800
     
     https://bugzilla.gnome.org/show_bug.cgi?id=696547
 
- libseed/seed-engine.c |    8 ++++++--
+ libseed/seed-engine.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 29462f933d6068fa45281fbc0b47719ef4983c30
@@ -82,7 +1438,7 @@ Date:   Thu Mar 14 17:38:09 2013 -0300
     code. This is bad because fixes need to be applied to both, a great
     oportunity for code reuse.
 
- libseed/seed-closure.c |   16 +++-------------
+ libseed/seed-closure.c | 16 +++-------------
  1 file changed, 3 insertions(+), 13 deletions(-)
 
 commit 919efb474ed04853b9aff6622148a9be0ddc9a68
@@ -97,7 +1453,7 @@ Date:   Thu Mar 14 17:27:08 2013 -0300
     
     https://bugzilla.gnome.org/show_bug.cgi?id=695876
 
- libseed/seed-closure.c |    4 ++--
+ libseed/seed-closure.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit afdf68ea8bc6a039e2d5d9fe047f4953f58f8a3b
@@ -106,11 +1462,11 @@ Date:   Wed Feb 27 07:48:36 2013 +0800
 
     part fix to bug #694458 - first step to getting make check working - passes most tests, just need to add fix module lookup path
 
- libseed/seed-signals.c               |    2 ++
- tests/javascript/Makefile.am         |    3 +++
- tests/javascript/gtypes/Makefile.am  |    4 ++++
- tests/javascript/signals/Makefile.am |    4 ++++
- tests/javascript/structs/Makefile.am |    3 +++
+ libseed/seed-signals.c               | 2 ++
+ tests/javascript/Makefile.am         | 3 +++
+ tests/javascript/gtypes/Makefile.am  | 4 ++++
+ tests/javascript/signals/Makefile.am | 4 ++++
+ tests/javascript/structs/Makefile.am | 3 +++
  5 files changed, 16 insertions(+)
 
 commit 2d56f604a04a784c7948aef586f7926acdd64e95
@@ -123,7 +1479,7 @@ Date:   Mon Feb 11 16:10:03 2013 +0000
     
     https://bugzilla.gnome.org/show_bug.cgi?id=618454
 
- libseed/seed-types.c |  145 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-types.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 145 insertions(+)
 
 commit ebe57fe1fdcff23e1d3f272da39ed49f0e074418
@@ -134,8 +1490,8 @@ Date:   Tue Jan 29 13:10:09 2013 +0100
     
     https://bugzilla.gnome.org/show_bug.cgi?id=692794
 
- libseed/seed-importer.c |   22 ++++++++++++++++++++++
- libseed/seed.h          |    2 +-
+ libseed/seed-importer.c | 22 ++++++++++++++++++++++
+ libseed/seed.h          |  2 +-
  2 files changed, 23 insertions(+), 1 deletion(-)
 
 commit a8d295ef526b8ffe67c4418ecf2c360b61572c58
@@ -150,9 +1506,9 @@ Date:   Tue Aug 30 14:41:10 2011 +0200
     
     https://bugzilla.gnome.org/show_bug.cgi?id=657699
 
- extensions/GLib.js               |  282 ++++++++++++++++++++++++++++++++++++++
- extensions/Makefile.am           |    2 +-
- tests/javascript/glib-variant.js |   66 +++++++++
+ extensions/GLib.js               | 282 +++++++++++++++++++++++++++++++++++++++
+ extensions/Makefile.am           |   2 +-
+ tests/javascript/glib-variant.js |  66 +++++++++
  3 files changed, 349 insertions(+), 1 deletion(-)
 
 commit 7847cbfb332a29d04237df02611515cc6b8710fa
@@ -170,7 +1526,7 @@ Date:   Mon Jan 28 12:47:54 2013 +0000
     
     This fixes a crash when creating a new GObject from the javascript code.
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9632daec1ad6c5f52ca44d09591bf59034a9f7b2
@@ -188,7 +1544,7 @@ Date:   Fri Jan 25 16:53:56 2013 +0000
     when creating a GObject, memory corruption and segfault in
     thread_memory_swap_magazines().
 
- libseed/seed-engine.c |    5 ++---
+ libseed/seed-engine.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit e9781ebb4c29636b5373500a2e4443e96b12dc2a
@@ -203,7 +1559,7 @@ Date:   Wed Feb 6 15:30:39 2013 +0800
     
     https://bugzilla.gnome.org/show_bug.cgi?id=693217
 
- libseed/seed-types.c |    2 +-
+ libseed/seed-types.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9f1c31e475e5b782edca239023eaf0d64ddc37fc
@@ -212,8 +1568,8 @@ Date:   Fri Aug 10 18:55:52 2012 +0800
 
     add backtrace stack to the exception string
 
- libseed/seed-exceptions.c |   27 +++++++++++++++++++++++++--
- libseed/seed-exceptions.h |    1 +
+ libseed/seed-exceptions.c | 27 +++++++++++++++++++++++++--
+ libseed/seed-exceptions.h |  1 +
  2 files changed, 26 insertions(+), 2 deletions(-)
 
 commit 2076440c15be157ae8a6b16d4e11cce9d92f46b9
@@ -222,7 +1578,7 @@ Date:   Fri Aug 10 12:16:50 2012 +0800
 
     check if object is abstract before construction - thanks to Ryan Lortie
 
- libseed/seed-engine.c |   14 +++++++++++++-
+ libseed/seed-engine.c | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 commit dd6811ccc95b456c5ff42e1ba8508386fdfdba91
@@ -231,8 +1587,8 @@ Date:   Thu Jul 12 18:35:14 2012 +0200
 
     Added support for uint8 array as return type
 
- libseed/seed-engine.c |   23 +++++++++++++++++------
- libseed/seed-types.c  |    2 +-
+ libseed/seed-engine.c | 23 +++++++++++++++++------
+ libseed/seed-types.c  |  2 +-
  2 files changed, 18 insertions(+), 7 deletions(-)
 
 commit 5628064de12cdfd00eecbfe2860a8dc16f67f8d9
@@ -241,7 +1597,7 @@ Date:   Thu May 17 23:06:40 2012 +0800
 
     major memory reductions by garbage collecting at end of closure (example was timeout loops) - it might be worth exposing this somehow so  user space so it can be called manually...
 
- libseed/seed-closure.c |    3 +++
+ libseed/seed-closure.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit cc85c963b0c7571612956f497970670bd6001bc4
@@ -250,7 +1606,7 @@ Date:   Thu May 17 22:52:45 2012 +0800
 
     remove unused variables / compiler warnings
 
- libseed/seed-closure.c |    5 -----
+ libseed/seed-closure.c | 5 -----
  1 file changed, 5 deletions(-)
 
 commit 0db29c68a1e52bee7763fdb212f2591bfb9c125e
@@ -259,7 +1615,7 @@ Date:   Thu May 17 19:09:05 2012 +0800
 
     creating a JSRef to find the length value appears to cause segfaults - replacing with simpler code.. -
 
- libseed/seed-engine.c |   27 +++++++++++++++++++++------
+ libseed/seed-engine.c | 27 +++++++++++++++++++++------
  1 file changed, 21 insertions(+), 6 deletions(-)
 
 commit 1993cf2b458041d78fd44a4ec0bac72d103ee5c6
@@ -268,7 +1624,7 @@ Date:   Thu May 17 00:55:24 2012 +0800
 
     fix ref code for iface_info broken by refactoring
 
- libseed/seed-engine.c |    7 +++----
+ libseed/seed-engine.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 0cd15d095eac8b62bbafa3f8379a954b52d52cbc
@@ -277,7 +1633,7 @@ Date:   Thu May 17 00:44:07 2012 +0800
 
     initialize and free jchar in binary string, Im still not sure this is the correct way to do string creation, need to run some tests to ensure it really works
 
- libseed/seed-types.c |    5 +++--
+ libseed/seed-types.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit c2f0ce8819b652b2e0e68a6b56d6d2a02525bbd5
@@ -286,7 +1642,7 @@ Date:   Thu May 17 00:39:36 2012 +0800
 
      refactor main call code, remove quite a few redundant ifdefs, keep track of caller allocations so they can be freed on failure
 
- libseed/seed-engine.c |  302 +++++++++++++++++++++++++------------------------
+ libseed/seed-engine.c | 302 ++++++++++++++++++++++++++------------------------
  1 file changed, 156 insertions(+), 146 deletions(-)
 
 commit 2a90188b7465e3d22c89cf4d882b699daa7f15d2
@@ -295,7 +1651,7 @@ Date:   Sun May 13 22:30:43 2012 +0800
 
     free binary strings always, this is a bit risky, as it assumes that when we see an array of c uints and its used as a binary string, we should always free it... - Im not sure if it should really check transfer settings.. - but this will crash badly if it is not right...
 
- libseed/seed-types.c |    8 ++++++--
+ libseed/seed-types.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit b136ca762daa8dd3500c735cda39d3d31c4d4c19
@@ -304,9 +1660,9 @@ Date:   Sun May 13 11:34:51 2012 +0800
 
     finally get the code right to handle array length offset information
 
- libseed/seed-engine.c |   31 +++++++++++++++++++++++++++----
- libseed/seed-types.c  |   26 ++++++++++++--------------
- libseed/seed-types.h  |    2 +-
+ libseed/seed-engine.c | 31 +++++++++++++++++++++++++++----
+ libseed/seed-types.c  | 26 ++++++++++++--------------
+ libseed/seed-types.h  |  2 +-
  3 files changed, 40 insertions(+), 19 deletions(-)
 
 commit 1e537cdba82557298cf074fc00cd6eab7b4c8098
@@ -315,9 +1671,9 @@ Date:   Sat May 12 18:20:01 2012 +0800
 
     rename with_length to _full, since relay of calling for enums sent the wrong data, and got the wrong result..
 
- libseed/seed-engine.c |    8 +++++---
- libseed/seed-types.c  |   23 ++++++++++++++---------
- libseed/seed-types.h  |    5 +++--
+ libseed/seed-engine.c |  8 +++++---
+ libseed/seed-types.c  | 23 ++++++++++++++---------
+ libseed/seed-types.h  |  5 +++--
  3 files changed, 22 insertions(+), 14 deletions(-)
 
 commit d4319e6bca21966c9b5caf758cb38941f1a7500d
@@ -326,7 +1682,7 @@ Date:   Sat May 12 18:03:47 2012 +0800
 
     enum types are not all long any more, we need to check the type and recurse to return the right type..
 
- libseed/seed-types.c |   39 +++++++++++++++++++++++++++++++--------
+ libseed/seed-types.c | 39 +++++++++++++++++++++++++++++++--------
  1 file changed, 31 insertions(+), 8 deletions(-)
 
 commit 1e627f78a58b06b629ac1718212fa3f3f50fd338
@@ -335,7 +1691,7 @@ Date:   Fri May 11 08:00:44 2012 +0800
 
     tidy up of binary string support, should now solve quite a few of the short string issues with NULL chars in
 
- libseed/seed-types.c |   98 ++++++++++++++++++++++++++++----------------------
+ libseed/seed-types.c | 98 +++++++++++++++++++++++++++++-----------------------
  1 file changed, 55 insertions(+), 43 deletions(-)
 
 commit 47e939b716deb6ec6774c05fc3bd7d00812bc336
@@ -344,9 +1700,9 @@ Date:   Fri May 11 00:16:16 2012 +0800
 
     Very hacky support for <array length="x" zero-teminated="0" c:type="gchar**"><type name="..."/>, used by GLib.file_get_contents in latest girs
 
- libseed/seed-engine.c |   26 +++++++++++++++++++---
- libseed/seed-types.c  |   57 +++++++++++++++++++++++++++++++++++++++++++++++--
- libseed/seed-types.h  |    5 +++++
+ libseed/seed-engine.c | 26 ++++++++++++++++++++---
+ libseed/seed-types.c  | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ libseed/seed-types.h  |  5 +++++
  3 files changed, 83 insertions(+), 5 deletions(-)
 
 commit 18008514b4763d4941db6af37056f8a1e5fdfa20
@@ -355,7 +1711,7 @@ Date:   Sat Jan 28 23:28:05 2012 +0800
 
     xorg module - libxss check has bad error message
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 730b0e62854204175dd248e7ae61306348d4d882
@@ -364,7 +1720,7 @@ Date:   Wed Nov 30 22:52:49 2011 +0800
 
     xorg module - close display after using it
 
- modules/xorg/seed-xorg.c |    4 +++-
+ modules/xorg/seed-xorg.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 67484737433bcf5263194d84ae3f0c2526cccc3d
@@ -373,10 +1729,10 @@ Date:   Wed Nov 30 22:17:57 2011 +0800
 
     Add an xorg extension (experimental) - at present only has one function to get the screen idle time...
 
- configure.ac             |   31 ++++++++++++++++++
- modules/Makefile.am      |    2 +-
- modules/xorg/Makefile.am |   29 +++++++++++++++++
- modules/xorg/seed-xorg.c |   79 ++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac             | 31 +++++++++++++++++++
+ modules/Makefile.am      |  2 +-
+ modules/xorg/Makefile.am | 29 ++++++++++++++++++
+ modules/xorg/seed-xorg.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 140 insertions(+), 1 deletion(-)
 
 commit 3219a9691653127330d364cda7833454dc6cb7b9
@@ -385,7 +1741,7 @@ Date:   Tue Nov 29 17:02:26 2011 +0800
 
     fix #653077 - fix for webkit 1.0 configure (Dominique Leuenberger)
 
- configure.ac |    6 +-----
+ configure.ac | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 commit b254df57d964317c37ebdeab5f875c8de8d4adf9
@@ -394,8 +1750,8 @@ Date:   Tue Nov 8 15:48:08 2011 +0530
 
     Fix #637248 - Add support for implicitly converting GObject to GValue
 
- libseed/seed-types.c                |   10 +++++++++-
- tests/javascript/gvalue-argument.js |    4 +++-
+ libseed/seed-types.c                | 10 +++++++++-
+ tests/javascript/gvalue-argument.js |  4 +++-
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 commit 89cac4a4d27b7a1be462b80bc44fe84c82f06869
@@ -404,7 +1760,7 @@ Date:   Wed Nov 9 09:26:10 2011 +0800
 
     fix #663609 - documentation on seed_value_* now matches actual return values
 
- libseed/seed-types.c |  110 +++++++++++++++++---------------------------------
+ libseed/seed-types.c | 110 +++++++++++++++++----------------------------------
  1 file changed, 37 insertions(+), 73 deletions(-)
 
 commit 2717feb7db0e8516deb3fbe32c8e4204f9722887
@@ -413,9 +1769,9 @@ Date:   Thu Nov 3 15:17:05 2011 +0800
 
     fix #663289 - gtype signal parsing not resetting param count
 
- libseed/seed-gtype.c                               |    6 ++++-
- tests/javascript/gtypes/Makefile.am                |    2 ++
- .../gtypes/gtype-signal-order-bug663289.js         |   25 ++++++++++++++++++++
+ libseed/seed-gtype.c                               |  6 +++++-
+ tests/javascript/gtypes/Makefile.am                |  2 ++
+ .../gtypes/gtype-signal-order-bug663289.js         | 25 ++++++++++++++++++++++
  3 files changed, 32 insertions(+), 1 deletion(-)
 
 commit 6d38e2b5601f8097e3a99da647b46d2048ce160d
@@ -424,16 +1780,16 @@ Date:   Mon Oct 3 15:10:08 2011 +0800
 
     fix most of #660644 - except function-info.js (my gdb is broken)
 
- tests/javascript/Makefile.am                  |    2 -
- tests/javascript/everything.js                |   71 -------------------------
- tests/javascript/function-info.js             |    4 +-
- tests/javascript/gdk-event.js                 |   11 ++--
- tests/javascript/gvalue-argument.js           |    9 ++--
- tests/javascript/introspect.js                |    4 +-
- tests/javascript/native-closure-exception.js  |    2 +-
- tests/javascript/object-info.js               |   12 ++---
- tests/javascript/structs/struct-enumerate.js  |   13 ++---
- tests/javascript/structs/struct-nested-set.js |   15 +++---
+ tests/javascript/Makefile.am                  |  2 -
+ tests/javascript/everything.js                | 71 ---------------------------
+ tests/javascript/function-info.js             |  4 +-
+ tests/javascript/gdk-event.js                 | 11 +++--
+ tests/javascript/gvalue-argument.js           |  9 ++--
+ tests/javascript/introspect.js                |  4 +-
+ tests/javascript/native-closure-exception.js  |  2 +-
+ tests/javascript/object-info.js               | 12 ++---
+ tests/javascript/structs/struct-enumerate.js  | 13 ++---
+ tests/javascript/structs/struct-nested-set.js | 15 +++---
  10 files changed, 36 insertions(+), 107 deletions(-)
 
 commit 5a9cd3d9ab1fd5e24478ba63d593866542b49927
@@ -442,7 +1798,7 @@ Date:   Mon Oct 3 15:02:00 2011 +0800
 
     allow [ GObject.GTYPE_INT, 10 ] syntax to work again for not-null elements
 
- libseed/seed-engine.c |   25 +++++++++++++++++--------
+ libseed/seed-engine.c | 25 +++++++++++++++++--------
  1 file changed, 17 insertions(+), 8 deletions(-)
 
 commit 1ec48efc03df9368a59f501dfd1de9c9b15f016c
@@ -451,7 +1807,7 @@ Date:   Fri Sep 23 14:08:06 2011 +0800
 
     fix #659548 - stop CFLAGS getting unconditionally overwritten
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f382387b9b56d72adbc6888f924e3838a1a94668
@@ -460,8 +1816,8 @@ Date:   Fri Sep 23 13:58:33 2011 +0800
 
     fix #659910 - fix linkage against libgio - broken by webkit going...
 
- configure.ac        |    3 +++
- libseed/Makefile.am |    1 +
+ configure.ac        | 3 +++
+ libseed/Makefile.am | 1 +
  2 files changed, 4 insertions(+)
 
 commit 09fe24d64c6fe4259884fa9f72bb2bc58a21290a
@@ -470,7 +1826,7 @@ Date:   Wed Sep 21 21:36:25 2011 -0700
 
     Postrelease version bump.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 004746bf04ae72924c233377869c7e639ac8deee
@@ -479,7 +1835,7 @@ Date:   Wed Sep 21 21:31:16 2011 -0700
 
     Bump version to 3.2.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5645ccc8f3fff91797a4e8cd2cc732c92b45b9d7
@@ -488,8 +1844,8 @@ Date:   Wed Sep 21 21:30:22 2011 -0700
 
     Let gtkdoc do its thing
 
- doc/reference/tmpl/seed-exception.sgml      |    2 +-
- doc/reference/tmpl/seed-typeconversion.sgml |    2 +-
+ doc/reference/tmpl/seed-exception.sgml      | 2 +-
+ doc/reference/tmpl/seed-typeconversion.sgml | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 920e8754f72d2626a6c2ced995aaf5a2f01839b2
@@ -498,7 +1854,7 @@ Date:   Wed Sep 21 21:29:59 2011 -0700
 
     Remove missing file from tests/javascript/gtypes/Makefile.am
 
- tests/javascript/gtypes/Makefile.am |    1 -
+ tests/javascript/gtypes/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 commit f2cb32103467e0d3c1ded57997656e5e69f69399
@@ -509,7 +1865,7 @@ Date:   Fri Sep 9 15:37:04 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 6ae79c21436f036f36ab7ebfe1b5466ae741f00d
@@ -520,8 +1876,8 @@ Date:   Wed Aug 31 12:49:01 2011 +0200
     
     https://bugzilla.gnome.org/show_bug.cgi?id=657833
 
- extensions/Seed.js.in   |   73 +++++++++++++++++++++++------------------------
- libseed/seed-importer.c |    2 +-
+ extensions/Seed.js.in   | 73 ++++++++++++++++++++++++-------------------------
+ libseed/seed-importer.c |  2 +-
  2 files changed, 37 insertions(+), 38 deletions(-)
 
 commit eedae3e24b470b28951b9d303b65b94ad9613209
@@ -534,7 +1890,7 @@ Date:   Wed Aug 31 17:32:10 2011 +0800
     
     This reverts commit 9f4589a7f8eb24f755fd2931499a1d2a3346911c.
 
- extensions/Gio.js |  181 +----------------------------------------------------
+ extensions/Gio.js | 181 +-----------------------------------------------------
  1 file changed, 3 insertions(+), 178 deletions(-)
 
 commit b0be7270b4029bc4001d7a819ffb9c318666670f
@@ -543,7 +1899,7 @@ Date:   Fri Aug 26 19:08:44 2011 +0530
 
     Fix #6574441 -  incorrect comparision in gtype testcase
 
- tests/javascript/gtypes/gtype.js |    2 +-
+ tests/javascript/gtypes/gtype.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bc3c00ee0b18d6fd13ee8d9766d53e443e57bf6c
@@ -552,8 +1908,8 @@ Date:   Wed Aug 31 16:51:57 2011 +0800
 
     https://bugzilla.gnome.org/show_bug.cgi?id=657647
 
- libseed/seed-types.c |   38 ++++++++++++++++++++++++++++++++++++++
- libseed/seed-types.h |    3 ++-
+ libseed/seed-types.c | 38 ++++++++++++++++++++++++++++++++++++++
+ libseed/seed-types.h |  3 ++-
  2 files changed, 40 insertions(+), 1 deletion(-)
 
 commit 9f4589a7f8eb24f755fd2931499a1d2a3346911c
@@ -566,7 +1922,7 @@ Date:   Tue Aug 30 14:46:21 2011 +0200
     
     https://bugzilla.gnome.org/show_bug.cgi?id=657702
 
- extensions/Gio.js |  181 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ extensions/Gio.js | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 178 insertions(+), 3 deletions(-)
 
 commit 0aa53b6d9667ab2fc8cb0e6242564e8851ef66d6
@@ -575,8 +1931,8 @@ Date:   Wed Aug 31 11:54:42 2011 +0800
 
     Fixes : bug#657228 - Make callbacks work with WebkFrame's Js Context (Revised)
 
- libseed/seed-closure.c |    6 ++++--
- libseed/seed-closure.h |    1 +
+ libseed/seed-closure.c | 6 ++++--
+ libseed/seed-closure.h | 1 +
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 142625d27d522dcc9a4c2b52948cef48fa56c59c
@@ -591,8 +1947,8 @@ Date:   Wed Aug 31 09:57:45 2011 +0800
     
     This reverts commit b41c16b814f1c08228be08ecfa2dec0917d1696b.
 
- libseed/seed-closure.c |    6 ++----
- libseed/seed-closure.h |    1 -
+ libseed/seed-closure.c | 6 ++----
+ libseed/seed-closure.h | 1 -
  2 files changed, 2 insertions(+), 5 deletions(-)
 
 commit b41c16b814f1c08228be08ecfa2dec0917d1696b
@@ -601,8 +1957,8 @@ Date:   Wed Aug 24 16:49:56 2011 +0530
 
     Fixes : bug#657228 - Make callbacks work with WebkFrame's Js Context
 
- libseed/seed-closure.c |    6 ++++--
- libseed/seed-closure.h |    1 +
+ libseed/seed-closure.c | 6 ++++--
+ libseed/seed-closure.h | 1 +
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit e5cd8a0e34de7ee60c7da00c23edf37cf53016d7
@@ -613,7 +1969,7 @@ Date:   Wed Aug 24 16:31:25 2011 +0800
     
     Basically removes the new context from the closure callback
 
- modules/dbus/module.c |   22 ++++++++++------------
+ modules/dbus/module.c | 22 ++++++++++------------
  1 file changed, 10 insertions(+), 12 deletions(-)
 
 commit 9805441749f447b7b46f6b314531542d3b4453aa
@@ -624,7 +1980,7 @@ Date:   Thu Aug 11 18:06:27 2011 +0200
     
     https://bugzilla.gnome.org/show_bug.cgi?id=656517
 
- libseed/seed-importer.c |    3 ++-
+ libseed/seed-importer.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 58415e71d8e767570428354c06dbbf9affedd5fa
@@ -637,63 +1993,63 @@ Date:   Sat Mar 5 11:46:43 2011 +0100
     Modify the source files headers to permit redistribution under
     LGPL2+ distribution.
 
- COPYING                                        |  637 ++++++++++++++++++------
- libseed/seed-api.c                             |    2 +-
- libseed/seed-builtins.c                        |    2 +-
- libseed/seed-builtins.h                        |    2 +-
- libseed/seed-closure.c                         |    2 +-
- libseed/seed-closure.h                         |    2 +-
- libseed/seed-debug.h                           |    2 +-
- libseed/seed-engine.c                          |    2 +-
- libseed/seed-engine.h                          |    2 +-
- libseed/seed-exceptions.c                      |    2 +-
- libseed/seed-exceptions.h                      |    2 +-
- libseed/seed-gtype.c                           |    2 +-
- libseed/seed-gtype.h                           |    2 +-
- libseed/seed-importer.c                        |    2 +-
- libseed/seed-importer.h                        |    2 +-
- libseed/seed-module.h                          |    2 +-
- libseed/seed-private.h                         |    2 +-
- libseed/seed-signals.c                         |    2 +-
- libseed/seed-signals.h                         |    2 +-
- libseed/seed-structs.c                         |    2 +-
- libseed/seed-structs.h                         |    2 +-
- libseed/seed-types.c                           |    2 +-
- libseed/seed-types.h                           |    2 +-
- libseed/seed.h                                 |    2 +-
- modules/DynamicObject/seed-DynamicObject.c     |    2 +-
- modules/cairo/seed-cairo-enums.c               |    2 +-
- modules/cairo/seed-cairo-image-surface.c       |    2 +-
- modules/cairo/seed-cairo-matrix.c              |    2 +-
- modules/cairo/seed-cairo-pattern.c             |    2 +-
- modules/cairo/seed-cairo-pdf-surface.c         |    2 +-
- modules/cairo/seed-cairo-surface.c             |    2 +-
- modules/cairo/seed-cairo.c                     |    2 +-
- modules/canvas/seed-canvas.c                   |    2 +-
- modules/dbus/dbus-exports.c                    |    2 +-
- modules/dbus/dbus-values.c                     |    2 +-
- modules/dbus/module.c                          |    2 +-
- modules/example/seed-example.c                 |    2 +-
- modules/ffi/seed-ffi.c                         |    2 +-
- modules/gettext/seed-gettext.c                 |    2 +-
- modules/gtkbuilder/seed-gtkbuilder.c           |    2 +-
- modules/libxml/seed-libxml.c                   |    2 +-
- modules/mpfr/seed-mpfr-arithmetic.c            |    2 +-
- modules/mpfr/seed-mpfr-cmp.c                   |    2 +-
- modules/mpfr/seed-mpfr-trig.c                  |    2 +-
- modules/mpfr/seed-mpfr.c                       |    2 +-
- modules/multiprocessing/seed-multiprocessing.c |    2 +-
- modules/os/seed-os.c                           |    2 +-
- modules/readline/seed-readline.c               |    2 +-
- modules/sandbox/seed-sandbox.c                 |    2 +-
- modules/sqlite/seed-sqlite.c                   |    2 +-
- src/args.c                                     |    2 +-
- src/main.c                                     |    2 +-
- tests/c/api-closure.c                          |    2 +-
- tests/c/api-js-signal-from-c.c                 |    2 +-
- tests/c/api-types.c                            |    2 +-
- tests/c/basic.c                                |    2 +-
- tests/c/main.c                                 |    2 +-
+ COPYING                                        | 637 ++++++++++++++++++-------
+ libseed/seed-api.c                             |   2 +-
+ libseed/seed-builtins.c                        |   2 +-
+ libseed/seed-builtins.h                        |   2 +-
+ libseed/seed-closure.c                         |   2 +-
+ libseed/seed-closure.h                         |   2 +-
+ libseed/seed-debug.h                           |   2 +-
+ libseed/seed-engine.c                          |   2 +-
+ libseed/seed-engine.h                          |   2 +-
+ libseed/seed-exceptions.c                      |   2 +-
+ libseed/seed-exceptions.h                      |   2 +-
+ libseed/seed-gtype.c                           |   2 +-
+ libseed/seed-gtype.h                           |   2 +-
+ libseed/seed-importer.c                        |   2 +-
+ libseed/seed-importer.h                        |   2 +-
+ libseed/seed-module.h                          |   2 +-
+ libseed/seed-private.h                         |   2 +-
+ libseed/seed-signals.c                         |   2 +-
+ libseed/seed-signals.h                         |   2 +-
+ libseed/seed-structs.c                         |   2 +-
+ libseed/seed-structs.h                         |   2 +-
+ libseed/seed-types.c                           |   2 +-
+ libseed/seed-types.h                           |   2 +-
+ libseed/seed.h                                 |   2 +-
+ modules/DynamicObject/seed-DynamicObject.c     |   2 +-
+ modules/cairo/seed-cairo-enums.c               |   2 +-
+ modules/cairo/seed-cairo-image-surface.c       |   2 +-
+ modules/cairo/seed-cairo-matrix.c              |   2 +-
+ modules/cairo/seed-cairo-pattern.c             |   2 +-
+ modules/cairo/seed-cairo-pdf-surface.c         |   2 +-
+ modules/cairo/seed-cairo-surface.c             |   2 +-
+ modules/cairo/seed-cairo.c                     |   2 +-
+ modules/canvas/seed-canvas.c                   |   2 +-
+ modules/dbus/dbus-exports.c                    |   2 +-
+ modules/dbus/dbus-values.c                     |   2 +-
+ modules/dbus/module.c                          |   2 +-
+ modules/example/seed-example.c                 |   2 +-
+ modules/ffi/seed-ffi.c                         |   2 +-
+ modules/gettext/seed-gettext.c                 |   2 +-
+ modules/gtkbuilder/seed-gtkbuilder.c           |   2 +-
+ modules/libxml/seed-libxml.c                   |   2 +-
+ modules/mpfr/seed-mpfr-arithmetic.c            |   2 +-
+ modules/mpfr/seed-mpfr-cmp.c                   |   2 +-
+ modules/mpfr/seed-mpfr-trig.c                  |   2 +-
+ modules/mpfr/seed-mpfr.c                       |   2 +-
+ modules/multiprocessing/seed-multiprocessing.c |   2 +-
+ modules/os/seed-os.c                           |   2 +-
+ modules/readline/seed-readline.c               |   2 +-
+ modules/sandbox/seed-sandbox.c                 |   2 +-
+ modules/sqlite/seed-sqlite.c                   |   2 +-
+ src/args.c                                     |   2 +-
+ src/main.c                                     |   2 +-
+ tests/c/api-closure.c                          |   2 +-
+ tests/c/api-js-signal-from-c.c                 |   2 +-
+ tests/c/api-types.c                            |   2 +-
+ tests/c/basic.c                                |   2 +-
+ tests/c/main.c                                 |   2 +-
  57 files changed, 533 insertions(+), 216 deletions(-)
 
 commit a84576e42dbceb102f5cb7fa5b9e3ebce8d7a9c9
@@ -702,7 +2058,7 @@ Date:   Fri Aug 12 21:27:20 2011 +0200
 
     More fixes for bgo#653077: Also correctly identify javascriptcoregtk-1.0
 
- configure.ac |    7 ++++---
+ configure.ac | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 1dae3adaa27f1cbef976ace0584c71217e594c7a
@@ -711,9 +2067,9 @@ Date:   Fri Aug 12 13:58:56 2011 +0800
 
     since GParamSpec is not exposed, we can not call param_spec_* methods any more, so Gtype object contruction has to be done via properties in the ctor.
 
- tests/javascript/gtypes/Makefile.am                |    1 -
- .../javascript/gtypes/gtype-property-construct.js  |   22 +++++++-------
- tests/javascript/gtypes/gtype-property.js          |   30 --------------------
+ tests/javascript/gtypes/Makefile.am                |  1 -
+ .../javascript/gtypes/gtype-property-construct.js  | 22 ++++++++--------
+ tests/javascript/gtypes/gtype-property.js          | 30 ----------------------
  3 files changed, 11 insertions(+), 42 deletions(-)
 
 commit debb39ead5b86f774eb9488af8dd20e80d10ecf3
@@ -722,7 +2078,7 @@ Date:   Tue Aug 9 22:17:21 2011 +0530
 
     Fixes : bug#656227 - Seed doesn't support GPtrArray as return type
 
- libseed/seed-types.c |   35 +++++++++++++++++++++++++++++++++++
+ libseed/seed-types.c | 35 +++++++++++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
 commit 937d32206c93a2024bd4d6c2ff045d5310bfbda5
@@ -731,9 +2087,9 @@ Date:   Tue Aug 9 12:53:07 2011 +0800
 
     More fixes for  #653077 - javascriptcoregtk build needs to be linked against libraries, rather than expecting it via webkit any more
 
- modules/cairo/Makefile.am      |    4 +++-
- modules/canvas/Makefile.am     |    1 +
- modules/gtkbuilder/Makefile.am |    1 +
+ modules/cairo/Makefile.am      | 4 +++-
+ modules/canvas/Makefile.am     | 1 +
+ modules/gtkbuilder/Makefile.am | 1 +
  3 files changed, 5 insertions(+), 1 deletion(-)
 
 commit db641cd31d82aff79a16080f65f7c7562aaadde6
@@ -742,8 +2098,8 @@ Date:   Mon Aug 8 18:05:48 2011 +0800
 
     more fixes for  #653077 - xml build without webkit, also includes fix for  #652771 - removing paramspec reference
 
- libseed/seed-gtype.c       |    6 ++++--
- modules/libxml/Makefile.am |    1 +
+ libseed/seed-gtype.c       | 6 ++++--
+ modules/libxml/Makefile.am | 1 +
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit dd591f267d0a726ee69216542d67d04202fbfd6b
@@ -752,7 +2108,7 @@ Date:   Thu Aug 4 09:19:14 2011 +0530
 
     Adds support for handling GUNIT32
 
- libseed/seed-types.c |   17 +++++++++++++++++
+ libseed/seed-types.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 7509ce76f8295134a276654a92841fc899e35b25
@@ -761,7 +2117,7 @@ Date:   Wed Jul 20 23:53:53 2011 +0800
 
     substitute SEED_GTK_VERSION - fixes build...
 
- configure.ac |    2 ++
+ configure.ac | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 91ab326855490e1173696d95e153fcdf7e8105e9
@@ -770,7 +2126,7 @@ Date:   Sun Jul 3 23:01:12 2011 +0800
 
     fix #653077 - change build to support javascriptcoregtk change
 
- configure.ac |    7 ++++---
+ configure.ac | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit ff9eca41b42f3b6c2cc312dd996f78b67bf5be35
@@ -779,7 +2135,7 @@ Date:   Tue May 17 12:55:53 2011 -0400
 
     postrelease version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 872cc1404b55fa3673bfd8a5fd995f7561292369
@@ -788,7 +2144,7 @@ Date:   Tue May 17 12:52:38 2011 -0400
 
     actually add config.h.in to .gitignore
 
- .gitignore |    1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit db859ed93cf642393b41bd432cbd6cbc2e44a331
@@ -797,7 +2153,7 @@ Date:   Tue May 17 12:51:56 2011 -0400
 
     Version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7a1df2a43ca17dd567ec8e0690ab91688e3969b8
@@ -806,7 +2162,7 @@ Date:   Tue May 17 12:50:27 2011 -0400
 
     Update news for 3.1.1
 
- NEWS |   12 ++++++++++++
+ NEWS | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 8a6a84b1b9a5449d6239fbcbb15c3f4a6349f950
@@ -815,11 +2171,11 @@ Date:   Tue May 17 12:45:48 2011 -0400
 
     We only require libutil.h for FreeBSD, apparently
 
- doc/reference/tmpl/seed-context.sgml |   28 ++++++++++++++--------------
- doc/reference/tmpl/seed-eval.sgml    |    2 +-
- doc/reference/tmpl/seed-jsclass.sgml |    2 +-
- doc/reference/tmpl/seed-object.sgml  |    8 ++++----
- modules/os/seed-os.c                 |    4 +---
+ doc/reference/tmpl/seed-context.sgml | 28 ++++++++++++++--------------
+ doc/reference/tmpl/seed-eval.sgml    |  2 +-
+ doc/reference/tmpl/seed-jsclass.sgml |  2 +-
+ doc/reference/tmpl/seed-object.sgml  |  8 ++++----
+ modules/os/seed-os.c                 |  4 +---
  5 files changed, 21 insertions(+), 23 deletions(-)
 
 commit c1d6b3ad19520ee05d04e7094b700d94ac69b4df
@@ -828,7 +2184,7 @@ Date:   Tue May 17 12:34:17 2011 -0400
 
     Add DBUSGLIB_CFLAGS and DBUSGLIB_LDFLAGS to dbus module's Makefile.am to fix build failure
 
- modules/dbus/Makefile.am |    2 ++
+ modules/dbus/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 424ad8504a03c393439283873316d413a9edd2ec
@@ -837,7 +2193,7 @@ Date:   Tue May 17 00:47:37 2011 -0400
 
     Remove config.h.in from git (recently .gitignored)
 
- config.h.in |   92 -----------------------------------------------------------
+ config.h.in | 92 -------------------------------------------------------------
  1 file changed, 92 deletions(-)
 
 commit 920b1d82a2282fdfea3a0d0358a51d3b23facc47
@@ -846,7 +2202,7 @@ Date:   Tue May 17 00:46:42 2011 -0400
 
     Only include libutil.h on FreeBSD (util.h on OpenBSD, nothing on Linux)
 
- modules/os/seed-os.c |    2 +-
+ modules/os/seed-os.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 081707c35a0f90aae0651c7a079729a6031bc4e6
@@ -855,7 +2211,7 @@ Date:   Mon May 16 17:52:55 2011 +0800
 
     add config.h.in to git ignore
 
- .gitignore |    1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6a9e7fa16c23b697ebeccd0aec53a70dc0a3533c
@@ -864,7 +2220,7 @@ Date:   Mon May 16 17:49:00 2011 +0800
 
     fix #650121 - typo in sqlite documentation
 
- doc/modules/sqlite/sqlite.xml |    2 +-
+ doc/modules/sqlite/sqlite.xml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 03c808137331be912e9adde997dd2830cf2e5593
@@ -873,7 +2229,7 @@ Date:   Mon May 16 17:38:37 2011 +0800
 
     fix #650234 -m Add FreeBSD/OpenBSD support to os/seed-os.c
 
- modules/os/seed-os.c |   41 +++++++++++++++++++++++++++++++++++++++--
+ modules/os/seed-os.c | 41 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 39 insertions(+), 2 deletions(-)
 
 commit 18861a32f2a251c323c21e172ad39fd91fc80e3f
@@ -882,7 +2238,7 @@ Date:   Mon May 16 17:36:33 2011 +0800
 
     fix #650233 Fix importing scripts on *BSD
 
- libseed/seed-importer.c |   18 +++++++++++++++---
+ libseed/seed-importer.c | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 commit 7afc3b2138e559bfc65c056153141c2ccc747ac4
@@ -891,8 +2247,8 @@ Date:   Mon May 16 17:32:02 2011 +0800
 
     fix #650232 -  Missing includes cause build to fail on OpenBSD
 
- libseed/seed-closure.c |    1 +
- libseed/seed-private.h |    4 +++-
+ libseed/seed-closure.c | 1 +
+ libseed/seed-private.h | 4 +++-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit d55b446cc031e1de483c92b5d22d59312ed4e234
@@ -925,7 +2281,7 @@ Date:   Fri Apr 22 01:49:29 2011 -0500
     Reported-by: Lucas Nussbaum <lucas@lucas-nussbaum.net>
     Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 
- configure.ac |   20 ++++++++++----------
+ configure.ac | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 commit df358cc51df5ab155b1496e21a9da8d6ae401ed3
@@ -934,8 +2290,8 @@ Date:   Fri Apr 22 15:38:21 2011 +0800
 
     fix tests for GI_TYPE_TAG_* that where removed in 0.9 GI
 
- libseed/seed-closure.c |    8 ++------
- libseed/seed-types.c   |   12 +++---------
+ libseed/seed-closure.c |  8 ++------
+ libseed/seed-types.c   | 12 +++---------
  2 files changed, 5 insertions(+), 15 deletions(-)
 
 commit e04b84f579f02f607656c65799e80483b537f8c0
@@ -944,7 +2300,7 @@ Date:   Sun Apr 17 20:12:56 2011 +0800
 
     fix #64009 - honor ACLOCAL_FLAGS to help jhbuild out
 
- Makefile.am |    2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a9cfd171875515aba2d43b90d8b260a0dd678fa1
@@ -953,7 +2309,7 @@ Date:   Sat Apr 16 13:31:28 2011 +0800
 
     fix types which have been removed in new versions
 
- libseed/seed-types.c |    7 ++++++-
+ libseed/seed-types.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 42d87d2df6e91da9526aa1adb2cba671abc3f51f
@@ -962,7 +2318,7 @@ Date:   Sat Apr 16 13:23:10 2011 +0800
 
     fix types which have been removed in new versions
 
- libseed/seed-closure.c |    4 ++++
+ libseed/seed-closure.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 5d14a17e2998135b5ac50fcb2a2a60f325729ab9
@@ -971,7 +2327,7 @@ Date:   Sat Apr 16 12:03:55 2011 +0800
 
     fix autoconf stripping square brackets in introspection versioning code
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f7469671f507835973df0e89e1b19c5b8eec7ba2
@@ -980,8 +2336,8 @@ Date:   Fri Apr 1 22:51:26 2011 -0400
 
     Update news for 3.0
 
- NEWS         |   10 ++++++++++
- configure.ac |    2 +-
+ NEWS         | 10 ++++++++++
+ configure.ac |  2 +-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 1bd4ec7b96f1b19e94fdd5b2b4e0df03aa2c0666
@@ -990,13 +2346,13 @@ Date:   Thu Mar 24 10:21:48 2011 -0700
 
     Expose seed_value_(to|from)_gi_argument
 
- libseed/seed-closure.c  |    4 ++--
- libseed/seed-engine.c   |   10 +++++-----
- libseed/seed-importer.c |    2 +-
- libseed/seed-structs.c  |   10 +++++-----
- libseed/seed-types.c    |   24 ++++++++++++------------
- libseed/seed-types.h    |   17 +++++++++--------
- libseed/seed.h          |   10 ++++++++++
+ libseed/seed-closure.c  |  4 ++--
+ libseed/seed-engine.c   | 10 +++++-----
+ libseed/seed-importer.c |  2 +-
+ libseed/seed-structs.c  | 10 +++++-----
+ libseed/seed-types.c    | 24 ++++++++++++------------
+ libseed/seed-types.h    | 17 +++++++++--------
+ libseed/seed.h          | 10 ++++++++++
  7 files changed, 44 insertions(+), 33 deletions(-)
 
 commit a655d0136520b156088327284c5a0377476008e7
@@ -1005,13 +2361,13 @@ Date:   Thu Mar 24 10:19:59 2011 -0700
 
     Expose seed_value_to_gvalue
 
- libseed/seed-engine.c  |    6 +++---
- libseed/seed-gtype.c   |    2 +-
- libseed/seed-signals.c |   10 +++++-----
- libseed/seed-structs.c |    2 +-
- libseed/seed-types.c   |   24 ++++++++++++------------
- libseed/seed-types.h   |    7 ++++---
- libseed/seed.h         |    4 ++++
+ libseed/seed-engine.c  |  6 +++---
+ libseed/seed-gtype.c   |  2 +-
+ libseed/seed-signals.c | 10 +++++-----
+ libseed/seed-structs.c |  2 +-
+ libseed/seed-types.c   | 24 ++++++++++++------------
+ libseed/seed-types.h   |  7 ++++---
+ libseed/seed.h         |  4 ++++
  7 files changed, 30 insertions(+), 25 deletions(-)
 
 commit 513244a8b19692f3b41638964586dc60694333c7
@@ -1020,7 +2376,7 @@ Date:   Mon Mar 28 11:39:20 2011 -0400
 
     Make seed.h C++ friendly.
 
- libseed/seed.h |   16 ++++++++++------
+ libseed/seed.h | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 commit 31de08a8b76b7f277defe23b5ab5a371500e4c4a
@@ -1039,10 +2395,10 @@ Date:   Wed Mar 23 18:34:54 2011 +0100
     
     https://bugzilla.gnome.org/show_bug.cgi?id=645696
 
- libseed/seed-engine.c   |  165 +++++++++++++++++++++++++++++++++++++++++++----
- libseed/seed-importer.c |   13 ++--
- libseed/seed-importer.h |    2 +
- libseed/seed.h          |    9 +++
+ libseed/seed-engine.c   | 165 ++++++++++++++++++++++++++++++++++++++++++++----
+ libseed/seed-importer.c |  13 ++--
+ libseed/seed-importer.h |   2 +
+ libseed/seed.h          |   9 +++
  4 files changed, 171 insertions(+), 18 deletions(-)
 
 commit 74bc83ed18f609340a06307f7be3b9d47a357398
@@ -1053,7 +2409,7 @@ Date:   Sun Mar 13 19:25:15 2011 +0000
     
     https://bugzilla.gnome.org/show_bug.cgi?id=644663
 
- libseed/seed-path.h.in |    2 +-
+ libseed/seed-path.h.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ce54fb5de39fb47996f663cec50a5eec1d564150
@@ -1062,7 +2418,7 @@ Date:   Tue Feb 22 17:56:22 2011 -0500
 
     Postrelease increment
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c99ced2c6935055b7166e15aa3cc4915aea4ee1d
@@ -1071,8 +2427,8 @@ Date:   Tue Feb 22 17:51:04 2011 -0500
 
     Ready 2.91.90
 
- NEWS         |    6 ++++++
- configure.ac |    2 +-
+ NEWS         | 6 ++++++
+ configure.ac | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit f7b765ecefd2b8ff5748c4c2757f4594c2c26ed7
@@ -1085,7 +2441,7 @@ Date:   Thu Feb 17 07:26:32 2011 +0100
     some modules are hardcoding gtk2 / gdk2 in their configure.ac part.
     Fixes #641264
 
- configure.ac |   12 ++++++++++--
+ configure.ac | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit f74599d7db79b61615b0cd26e5f3e2e1863b8857
@@ -1096,27 +2452,27 @@ Date:   Wed Feb 2 17:18:02 2011 +0100
     
     https://bugzilla.gnome.org/show_bug.cgi?id=639896
 
- configure.ac                        |    2 ++
- extensions/Makefile.am              |    6 +++---
- libseed/Makefile.am                 |   12 ++++++------
- modules/DynamicObject/Makefile.am   |    2 +-
- modules/cairo/Makefile.am           |    4 ++--
- modules/canvas/Makefile.am          |    4 ++--
- modules/dbus/Makefile.am            |    6 +++---
- modules/example/Makefile.am         |    4 ++--
- modules/ffi/Makefile.am             |    4 ++--
- modules/gettext/Makefile.am         |    4 ++--
- modules/gtkbuilder/Makefile.am      |    4 ++--
- modules/libxml/Makefile.am          |    6 +++---
- modules/mpfr/Makefile.am            |    4 ++--
- modules/multiprocessing/Makefile.am |    4 ++--
- modules/os/Makefile.am              |    4 ++--
- modules/readline/Makefile.am        |    4 ++--
- modules/sandbox/Makefile.am         |    4 ++--
- modules/sqlite/Makefile.am          |    4 ++--
- seed.pc.in                          |    4 ++--
- src/Makefile.am                     |    2 +-
- tests/c/Makefile.am                 |    2 +-
+ configure.ac                        |  2 ++
+ extensions/Makefile.am              |  6 +++---
+ libseed/Makefile.am                 | 12 ++++++------
+ modules/DynamicObject/Makefile.am   |  2 +-
+ modules/cairo/Makefile.am           |  4 ++--
+ modules/canvas/Makefile.am          |  4 ++--
+ modules/dbus/Makefile.am            |  6 +++---
+ modules/example/Makefile.am         |  4 ++--
+ modules/ffi/Makefile.am             |  4 ++--
+ modules/gettext/Makefile.am         |  4 ++--
+ modules/gtkbuilder/Makefile.am      |  4 ++--
+ modules/libxml/Makefile.am          |  6 +++---
+ modules/mpfr/Makefile.am            |  4 ++--
+ modules/multiprocessing/Makefile.am |  4 ++--
+ modules/os/Makefile.am              |  4 ++--
+ modules/readline/Makefile.am        |  4 ++--
+ modules/sandbox/Makefile.am         |  4 ++--
+ modules/sqlite/Makefile.am          |  4 ++--
+ seed.pc.in                          |  4 ++--
+ src/Makefile.am                     |  2 +-
+ tests/c/Makefile.am                 |  2 +-
  21 files changed, 46 insertions(+), 44 deletions(-)
 
 commit 9aa7ca97a9e4d5f30c0d7f3a6fe05b2b407124dc
@@ -1127,7 +2483,7 @@ Date:   Mon Feb 7 21:46:26 2011 +0100
     
     Port code to be compilable with GTK+3.
 
- modules/cairo/seed-cairo.c |   12 ++++++------
+ modules/cairo/seed-cairo.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 5b748f5814dc9d8d91b33d86e14930c187c8cc1c
@@ -1138,7 +2494,7 @@ Date:   Thu Dec 9 21:07:50 2010 +0800
     
     overlay methods of object after interface methods so they override the properties
 
- libseed/seed-engine.c |    4 ++--
+ libseed/seed-engine.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d34283ef6728f483af9b65b1c48d2d3569f33edd
@@ -1147,7 +2503,7 @@ Date:   Tue Dec 7 21:44:53 2010 +0800
 
     bug #636647 - remove depreciated g_main_interation
 
- modules/dbus/util/dbus.c |    2 +-
+ modules/dbus/util/dbus.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4f78441320ca04c11183273b009bc2a1804222b5
@@ -1156,10 +2512,10 @@ Date:   Sat Nov 6 22:22:22 2010 -0400
 
     Fix documentation typo
 
- doc/reference/tmpl/seed-context.sgml  |   30 +++++++++++++++---------------
- tests/javascript/gtypes/testsuite.js  |   33 ++++++++++++++++++++++++++++++++-
- tests/javascript/signals/testsuite.js |   33 ++++++++++++++++++++++++++++++++-
- tests/javascript/structs/testsuite.js |   33 ++++++++++++++++++++++++++++++++-
+ doc/reference/tmpl/seed-context.sgml  | 30 +++++++++++++++---------------
+ tests/javascript/gtypes/testsuite.js  | 33 ++++++++++++++++++++++++++++++++-
+ tests/javascript/signals/testsuite.js | 33 ++++++++++++++++++++++++++++++++-
+ tests/javascript/structs/testsuite.js | 33 ++++++++++++++++++++++++++++++++-
  4 files changed, 111 insertions(+), 18 deletions(-)
 
 commit 2deaab0e96436e8b597825dc8a86a0a12937c44e
@@ -1168,21 +2524,21 @@ Date:   Sat Nov 6 09:37:04 2010 -0400
 
     docs: Remove incredibly outdated "building on OS X" documentation
 
- doc/reference/Makefile.am                   |    2 +-
- doc/reference/building-osx.sgml             |   43 ---------------------------
- doc/reference/seed-docs.sgml                |    1 -
- doc/reference/tmpl/seed-closure.sgml        |    3 ++
- doc/reference/tmpl/seed-context.sgml        |    3 ++
- doc/reference/tmpl/seed-eval.sgml           |    3 ++
- doc/reference/tmpl/seed-exception.sgml      |    3 ++
- doc/reference/tmpl/seed-jsclass.sgml        |    3 ++
- doc/reference/tmpl/seed-main.sgml           |    3 ++
- doc/reference/tmpl/seed-modules.sgml        |    3 ++
- doc/reference/tmpl/seed-nativefuncs.sgml    |    3 ++
- doc/reference/tmpl/seed-nativetypes.sgml    |    3 ++
- doc/reference/tmpl/seed-object.sgml         |    5 +++-
- doc/reference/tmpl/seed-signals.sgml        |    3 ++
- doc/reference/tmpl/seed-typeconversion.sgml |    3 ++
+ doc/reference/Makefile.am                   |  2 +-
+ doc/reference/building-osx.sgml             | 43 -----------------------------
+ doc/reference/seed-docs.sgml                |  1 -
+ doc/reference/tmpl/seed-closure.sgml        |  3 ++
+ doc/reference/tmpl/seed-context.sgml        |  3 ++
+ doc/reference/tmpl/seed-eval.sgml           |  3 ++
+ doc/reference/tmpl/seed-exception.sgml      |  3 ++
+ doc/reference/tmpl/seed-jsclass.sgml        |  3 ++
+ doc/reference/tmpl/seed-main.sgml           |  3 ++
+ doc/reference/tmpl/seed-modules.sgml        |  3 ++
+ doc/reference/tmpl/seed-nativefuncs.sgml    |  3 ++
+ doc/reference/tmpl/seed-nativetypes.sgml    |  3 ++
+ doc/reference/tmpl/seed-object.sgml         |  5 +++-
+ doc/reference/tmpl/seed-signals.sgml        |  3 ++
+ doc/reference/tmpl/seed-typeconversion.sgml |  3 ++
  15 files changed, 38 insertions(+), 46 deletions(-)
 
 commit a228b4e86372d45f03ecd98aec0f9dcec0d5945b
@@ -1193,8 +2549,8 @@ Date:   Wed Sep 22 08:01:45 2010 +0800
     
     It appears a few projects don't like implicit DSO linking...
 
- configure.ac    |    3 +++
- src/Makefile.am |    3 ++-
+ configure.ac    | 3 +++
+ src/Makefile.am | 3 ++-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 81baf4c61ea2bcdcfa0b0c7659306444e387f013
@@ -1205,7 +2561,7 @@ Date:   Wed Sep 22 07:21:39 2010 +0800
     
     https://bugzilla.gnome.org/show_bug.cgi?id=630258
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6361f9fc6c6a7eed53399e0eda72402517ec9496
@@ -1216,18 +2572,18 @@ Date:   Fri Sep 10 07:30:04 2010 +0800
     
     Use docdir rather than hardcoded datadir subdirectory
 
- Makefile.am                             |    6 ++----
- config.h.in                             |    3 +++
- doc/Makefile.am                         |    1 -
- doc/mapping/Makefile.am                 |    2 +-
- doc/modules/Makefile.am                 |    7 ++-----
- doc/modules/canvas/Makefile.am          |    2 +-
- doc/modules/gtkbuilder/Makefile.am      |    4 +---
- doc/modules/multiprocessing/Makefile.am |    2 +-
- doc/modules/readline/Makefile.am        |    2 +-
- doc/modules/sandbox/Makefile.am         |    4 +---
- doc/modules/sqlite/Makefile.am          |    2 +-
- doc/tutorial-standalone/Makefile.am     |    2 +-
+ Makefile.am                             | 6 ++----
+ config.h.in                             | 3 +++
+ doc/Makefile.am                         | 1 -
+ doc/mapping/Makefile.am                 | 2 +-
+ doc/modules/Makefile.am                 | 7 ++-----
+ doc/modules/canvas/Makefile.am          | 2 +-
+ doc/modules/gtkbuilder/Makefile.am      | 4 +---
+ doc/modules/multiprocessing/Makefile.am | 2 +-
+ doc/modules/readline/Makefile.am        | 2 +-
+ doc/modules/sandbox/Makefile.am         | 4 +---
+ doc/modules/sqlite/Makefile.am          | 2 +-
+ doc/tutorial-standalone/Makefile.am     | 2 +-
  12 files changed, 15 insertions(+), 22 deletions(-)
 
 commit c7476c4eea23549968dcf591774160c14437bdf8
@@ -1236,7 +2592,7 @@ Date:   Mon Aug 30 18:27:55 2010 -0400
 
     Postrelease version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f4798f474e0eecc0ec5bd2fea64bc8e2c8e64e85
@@ -1245,7 +2601,7 @@ Date:   Mon Aug 30 18:21:21 2010 -0400
 
     Update readme for webkit build changes
 
- README |    2 +-
+ README | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4d5ec90d0c29b05ae17e7c02565d4df3faeb850e
@@ -1254,7 +2610,7 @@ Date:   Mon Aug 30 18:19:31 2010 -0400
 
     Update version number.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c47937a3d6a150ad6d5c0482b0a3110c3da44a21
@@ -1263,7 +2619,7 @@ Date:   Mon Aug 30 18:19:06 2010 -0400
 
     Update news for release
 
- NEWS |   15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 73198a47b80dcd04631fde9e733639dadf9ef04e
@@ -1272,7 +2628,7 @@ Date:   Mon Aug 30 17:56:00 2010 -0400
 
     --with-webkit=3.0/1.0 instead of gtk-3.0/1.0, since the gtk distinction is meaningless (all of them are webkit-gtk, the name just changed)
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit e540d7fbc2eb95ed5ae92b3ed47b601dcdad4615
@@ -1290,21 +2646,21 @@ Date:   Mon Aug 9 11:32:06 2010 +0800
     Futhermore, seed-types are calling dlerror() and dlsym(), but I could not find
     -ldl in Makefile.
 
- libseed/Makefile.am                 |    6 ++++--
- modules/cairo/Makefile.am           |    5 ++++-
- modules/canvas/Makefile.am          |    5 ++++-
- modules/dbus/Makefile.am            |    7 +++++--
- modules/example/Makefile.am         |    5 ++++-
- modules/ffi/Makefile.am             |    5 ++++-
- modules/gettext/Makefile.am         |    5 ++++-
- modules/gtkbuilder/Makefile.am      |    5 ++++-
- modules/libxml/Makefile.am          |    5 ++++-
- modules/mpfr/Makefile.am            |    7 ++++---
- modules/multiprocessing/Makefile.am |    5 ++++-
- modules/os/Makefile.am              |    5 ++++-
- modules/readline/Makefile.am        |    7 +++++--
- modules/sandbox/Makefile.am         |    5 ++++-
- modules/sqlite/Makefile.am          |    6 +++++-
+ libseed/Makefile.am                 | 6 ++++--
+ modules/cairo/Makefile.am           | 5 ++++-
+ modules/canvas/Makefile.am          | 5 ++++-
+ modules/dbus/Makefile.am            | 7 +++++--
+ modules/example/Makefile.am         | 5 ++++-
+ modules/ffi/Makefile.am             | 5 ++++-
+ modules/gettext/Makefile.am         | 5 ++++-
+ modules/gtkbuilder/Makefile.am      | 5 ++++-
+ modules/libxml/Makefile.am          | 5 ++++-
+ modules/mpfr/Makefile.am            | 7 ++++---
+ modules/multiprocessing/Makefile.am | 5 ++++-
+ modules/os/Makefile.am              | 5 ++++-
+ modules/readline/Makefile.am        | 7 +++++--
+ modules/sandbox/Makefile.am         | 5 ++++-
+ modules/sqlite/Makefile.am          | 6 +++++-
  15 files changed, 63 insertions(+), 20 deletions(-)
 
 commit 051a51167d573dce1c5e28289a0ab3d81681a912
@@ -1316,7 +2672,7 @@ Date:   Mon Aug 9 11:26:45 2010 +0800
     The library name got changed from libwebkit-1.0 to libwebkitgtk-1.0, so
     we should support both.
 
- configure.ac |    5 +++--
+ configure.ac | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit f0a4e7be5ea6bdc5f991e806c972bca0d47791fc
@@ -1328,8 +2684,8 @@ Date:   Sat Aug 7 01:59:41 2010 +0200
     We need to make sure we reference webkit-1.0 if we build seed against
     webkit-1.0.
 
- configure.ac |    6 ++++--
- seed.pc.in   |    2 +-
+ configure.ac | 6 ++++--
+ seed.pc.in   | 2 +-
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit 9c98a38779f47aa7eb7a82db9ea45b20c0b16056
@@ -1343,7 +2699,7 @@ Date:   Fri Jul 16 20:46:16 2010 +0200
     
     https://bugzilla.gnome.org/show_bug.cgi?id=624562
 
- libseed/seed-api.c |    2 +-
+ libseed/seed-api.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a2ba35cd632a3ae15e7c320222fea7b02c79a84d
@@ -1354,7 +2710,7 @@ Date:   Fri Jul 16 20:29:44 2010 +0200
     
     https://bugzilla.gnome.org/show_bug.cgi?id=624560
 
- libseed/seed.h |    3 +++
+ libseed/seed.h | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 1c70da1a5c2684d71d5cd7c5ad97076f7d7c25eb
@@ -1365,7 +2721,7 @@ Date:   Fri Jul 16 12:01:07 2010 +0800
     
     As we have #ifdefs for new code we can support older versions (which are currently being included in distros..)
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ad9fcdcfa4db7b178d02389af48a59c087bc69a8
@@ -1376,7 +2732,7 @@ Date:   Fri Jul 16 11:53:10 2010 +0800
     
     add #ifdefs around caller allocates code to make sure it works with older versions of g-i-r
 
- libseed/seed-engine.c |   23 ++++++++++++++++++-----
+ libseed/seed-engine.c | 23 ++++++++++++++++++-----
  1 file changed, 18 insertions(+), 5 deletions(-)
 
 commit e77116f169645e3b950a84790d072d86009d99ca
@@ -1387,10 +2743,10 @@ Date:   Fri Jul 16 11:51:09 2010 +0800
     
     This enables fine tune checking for versions
 
- configure.ac           |    8 ++++----
- libseed/Makefile.am    |    3 +--
- libseed/seed-closure.c |    4 ++--
- libseed/seed-types.c   |    6 +++---
+ configure.ac           | 8 ++++----
+ libseed/Makefile.am    | 3 +--
+ libseed/seed-closure.c | 4 ++--
+ libseed/seed-types.c   | 6 +++---
  4 files changed, 10 insertions(+), 11 deletions(-)
 
 commit 65c532e13bf59aa8844a3d81d41197d7c897af5e
@@ -1401,7 +2757,7 @@ Date:   Wed Jul 14 12:06:01 2010 +0800
     
     used to say --with-seed-webkit on --help
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 72a9504225312f6c0999f7507af32938a4c25bdd
@@ -1414,7 +2770,7 @@ Date:   Tue Jul 13 18:41:09 2010 +0800
     
     Note there is no support to free the allocated memory if the call fails.
 
- libseed/seed-engine.c |  102 ++++++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-engine.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 97 insertions(+), 5 deletions(-)
 
 commit d31acaad673eecd97e3f70720af81c9ef34ab4cd
@@ -1448,10 +2804,10 @@ Date:   Tue Jul 13 15:58:32 2010 +0800
         o.foobar = 42;      // will call o.set_property('foobar',42)
         print(o.something); // will call o.get_property('something)
 
- configure.ac                               |   14 ++
- modules/DynamicObject/Makefile.am          |   25 ++++
- modules/DynamicObject/seed-DynamicObject.c |  205 ++++++++++++++++++++++++++++
- modules/Makefile.am                        |    2 +-
+ configure.ac                               |  14 ++
+ modules/DynamicObject/Makefile.am          |  25 ++++
+ modules/DynamicObject/seed-DynamicObject.c | 205 +++++++++++++++++++++++++++++
+ modules/Makefile.am                        |   2 +-
  4 files changed, 245 insertions(+), 1 deletion(-)
 
 commit b9a71e10a2fa30cb45ad2fe7ecbcc7ece6e1c941
@@ -1462,10 +2818,10 @@ Date:   Tue Jul 13 11:42:39 2010 +0800
     
     Set's up defines for GOBJECT_INTROSPECTION_VERSION_MAJOR and GOBJECT_INTROSPECTION_VERSION_MINOR
 
- configure.ac           |    8 ++++++++
- libseed/Makefile.am    |    4 +++-
- libseed/seed-closure.c |   41 ++++++++++++++++++++++++++++++++++++++++-
- libseed/seed-types.c   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac           |  8 ++++++++
+ libseed/Makefile.am    |  4 +++-
+ libseed/seed-closure.c | 41 ++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-types.c   | 47 +++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 98 insertions(+), 2 deletions(-)
 
 commit c8174c8ea9f184f45e810315bd1d41955f284277
@@ -1476,7 +2832,7 @@ Date:   Mon Jul 12 16:38:12 2010 +0800
     
     Got the default name wrong on last commit.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ae2d2a618ead6dab7a298222382d2c8b273ed585
@@ -1487,7 +2843,7 @@ Date:   Mon Jul 12 16:36:57 2010 +0800
     
     Defaults still builds with 3.0
 
- configure.ac |   26 ++++++++++++++++++++++++--
+ configure.ac | 26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
 
 commit 243cdfa80a47a18b8e4dd6bd1547f722b477bbcb
@@ -1496,7 +2852,7 @@ Date:   Sun Jul 11 23:13:15 2010 -0700
 
     Postrelease version bump
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3581c38b79403910afb0907ece3fb95286b69f05
@@ -1505,7 +2861,7 @@ Date:   Sun Jul 11 23:03:34 2010 -0700
 
     Correct version (2.31.5)
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8bf3911b4cbc7bc472e57006c6d0e9a5731500e1
@@ -1514,7 +2870,7 @@ Date:   Sun Jul 11 23:02:50 2010 -0700
 
     Update news
 
- NEWS |   14 ++++++++++++++
+ NEWS | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 98ed3001015e37ad66982cc3e3fc8f0a999117a3
@@ -1523,7 +2879,7 @@ Date:   Sun Jul 11 22:49:39 2010 -0700
 
     Update readme for WebKit changes.
 
- README |    2 +-
+ README | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c4685dc7fe98f3af48a805d65cafcfb5be8de931
@@ -1532,8 +2888,8 @@ Date:   Sun Jul 11 22:37:28 2010 -0700
 
     Remove check for JSContextGroupCreate now that we're 3.0+ only
 
- config.h.in  |    3 ---
- configure.ac |    6 ------
+ config.h.in  | 3 ---
+ configure.ac | 6 ------
  2 files changed, 9 deletions(-)
 
 commit 05b2755106c73ee4e431c6b12ed426ba7b749b07
@@ -1544,9 +2900,9 @@ Date:   Thu Jul 1 11:00:05 2010 -0500
     
     Bug #623302
 
- config.h.in  |    4 ++--
- configure.ac |    6 +++---
- seed.pc.in   |    2 +-
+ config.h.in  | 4 ++--
+ configure.ac | 6 +++---
+ seed.pc.in   | 2 +-
  3 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 689e8018c87c65c77a1e5e96acb30dab91bd05e5
@@ -1555,8 +2911,8 @@ Date:   Sun Jul 11 17:38:19 2010 -0700
 
     Fix build with latest GI, where machine-dependent type tags were removed.
 
- libseed/seed-closure.c |   36 ------------------------------------
- libseed/seed-types.c   |   37 +------------------------------------
+ libseed/seed-closure.c | 36 ------------------------------------
+ libseed/seed-types.c   | 37 +------------------------------------
  2 files changed, 1 insertion(+), 72 deletions(-)
 
 commit b63973c61e75e59a9256a0c0a0cf90b0fad80afb
@@ -1570,7 +2926,7 @@ Date:   Mon Jul 12 11:04:00 2010 +0800
     
     Fixes arguments so they match the Webkit spec
 
- libseed/seed.h |    4 +---
+ libseed/seed.h | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 97daccc00d1f2dda5ead4f1404baedf1c3e7d0ed
@@ -1581,7 +2937,7 @@ Date:   Sun Jul 11 17:27:09 2010 +0800
     
     See bug #615861 for discussion on gtk_status_icon_get_geometry data
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5bab9a93c01d2063ec0d70b28d09ddf2ad8747a5
@@ -1593,7 +2949,7 @@ Date:   Mon Jul 5 13:55:12 2010 +0800
     example : GLib.log_set_default_handler(f,null);
     Returns (f) the callback, our code does not currently handle this so we probably just return null
 
- libseed/seed-types.c |   18 ++++++++++++++++++
+ libseed/seed-types.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit bbbc6f9d79d62fb0c220d155dec98a823830299c
@@ -1604,7 +2960,7 @@ Date:   Mon Jul 5 13:15:47 2010 +0800
     
     also fixes toValue.js as well.
 
- libseed/seed-importer.c |    8 ++++++++
+ libseed/seed-importer.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 98550799a4e8861d0d2c4ff8fc4e1aafd4909e0e
@@ -1615,7 +2971,7 @@ Date:   Mon Jul 5 13:08:17 2010 +0800
     
     Changes Seed.print to use g_print, this enables set_print_handler to be used to redirect output.
 
- libseed/seed-builtins.c |    2 +-
+ libseed/seed-builtins.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1441bf86f7fc02cc7717b88f88ae85ba175eb726
@@ -1626,7 +2982,7 @@ Date:   Wed Jun 30 10:19:31 2010 +0800
     
     Fix to previous commit, handling situation where __script_path__ was not set in calling script
 
- modules/sandbox/seed-sandbox.c |    8 +++++++-
+ modules/sandbox/seed-sandbox.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 5b169f4086f735a9921f4c049e66cf3d264dca38
@@ -1637,7 +2993,7 @@ Date:   Wed Jun 30 10:08:17 2010 +0800
     
     Sets the __script_path__ to be the same as the calling scripts path for new Contexts.
 
- modules/sandbox/seed-sandbox.c |    4 ++++
+ modules/sandbox/seed-sandbox.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit dd8c459cd3ecc38c68d7d2f1cfdc038ce2a2ad4d
@@ -1648,7 +3004,7 @@ Date:   Tue Jun 29 23:03:32 2010 +0800
     
     Cast JSValueMakeNull on make_struct / make_union to JSObjectRef to remove compiler warnings.
 
- libseed/seed-structs.c |    4 ++--
+ libseed/seed-structs.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d51f744c49a305717d66bc96962f83d89ba8c176
@@ -1661,7 +3017,7 @@ Date:   Tue Jun 29 22:52:48 2010 +0800
     Add the feature that once a module is loaded, it also will attempt to load libseed_XXXXX.js from the same directory.
     This can be used to add features to the module
 
- libseed/seed-importer.c |   21 ++++++++++++++++++---
+ libseed/seed-importer.c | 21 ++++++++++++++++++---
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 commit 6f4a8bd1178150df20ea071716086784094830c5
@@ -1674,7 +3030,7 @@ Date:   Tue Jun 29 18:36:10 2010 +0800
     
     This reverts commit a7d0f88b19e1142b9dafbe184bcb1d97a636dbf6.
 
- modules/sandbox/seed-sandbox.c |   20 --------------------
+ modules/sandbox/seed-sandbox.c | 20 --------------------
  1 file changed, 20 deletions(-)
 
 commit edb3288b0c7359644342ab0f10cfa69c53f6b117
@@ -1688,7 +3044,7 @@ Date:   Fri Jun 18 19:06:15 2010 +0800
     - Lastly, looks in all other locations. (eg. modules/ library paths etc.)
     * removes looking in current working directory (was previous behaviour)
 
- extensions/Seed.js.in |    4 ++--
+ extensions/Seed.js.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5d41b2a81c8a6d99bd0aa02f89760022bfee2bed
@@ -1703,7 +3059,7 @@ Date:   Fri Jun 18 18:57:44 2010 +0800
      - match .js file eg. imports.filename -> filename.js
      - match module eg. imports.somelib -> libseed_somelib.so
 
- libseed/seed-importer.c |  216 ++++++++++++++++++-----------------------------
+ libseed/seed-importer.c | 216 ++++++++++++++++++------------------------------
  1 file changed, 82 insertions(+), 134 deletions(-)
 
 commit dbcaa116d1762d28d56cabdf27da750ea3c296b2
@@ -1716,7 +3072,7 @@ Date:   Thu May 6 17:07:24 2010 +0800
     GValues - this makes a assumption that basic types (not objects) would be allowed where interfaces where
     expected.. - hopefully our casting code produces another warning if the types do not match.
 
- libseed/seed-engine.c |   16 ++++++++++++----
+ libseed/seed-engine.c | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit 7e337de26b10a7670b7d438e9037884d4a216fac
@@ -1727,7 +3083,7 @@ Date:   Tue May 4 12:56:42 2010 +0800
     
     rather than silently ignore failure, show a g_warning message
 
- libseed/seed-structs.c |    8 +++++++-
+ libseed/seed-structs.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit d308d7d9421acf704fca98d90d0023e336451227
@@ -1738,7 +3094,7 @@ Date:   Tue May 4 12:49:54 2010 +0800
     
     rather than silently ignore failure, show a g_warning message
 
- libseed/seed-structs.c |    5 +++++
+ libseed/seed-structs.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 3791ecad4d0fb31a50077bd102a898544b6c0cfc
@@ -1751,7 +3107,7 @@ Date:   Sun Apr 18 15:37:14 2010 +0800
     expect the userdata to be a pointer to the status icon. This change checks void*
     arguments and if they are gobjects, sends them.
 
- libseed/seed-types.c |   22 ++++++++++++++++++++--
+ libseed/seed-types.c | 22 ++++++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)
 
 commit c67c8034d0cfd0f5c69b8f6fb726e9e24b502fc6
@@ -1760,7 +3116,7 @@ Date:   Mon Mar 29 00:12:00 2010 -0400
 
     Postrelease version bump.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 076e20be56601bd470a8297f5226968757140727
@@ -1769,8 +3125,8 @@ Date:   Mon Mar 29 00:04:27 2010 -0400
 
     Update NEWS for 2.31.1
 
- NEWS         |   11 +++++++++++
- configure.ac |    2 +-
+ NEWS         | 11 +++++++++++
+ configure.ac |  2 +-
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit eb6b9c9eb55fc6e71872c459b7a8f2db5341e705
@@ -1779,7 +3135,7 @@ Date:   Sun Mar 28 23:33:55 2010 -0400
 
     Update NEWS for 2.30
 
- NEWS |   10 ++++++++++
+ NEWS | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 45e262f545cb6be137eeb6632dd8605237d8f8f4
@@ -1790,7 +3146,7 @@ Date:   Wed Mar 17 12:12:49 2010 +0800
     
     gtkdoc comments for 2 new methods to initialize using existing context
 
- libseed/seed-engine.c |   33 ++++++++++++++++++++++++++++++++-
+ libseed/seed-engine.c | 33 ++++++++++++++++++++++++++++++++-
  1 file changed, 32 insertions(+), 1 deletion(-)
 
 commit 0d89528065d18af2c17c29b79649819015bad3ab
@@ -1802,7 +3158,7 @@ Date:   Fri Mar 12 12:31:57 2010 +0800
     As we do not throw Exceptions currently, it is difficult to work out what caused a warning,
     This just adds the Container/Namespace of the method that caused the problem
 
- libseed/seed-engine.c |    7 ++++++-
+ libseed/seed-engine.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 675adddd0711902892de9b4b9366f83cce939b4c
@@ -1825,8 +3181,8 @@ Date:   Fri Mar 12 12:17:24 2010 +0800
       g_signal_connect(G_OBJECT(web_view), "window-object-cleared",
           				G_CALLBACK(window_object_cleared), NULL);
 
- libseed/seed-engine.c |   56 +++++++++++++++++++++++++++++++++----------------
- libseed/seed.h        |    6 +++++-
+ libseed/seed-engine.c | 56 ++++++++++++++++++++++++++++++++++-----------------
+ libseed/seed.h        |  6 +++++-
  2 files changed, 43 insertions(+), 19 deletions(-)
 
 commit 848d7b2d7b56477a3ef56e2c8a731b2f210e1f22
@@ -1838,7 +3194,7 @@ Date:   Thu Mar 11 23:03:47 2010 +0800
         ClipboardTextReceivedFunc - char* text got freed before it was used.
         The logic in release_in_arg is inconsitant with what I think is being attempted here.
 
- libseed/seed-closure.c |    2 +-
+ libseed/seed-closure.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a7d0f88b19e1142b9dafbe184bcb1d97a636dbf6
@@ -1854,7 +3210,7 @@ Date:   Thu Mar 11 15:09:19 2010 +0800
     
     Very usefull to implement a Console...
 
- modules/sandbox/seed-sandbox.c |   20 ++++++++++++++++++++
+ modules/sandbox/seed-sandbox.c | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit c652bb73c3e28cfdfb8494bbdde5d90a927bc5f8
@@ -1866,7 +3222,7 @@ Date:   Tue Mar 9 17:15:36 2010 +0800
     If you have two files called Abc.js in two different directories, the error message for syntax error (and others)
     does not distinguish between them. The fix is to send the fully qualified path to the method.
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2c46218b7459d0f47b9ae5043c38e8f797c1a293
@@ -1879,7 +3235,7 @@ Date:   Mon Mar 1 17:06:01 2010 +0800
     updated to show this (Gtk had a big patchfest last week to add this, but it will not be reflected on end users
     desktop gir's for a while) - until then we issue g_warnings.
 
- libseed/seed-engine.c |   12 ++++++++----
+ libseed/seed-engine.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit ad29012e1a4fee2692077ef44fde42acca6194f8
@@ -1890,7 +3246,7 @@ Date:   Fri Feb 26 17:20:42 2010 +0800
     
     This may need moving upwards into make_argument, but that would mean the error messages would be less useful.
 
- libseed/seed-engine.c |   29 ++++++++++++++++++++++-------
+ libseed/seed-engine.c | 29 ++++++++++++++++++++++-------
  1 file changed, 22 insertions(+), 7 deletions(-)
 
 commit 6b260de005921f125b45b62ccb4b8f5860b3befd
@@ -1901,7 +3257,7 @@ Date:   Wed Feb 24 13:42:16 2010 +0800
     
     Adds name, direction and allow_none
 
- libseed/seed-builtins.c |   24 ++++++++++++++++++++----
+ libseed/seed-builtins.c | 24 ++++++++++++++++++++----
  1 file changed, 20 insertions(+), 4 deletions(-)
 
 commit 587a0d3fe2f84797a57c39df0f041d0d649a4039
@@ -1912,7 +3268,7 @@ Date:   Wed Feb 24 13:32:54 2010 +0800
     
     After reading the commit history - one of the notes mentioned that Gtypes should be long..
 
- libseed/seed-types.c |    2 +-
+ libseed/seed-types.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 52839cb9e8993c1cfa90286f2526cb1db845d3e1
@@ -1928,7 +3284,7 @@ Date:   Wed Feb 24 13:07:39 2010 +0800
     b) If the first out argument is an object, then all the out values are set as properties on that.
     c) still supports out_argument.value setting (previous way of doing this)
 
- libseed/seed-engine.c |   95 ++++++++++++++++++++++++++++++++++++++++---------
+ libseed/seed-engine.c | 95 ++++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 78 insertions(+), 17 deletions(-)
 
 commit d7897d2dc8a590302b8b0c14c813b573b86e6d98
@@ -1939,7 +3295,7 @@ Date:   Wed Feb 24 12:54:45 2010 +0800
     
     White space fix
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 75c51fbc6b021bcb1225bdb25eca4ca284f75a39
@@ -1950,7 +3306,7 @@ Date:   Wed Feb 24 12:49:58 2010 +0800
     
     Used by gst_message_parse_error() - turns gerror into non-thrown exception
 
- libseed/seed-types.c |    6 ++++++
+ libseed/seed-types.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit d8749191461e427d3b68360781af8b157752d73d
@@ -1963,7 +3319,7 @@ Date:   Wed Feb 24 12:31:30 2010 +0800
     This does however break a few function calls, that have got broken gir notes,
     eg. gtk_drag_source_set gtk_drag_dest_set and gst_bus_add_watch
 
- libseed/seed-engine.c |   19 +++++++++++++++++--
+ libseed/seed-engine.c | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 commit 6a62d673c077c08726a9eb9c1b106ce900dfdc66
@@ -1974,7 +3330,7 @@ Date:   Wed Feb 24 11:35:00 2010 +0800
     
     used by g_type_get_interfaces - which returns an array of Gtypes
 
- libseed/seed-types.c |   15 +++++++++++++++
+ libseed/seed-types.c | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit ad8db911265bbd356882344ed046c3830d200199
@@ -1983,7 +3339,7 @@ Date:   Mon Feb 22 20:59:47 2010 -0500
 
     Post-release version increment.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5b6dc6bb35c999747fb15ffe7782c3ff5f49ef13
@@ -1992,7 +3348,7 @@ Date:   Mon Feb 22 20:58:52 2010 -0500
 
     2.29.91.1 release (oops!)
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fb55efd88b03fd51510232e505233c309a16146e
@@ -2003,7 +3359,7 @@ Date:   Sun Feb 21 11:32:35 2010 +0800
     
     Gio.outputstream.write() uses void* pointers to write generic data.
 
- libseed/seed-types.c |    4 ++++
+ libseed/seed-types.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 79492a4c30600fd9c86bd345d7828d6e0354217f
@@ -2012,7 +3368,7 @@ Date:   Thu Feb 18 18:19:19 2010 -0500
 
     Ignore m4 dir (which we don't need in Git)
 
- .gitignore |    1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 478c02751e32b327feeb5b52a5069e2c049446aa
@@ -2021,7 +3377,7 @@ Date:   Thu Feb 18 18:19:04 2010 -0500
 
     Fix missing signal test
 
- tests/javascript/signals/signal-invalid.js |   11 ++++++++++-
+ tests/javascript/signals/signal-invalid.js | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 9ff411c674f47b3464777993db4ca6976b94234c
@@ -2038,7 +3394,7 @@ Date:   Wed Feb 17 17:04:54 2010 -0500
     
     Bug #610311
 
- libseed/seed-signals.c |   16 +++++++++++++---
+ libseed/seed-signals.c | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 commit a042207f17caa1d3d5926d11e29cffbb85346cf8
@@ -2065,7 +3421,7 @@ Date:   Mon Feb 8 18:46:49 2010 -0500
 
     Post-release version increment
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bfebe34bf15e6e17ea8c32eb78002b39fac3f2d1
@@ -2074,8 +3430,8 @@ Date:   Mon Feb 8 18:44:23 2010 -0500
 
     NEWS for 2.29.90
 
- NEWS         |    9 +++++++++
- configure.ac |    2 +-
+ NEWS         | 9 +++++++++
+ configure.ac | 2 +-
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit e29a3aca80d3e7d1095a093e2778ce6433aa9b0e
@@ -2086,7 +3442,7 @@ Date:   Fri Feb 5 21:10:58 2010 -0500
     
     Closes BGO#607987
 
- libseed/seed-importer.c |   18 +++++++++++++++++-
+ libseed/seed-importer.c | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 commit dbf7423f196043966b90fa4aad6dc50f51647bf5
@@ -2098,8 +3454,8 @@ Date:   Fri Feb 5 20:57:24 2010 -0500
     Fixes gtk_tree_model_get_value calls eventually segfaulting
     Fixes BGO#608015
 
- libseed/seed-engine.c  |   11 ++++++++---
- libseed/seed-structs.c |   24 ++++++++++++++++++++++++
+ libseed/seed-engine.c  | 11 ++++++++---
+ libseed/seed-structs.c | 24 ++++++++++++++++++++++++
  2 files changed, 32 insertions(+), 3 deletions(-)
 
 commit 9a7d0b8d303909a0073bd1ca0009416554470754
@@ -2116,7 +3472,7 @@ Date:   Tue Feb 2 23:22:40 2010 +0000
     This patch fixes this by not invoking the
     closure when a reply is empty.
 
- modules/dbus/module.c |   15 ++++++++++++++-
+ modules/dbus/module.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 commit 227f3df192bd6df029f3779a26e35e9a4a343a9b
@@ -2125,7 +3481,7 @@ Date:   Mon Jan 25 18:10:35 2010 -0500
 
     Post-release version bump.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8c9a7f4f7bd2fbc7b380e2718d2375c1a346959a
@@ -2134,8 +3490,8 @@ Date:   Fri Jan 22 16:25:38 2010 -0500
 
     Update manpage and --help output with -e, etc.
 
- doc/seed.1 |    9 ++++++++-
- src/args.c |    2 +-
+ doc/seed.1 | 9 ++++++++-
+ src/args.c | 2 +-
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit f7c089d060eb030a6af4dcaa370e5c6c649db5ef
@@ -2144,8 +3500,8 @@ Date:   Sun Jan 17 01:46:34 2010 -0500
 
     Add -e option to repl.
 
- src/args.c |    6 +++++-
- src/main.c |   50 +++++++++++++++++++++++++++++++++++++++++++-------
+ src/args.c |  6 +++++-
+ src/main.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
  2 files changed, 48 insertions(+), 8 deletions(-)
 
 commit aec73be07dc64cf77de23ff637f1d568d21299b2
@@ -2154,10 +3510,10 @@ Date:   Wed Jan 6 14:11:54 2010 -0500
 
     Minor mpfr style change
 
- modules/mpfr/seed-mpfr-arithmetic.c |   66 ++++++++++++++--------------
- modules/mpfr/seed-mpfr-cmp.c        |   30 ++++++-------
- modules/mpfr/seed-mpfr-trig.c       |   82 +++++++++++++++++------------------
- modules/mpfr/seed-mpfr.c            |   70 +++++++++++++++---------------
+ modules/mpfr/seed-mpfr-arithmetic.c | 66 ++++++++++++++---------------
+ modules/mpfr/seed-mpfr-cmp.c        | 30 +++++++-------
+ modules/mpfr/seed-mpfr-trig.c       | 82 ++++++++++++++++++-------------------
+ modules/mpfr/seed-mpfr.c            | 70 +++++++++++++++----------------
  4 files changed, 124 insertions(+), 124 deletions(-)
 
 commit 32997f9ee3d2f407125b4d6f1ee4015a750e71f4
@@ -2168,10 +3524,10 @@ Date:   Wed Jan 6 14:03:33 2010 -0500
     
     I wrote this useless part, not Robb, and it's 2010.
 
- modules/mpfr/seed-mpfr-arithmetic.c |    2 +-
- modules/mpfr/seed-mpfr-cmp.c        |    2 +-
- modules/mpfr/seed-mpfr-trig.c       |    2 +-
- modules/mpfr/seed-mpfr.c            |    2 +-
+ modules/mpfr/seed-mpfr-arithmetic.c | 2 +-
+ modules/mpfr/seed-mpfr-cmp.c        | 2 +-
+ modules/mpfr/seed-mpfr-trig.c       | 2 +-
+ modules/mpfr/seed-mpfr.c            | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 59ff5495fb88023a3bcf615cc2e9499b54caec7b
@@ -2180,9 +3536,9 @@ Date:   Wed Jan 6 12:34:59 2010 -0500
 
     Add printerr
 
- libseed/seed-builtins.c |   33 +++++++++++++++++++++++++++++++++
- libseed/seed-builtins.h |    1 +
- libseed/seed-engine.c   |   10 ++++++----
+ libseed/seed-builtins.c | 33 +++++++++++++++++++++++++++++++++
+ libseed/seed-builtins.h |  1 +
+ libseed/seed-engine.c   | 10 ++++++----
  3 files changed, 40 insertions(+), 4 deletions(-)
 
 commit 46d543e06a32ce4c2ec9dbecbf4eac7c0df28570
@@ -2191,7 +3547,7 @@ Date:   Sat Jan 16 05:03:19 2010 -0500
 
     The manpage had completely incorrect command line arguments (triple dashes?!)
 
- doc/seed.1 |    4 ++--
+ doc/seed.1 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5efce55da01646afdf1c46edefa27d62f04292da
@@ -2206,9 +3562,9 @@ Date:   Thu Jan 14 23:36:17 2010 -0500
     clear it the first time we encounter it (when the class is created, the
     first time it's instantiated).
 
- libseed/seed-engine.c                                 |   15 +++++++++++++++
- libseed/seed-gtype.c                                  |   11 ++++-------
- tests/javascript/gtypes/gtype-class-init-exception.js |    9 +--------
+ libseed/seed-engine.c                                 | 15 +++++++++++++++
+ libseed/seed-gtype.c                                  | 11 ++++-------
+ tests/javascript/gtypes/gtype-class-init-exception.js |  9 +--------
  3 files changed, 20 insertions(+), 15 deletions(-)
 
 commit f23eef37bae31dc8c39678f5282a089cdafba21a
@@ -2222,68 +3578,68 @@ Date:   Thu Jan 14 20:37:02 2010 -0500
     
     This reverts commit 018aaa4edbc49f1b1db1ea54417388f857ee3f12.
 
- tests/javascript/argv.js                              |    4 ++--
- tests/javascript/array-gtype.js                       |    2 +-
- tests/javascript/builtin-argument-length.js           |    2 +-
- tests/javascript/check-syntax.js                      |    2 +-
- tests/javascript/closure-finalization.js              |    2 +-
- tests/javascript/compare.js                           |    2 +-
- tests/javascript/constructor-args.js                  |    2 +-
- tests/javascript/constructor-prototype.js             |    2 +-
- tests/javascript/enum.js                              |    2 +-
- tests/javascript/everything.js                        |    2 +-
- tests/javascript/fork.js                              |    2 +-
- tests/javascript/function-info.js                     |    2 +-
- tests/javascript/gdk-event.js                         |    2 +-
- tests/javascript/gerror.js                            |    2 +-
- tests/javascript/gobject-scope.js                     |    2 +-
- tests/javascript/gtypes/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtypes/gtype-extraprop.js            |    2 +-
- tests/javascript/gtypes/gtype-gtype-class-init.js     |    2 +-
- tests/javascript/gtypes/gtype-gtype.js                |    2 +-
- tests/javascript/gtypes/gtype-property-construct.js   |    2 +-
- tests/javascript/gtypes/gtype-property-nice.js        |    2 +-
- tests/javascript/gtypes/gtype-property.js             |    2 +-
- tests/javascript/gtypes/gtype-self.js                 |    2 +-
- tests/javascript/gtypes/gtype-signal-args.js          |    2 +-
- tests/javascript/gtypes/gtype-signal.js               |    2 +-
- tests/javascript/gtypes/gtype-typerror.js             |    2 +-
- tests/javascript/gtypes/gtype.js                      |    2 +-
- tests/javascript/gvalue-argument.js                   |    2 +-
- tests/javascript/include-syntax.js                    |    2 +-
- tests/javascript/include.js                           |    2 +-
- tests/javascript/introspect.js                        |    2 +-
- tests/javascript/json-constructor.js                  |    2 +-
- tests/javascript/json.js                              |    2 +-
- tests/javascript/list-test.js                         |    2 +-
- tests/javascript/modules-noasserts.js                 |    2 +-
- tests/javascript/modules.js                           |    4 ++--
- tests/javascript/native-closure-exception.js          |    2 +-
- tests/javascript/native-closure.js                    |    2 +-
- tests/javascript/object-info.js                       |    2 +-
- tests/javascript/out-test.js                          |    2 +-
- tests/javascript/property-benchmark.js                |    2 +-
- tests/javascript/property-glib-exception.js           |    2 +-
- tests/javascript/quit.js                              |    2 +-
- tests/javascript/signals/signal-connect.js            |    2 +-
- tests/javascript/signals/signal-disconnect.js         |    2 +-
- tests/javascript/signals/signal-exception.js          |    2 +-
- tests/javascript/signals/signal-expects.js            |    2 +-
- tests/javascript/signals/signal-invalid.js            |    2 +-
- tests/javascript/signals/signal-nofunc.js             |    2 +-
- tests/javascript/signals/signal-userdata.js           |    2 +-
- tests/javascript/signals/signal.js                    |    2 +-
- tests/javascript/sqlite.js                            |    2 +-
- tests/javascript/structs/struct-constructor.js        |    2 +-
- tests/javascript/structs/struct-enumerate.js          |    2 +-
- tests/javascript/structs/struct-functions.js          |    2 +-
- tests/javascript/structs/struct-nested-set.js         |    2 +-
- tests/javascript/structs/struct-null.js               |    2 +-
- tests/javascript/structs/struct-offsets.js            |    2 +-
- tests/javascript/structs/struct-set-member.js         |    2 +-
- tests/javascript/structs/struct-union-enumerate.js    |    2 +-
- tests/javascript/syntax-test.js                       |    2 +-
- tests/javascript/type-conversion.js                   |    2 +-
+ tests/javascript/argv.js                              | 4 ++--
+ tests/javascript/array-gtype.js                       | 2 +-
+ tests/javascript/builtin-argument-length.js           | 2 +-
+ tests/javascript/check-syntax.js                      | 2 +-
+ tests/javascript/closure-finalization.js              | 2 +-
+ tests/javascript/compare.js                           | 2 +-
+ tests/javascript/constructor-args.js                  | 2 +-
+ tests/javascript/constructor-prototype.js             | 2 +-
+ tests/javascript/enum.js                              | 2 +-
+ tests/javascript/everything.js                        | 2 +-
+ tests/javascript/fork.js                              | 2 +-
+ tests/javascript/function-info.js                     | 2 +-
+ tests/javascript/gdk-event.js                         | 2 +-
+ tests/javascript/gerror.js                            | 2 +-
+ tests/javascript/gobject-scope.js                     | 2 +-
+ tests/javascript/gtypes/gtype-class-init-exception.js | 2 +-
+ tests/javascript/gtypes/gtype-extraprop.js            | 2 +-
+ tests/javascript/gtypes/gtype-gtype-class-init.js     | 2 +-
+ tests/javascript/gtypes/gtype-gtype.js                | 2 +-
+ tests/javascript/gtypes/gtype-property-construct.js   | 2 +-
+ tests/javascript/gtypes/gtype-property-nice.js        | 2 +-
+ tests/javascript/gtypes/gtype-property.js             | 2 +-
+ tests/javascript/gtypes/gtype-self.js                 | 2 +-
+ tests/javascript/gtypes/gtype-signal-args.js          | 2 +-
+ tests/javascript/gtypes/gtype-signal.js               | 2 +-
+ tests/javascript/gtypes/gtype-typerror.js             | 2 +-
+ tests/javascript/gtypes/gtype.js                      | 2 +-
+ tests/javascript/gvalue-argument.js                   | 2 +-
+ tests/javascript/include-syntax.js                    | 2 +-
+ tests/javascript/include.js                           | 2 +-
+ tests/javascript/introspect.js                        | 2 +-
+ tests/javascript/json-constructor.js                  | 2 +-
+ tests/javascript/json.js                              | 2 +-
+ tests/javascript/list-test.js                         | 2 +-
+ tests/javascript/modules-noasserts.js                 | 2 +-
+ tests/javascript/modules.js                           | 4 ++--
+ tests/javascript/native-closure-exception.js          | 2 +-
+ tests/javascript/native-closure.js                    | 2 +-
+ tests/javascript/object-info.js                       | 2 +-
+ tests/javascript/out-test.js                          | 2 +-
+ tests/javascript/property-benchmark.js                | 2 +-
+ tests/javascript/property-glib-exception.js           | 2 +-
+ tests/javascript/quit.js                              | 2 +-
+ tests/javascript/signals/signal-connect.js            | 2 +-
+ tests/javascript/signals/signal-disconnect.js         | 2 +-
+ tests/javascript/signals/signal-exception.js          | 2 +-
+ tests/javascript/signals/signal-expects.js            | 2 +-
+ tests/javascript/signals/signal-invalid.js            | 2 +-
+ tests/javascript/signals/signal-nofunc.js             | 2 +-
+ tests/javascript/signals/signal-userdata.js           | 2 +-
+ tests/javascript/signals/signal.js                    | 2 +-
+ tests/javascript/sqlite.js                            | 2 +-
+ tests/javascript/structs/struct-constructor.js        | 2 +-
+ tests/javascript/structs/struct-enumerate.js          | 2 +-
+ tests/javascript/structs/struct-functions.js          | 2 +-
+ tests/javascript/structs/struct-nested-set.js         | 2 +-
+ tests/javascript/structs/struct-null.js               | 2 +-
+ tests/javascript/structs/struct-offsets.js            | 2 +-
+ tests/javascript/structs/struct-set-member.js         | 2 +-
+ tests/javascript/structs/struct-union-enumerate.js    | 2 +-
+ tests/javascript/syntax-test.js                       | 2 +-
+ tests/javascript/type-conversion.js                   | 2 +-
  62 files changed, 64 insertions(+), 64 deletions(-)
 
 commit 1300996938d77f8ea7e6739b4d912b7f79274831
@@ -2295,9 +3651,9 @@ Date:   Tue Jan 12 01:35:35 2010 -0500
     The parent class of seed_union was set to seed_union (undefined at that point);
     I believe it should be seed_pointer, just like seed_struct
 
- libseed/seed-structs.c |    8 +++++++-
- libseed/seed-structs.h |    1 +
- libseed/seed-types.c   |    9 ++++++---
+ libseed/seed-structs.c | 8 +++++++-
+ libseed/seed-structs.h | 1 +
+ libseed/seed-types.c   | 9 ++++++---
  3 files changed, 14 insertions(+), 4 deletions(-)
 
 commit 4191e15dc1ad76dcbdcab987d9a164a8c95aaaba
@@ -2306,7 +3662,7 @@ Date:   Mon Jan 11 17:27:44 2010 -0500
 
     Postrelease increment
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e53256d65a8b53d5edb19cac1a838f06baccc91a
@@ -2315,7 +3671,7 @@ Date:   Mon Jan 11 17:24:33 2010 -0500
 
     Add 2.29.5.3 NEWS, and fix 2009->2010 problems
 
- NEWS |   13 +++++++++++--
+ NEWS | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit 707c97582d337de732d404ad6575712827f9f636
@@ -2324,8 +3680,8 @@ Date:   Mon Jan 11 17:15:26 2010 -0500
 
     tests: add test for null struct return values
 
- tests/javascript/structs/Makefile.am    |    2 ++
- tests/javascript/structs/struct-null.js |   14 ++++++++++++++
+ tests/javascript/structs/Makefile.am    |  2 ++
+ tests/javascript/structs/struct-null.js | 14 ++++++++++++++
  2 files changed, 16 insertions(+)
 
 commit 22c6df348844cb1e56bf9389fb1cdd51865b1a46
@@ -2334,7 +3690,7 @@ Date:   Sun Jan 10 21:46:09 2010 -0600
 
     Allow null struct return values
 
- libseed/seed-structs.c |    6 ++++++
+ libseed/seed-structs.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit c5bc24848ce30ba79b463b1440d12ad330fb8ea0
@@ -2348,7 +3704,7 @@ Date:   Fri Jan 8 19:12:58 2010 -0500
     
     This reverts commit 07db8b4966ca85a256137d32eeca2a634f473825.
 
- libseed/seed-types.c |   42 +-----------------------------------------
+ libseed/seed-types.c | 42 +-----------------------------------------
  1 file changed, 1 insertion(+), 41 deletions(-)
 
 commit 38ef8720434aff3447a442c31549d46d72e330e8
@@ -2357,18 +3713,18 @@ Date:   Thu Jan 7 20:40:05 2010 -0500
 
     modules: Use NULL instead of 0 to ensure type safety
 
- modules/cairo/seed-cairo.c                     |    6 +-
- modules/canvas/seed-canvas.c                   |    4 +-
- modules/dbus/module.c                          |   16 +++---
- modules/ffi/seed-ffi.c                         |    2 +-
- modules/gettext/seed-gettext.c                 |    2 +-
- modules/libxml/seed-libxml.c                   |   72 ++++++++++++------------
- modules/mpfr/seed-mpfr.c                       |    4 +-
- modules/multiprocessing/seed-multiprocessing.c |    2 +-
- modules/os/seed-os.c                           |    2 +-
- modules/readline/seed-readline.c               |    2 +-
- modules/sandbox/seed-sandbox.c                 |    2 +-
- modules/sqlite/seed-sqlite.c                   |    2 +-
+ modules/cairo/seed-cairo.c                     |  6 +--
+ modules/canvas/seed-canvas.c                   |  4 +-
+ modules/dbus/module.c                          | 16 +++---
+ modules/ffi/seed-ffi.c                         |  2 +-
+ modules/gettext/seed-gettext.c                 |  2 +-
+ modules/libxml/seed-libxml.c                   | 72 +++++++++++++-------------
+ modules/mpfr/seed-mpfr.c                       |  4 +-
+ modules/multiprocessing/seed-multiprocessing.c |  2 +-
+ modules/os/seed-os.c                           |  2 +-
+ modules/readline/seed-readline.c               |  2 +-
+ modules/sandbox/seed-sandbox.c                 |  2 +-
+ modules/sqlite/seed-sqlite.c                   |  2 +-
  12 files changed, 57 insertions(+), 59 deletions(-)
 
 commit 98394c7c42068eec85e52f0166a9e054978ef1fb
@@ -2378,12 +3734,12 @@ Date:   Thu Jan 7 19:17:09 2010 -0500
     Add null sentinels to the end of seed_static_function and seed_static_value
     arrays in all modules; fixes BGO #592585
 
- modules/gettext/seed-gettext.c                 |    3 ++-
- modules/libxml/seed-libxml.c                   |    3 ++-
- modules/multiprocessing/seed-multiprocessing.c |    3 ++-
- modules/os/seed-os.c                           |    3 ++-
- modules/readline/seed-readline.c               |    3 ++-
- modules/sqlite/seed-sqlite.c                   |    6 ++----
+ modules/gettext/seed-gettext.c                 | 3 ++-
+ modules/libxml/seed-libxml.c                   | 3 ++-
+ modules/multiprocessing/seed-multiprocessing.c | 3 ++-
+ modules/os/seed-os.c                           | 3 ++-
+ modules/readline/seed-readline.c               | 3 ++-
+ modules/sqlite/seed-sqlite.c                   | 6 ++----
  6 files changed, 12 insertions(+), 9 deletions(-)
 
 commit 71603e62d177324f8c3db281229be45919846385
@@ -2392,7 +3748,7 @@ Date:   Thu Jan 7 19:11:30 2010 -0500
 
     Post-release increment.
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 17e5509b4c5c0abfec77a0eb880d4b9932311eae
@@ -2401,8 +3757,8 @@ Date:   Thu Jan 7 19:08:51 2010 -0500
 
     Release 2.29.5.2
 
- NEWS         |   17 +++++++++++++++++
- configure.ac |    2 +-
+ NEWS         | 17 +++++++++++++++++
+ configure.ac |  2 +-
  2 files changed, 18 insertions(+), 1 deletion(-)
 
 commit 018aaa4edbc49f1b1db1ea54417388f857ee3f12
@@ -2411,67 +3767,67 @@ Date:   Wed Jan 6 04:06:59 2010 -0500
 
     tests: make check should test against version in build tree, not installed
 
- tests/javascript/argv.js                              |    4 ++--
- tests/javascript/array-gtype.js                       |    2 +-
- tests/javascript/builtin-argument-length.js           |    2 +-
- tests/javascript/check-syntax.js                      |    2 +-
- tests/javascript/closure-finalization.js              |    2 +-
- tests/javascript/compare.js                           |    2 +-
- tests/javascript/constructor-args.js                  |    2 +-
- tests/javascript/constructor-prototype.js             |    2 +-
- tests/javascript/enum.js                              |    2 +-
- tests/javascript/everything.js                        |    2 +-
- tests/javascript/fork.js                              |    2 +-
- tests/javascript/function-info.js                     |    2 +-
- tests/javascript/gdk-event.js                         |    2 +-
- tests/javascript/gerror.js                            |    2 +-
- tests/javascript/gobject-scope.js                     |    2 +-
- tests/javascript/gtypes/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtypes/gtype-extraprop.js            |    2 +-
- tests/javascript/gtypes/gtype-gtype-class-init.js     |    2 +-
- tests/javascript/gtypes/gtype-gtype.js                |    2 +-
- tests/javascript/gtypes/gtype-property-construct.js   |    2 +-
- tests/javascript/gtypes/gtype-property-nice.js        |    2 +-
- tests/javascript/gtypes/gtype-property.js             |    2 +-
- tests/javascript/gtypes/gtype-self.js                 |    2 +-
- tests/javascript/gtypes/gtype-signal-args.js          |    2 +-
- tests/javascript/gtypes/gtype-signal.js               |    2 +-
- tests/javascript/gtypes/gtype-typerror.js             |    2 +-
- tests/javascript/gtypes/gtype.js                      |    2 +-
- tests/javascript/gvalue-argument.js                   |    2 +-
- tests/javascript/include-syntax.js                    |    2 +-
- tests/javascript/include.js                           |    2 +-
- tests/javascript/introspect.js                        |    2 +-
- tests/javascript/json-constructor.js                  |    2 +-
- tests/javascript/json.js                              |    2 +-
- tests/javascript/list-test.js                         |    2 +-
- tests/javascript/modules-noasserts.js                 |    2 +-
- tests/javascript/modules.js                           |    4 ++--
- tests/javascript/native-closure-exception.js          |    2 +-
- tests/javascript/native-closure.js                    |    2 +-
- tests/javascript/object-info.js                       |    2 +-
- tests/javascript/out-test.js                          |    2 +-
- tests/javascript/property-benchmark.js                |    2 +-
- tests/javascript/property-glib-exception.js           |    2 +-
- tests/javascript/quit.js                              |    2 +-
- tests/javascript/signals/signal-connect.js            |    2 +-
- tests/javascript/signals/signal-disconnect.js         |    2 +-
- tests/javascript/signals/signal-exception.js          |    2 +-
- tests/javascript/signals/signal-expects.js            |    2 +-
- tests/javascript/signals/signal-invalid.js            |    2 +-
- tests/javascript/signals/signal-nofunc.js             |    2 +-
- tests/javascript/signals/signal-userdata.js           |    2 +-
- tests/javascript/signals/signal.js                    |    2 +-
- tests/javascript/sqlite.js                            |    2 +-
- tests/javascript/structs/struct-constructor.js        |    2 +-
- tests/javascript/structs/struct-enumerate.js          |    2 +-
- tests/javascript/structs/struct-functions.js          |    2 +-
- tests/javascript/structs/struct-nested-set.js         |    2 +-
- tests/javascript/structs/struct-offsets.js            |    2 +-
- tests/javascript/structs/struct-set-member.js         |    2 +-
- tests/javascript/structs/struct-union-enumerate.js    |    2 +-
- tests/javascript/syntax-test.js                       |    2 +-
- tests/javascript/type-conversion.js                   |    2 +-
+ tests/javascript/argv.js                              | 4 ++--
+ tests/javascript/array-gtype.js                       | 2 +-
+ tests/javascript/builtin-argument-length.js           | 2 +-
+ tests/javascript/check-syntax.js                      | 2 +-
+ tests/javascript/closure-finalization.js              | 2 +-
+ tests/javascript/compare.js                           | 2 +-
+ tests/javascript/constructor-args.js                  | 2 +-
+ tests/javascript/constructor-prototype.js             | 2 +-
+ tests/javascript/enum.js                              | 2 +-
+ tests/javascript/everything.js                        | 2 +-
+ tests/javascript/fork.js                              | 2 +-
+ tests/javascript/function-info.js                     | 2 +-
+ tests/javascript/gdk-event.js                         | 2 +-
+ tests/javascript/gerror.js                            | 2 +-
+ tests/javascript/gobject-scope.js                     | 2 +-
+ tests/javascript/gtypes/gtype-class-init-exception.js | 2 +-
+ tests/javascript/gtypes/gtype-extraprop.js            | 2 +-
+ tests/javascript/gtypes/gtype-gtype-class-init.js     | 2 +-
+ tests/javascript/gtypes/gtype-gtype.js                | 2 +-
+ tests/javascript/gtypes/gtype-property-construct.js   | 2 +-
+ tests/javascript/gtypes/gtype-property-nice.js        | 2 +-
+ tests/javascript/gtypes/gtype-property.js             | 2 +-
+ tests/javascript/gtypes/gtype-self.js                 | 2 +-
+ tests/javascript/gtypes/gtype-signal-args.js          | 2 +-
+ tests/javascript/gtypes/gtype-signal.js               | 2 +-
+ tests/javascript/gtypes/gtype-typerror.js             | 2 +-
+ tests/javascript/gtypes/gtype.js                      | 2 +-
+ tests/javascript/gvalue-argument.js                   | 2 +-
+ tests/javascript/include-syntax.js                    | 2 +-
+ tests/javascript/include.js                           | 2 +-
+ tests/javascript/introspect.js                        | 2 +-
+ tests/javascript/json-constructor.js                  | 2 +-
+ tests/javascript/json.js                              | 2 +-
+ tests/javascript/list-test.js                         | 2 +-
+ tests/javascript/modules-noasserts.js                 | 2 +-
+ tests/javascript/modules.js                           | 4 ++--
+ tests/javascript/native-closure-exception.js          | 2 +-
+ tests/javascript/native-closure.js                    | 2 +-
+ tests/javascript/object-info.js                       | 2 +-
+ tests/javascript/out-test.js                          | 2 +-
+ tests/javascript/property-benchmark.js                | 2 +-
+ tests/javascript/property-glib-exception.js           | 2 +-
+ tests/javascript/quit.js                              | 2 +-
+ tests/javascript/signals/signal-connect.js            | 2 +-
+ tests/javascript/signals/signal-disconnect.js         | 2 +-
+ tests/javascript/signals/signal-exception.js          | 2 +-
+ tests/javascript/signals/signal-expects.js            | 2 +-
+ tests/javascript/signals/signal-invalid.js            | 2 +-
+ tests/javascript/signals/signal-nofunc.js             | 2 +-
+ tests/javascript/signals/signal-userdata.js           | 2 +-
+ tests/javascript/signals/signal.js                    | 2 +-
+ tests/javascript/sqlite.js                            | 2 +-
+ tests/javascript/structs/struct-constructor.js        | 2 +-
+ tests/javascript/structs/struct-enumerate.js          | 2 +-
+ tests/javascript/structs/struct-functions.js          | 2 +-
+ tests/javascript/structs/struct-nested-set.js         | 2 +-
+ tests/javascript/structs/struct-offsets.js            | 2 +-
+ tests/javascript/structs/struct-set-member.js         | 2 +-
+ tests/javascript/structs/struct-union-enumerate.js    | 2 +-
+ tests/javascript/syntax-test.js                       | 2 +-
+ tests/javascript/type-conversion.js                   | 2 +-
  61 files changed, 63 insertions(+), 63 deletions(-)
 
 commit 362280cd799419b41eb0919bce0a33290942ff68
@@ -2480,7 +3836,7 @@ Date:   Wed Jan 6 03:53:37 2010 -0500
 
     tests: Make C-based test run too
 
- tests/c/Makefile.am |    2 ++
+ tests/c/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit f8d07c7157afd249dada6f58182bccdc26785103
@@ -2495,88 +3851,88 @@ Date:   Wed Jan 6 03:47:37 2010 -0500
     Three or four tests still don't work (and print output to that effect)
     because of strange exception-chaining problems which I'm going to look into.
 
- Makefile.am                                        |    5 +-
- tests/Makefile.am                                  |    7 +-
- tests/javascript/Makefile.am                       |   49 +++++++--
- tests/javascript/argv.js                           |    6 +-
- tests/javascript/array-gtype.js                    |   16 +--
- tests/javascript/builtin-argument-length.js        |  111 +++++++++-----------
- tests/javascript/c-module.js                       |    7 --
- tests/javascript/check-syntax.js                   |   42 ++++++--
- tests/javascript/closure-finalization.js           |   12 ++-
- tests/javascript/compare.js                        |   10 +-
- tests/javascript/constructor-args.js               |   15 +--
- tests/javascript/constructor-prototype.js          |   17 ++-
- tests/javascript/enum.js                           |   14 ++-
- tests/javascript/everything.js                     |  111 ++++++++++----------
- tests/javascript/fork.js                           |   20 ++--
- tests/javascript/function-info.js                  |   13 +--
- tests/javascript/gdk-event.js                      |   35 +++---
- tests/javascript/gerror.js                         |   12 +--
- tests/javascript/gobject-scope.js                  |   12 +--
- tests/javascript/gtypes/Makefile.am                |   15 +++
- .../gtypes/gtype-class-init-exception.js           |   26 +++--
- tests/javascript/gtypes/gtype-extraprop.js         |   27 +++--
- tests/javascript/gtypes/gtype-gtype-class-init.js  |   48 ++++-----
- tests/javascript/gtypes/gtype-gtype.js             |   48 ++++-----
- .../javascript/gtypes/gtype-property-construct.js  |   59 ++++++-----
- tests/javascript/gtypes/gtype-property-nice.js     |   42 ++++----
- tests/javascript/gtypes/gtype-property.js          |   51 +++++----
- tests/javascript/gtypes/gtype-self.js              |   25 ++---
- tests/javascript/gtypes/gtype-signal-args.js       |   36 +++----
- tests/javascript/gtypes/gtype-signal.js            |   25 +++--
- tests/javascript/gtypes/gtype-typerror.js          |   21 ++--
- tests/javascript/gtypes/gtype.js                   |   42 ++++----
- tests/javascript/gtypes/testsuite.js               |    1 +
- tests/javascript/gvalue-argument.js                |    4 -
- tests/javascript/include-syntax.js                 |   19 +++-
- tests/javascript/include.js                        |    6 +-
- tests/javascript/introspect.js                     |   21 ++--
- tests/javascript/json-constructor.js               |   17 ++-
- tests/javascript/json.js                           |   24 +++--
- tests/javascript/list-test.js                      |   30 +++---
- tests/javascript/modules-noasserts.js              |   25 +++++
- tests/javascript/modules.js                        |   29 +----
- tests/javascript/native-closure-exception.js       |   34 +++---
- tests/javascript/native-closure.js                 |   27 ++---
- tests/javascript/object-info.js                    |   29 ++---
- tests/javascript/out-test.js                       |   22 ++--
- tests/javascript/print.js                          |    7 --
- tests/javascript/printf.js                         |   12 ---
- tests/javascript/printprint.js                     |    7 --
- tests/javascript/property-benchmark.js             |    6 +-
- tests/javascript/property-glib-exception.js        |   25 +++--
- tests/javascript/quit.js                           |    7 +-
- tests/javascript/quit2.js                          |    7 --
- tests/javascript/readline-bind.js                  |    9 --
- tests/javascript/readline.js                       |    8 --
- tests/javascript/signals/Makefile.am               |   11 ++
- tests/javascript/signals/signal-connect.js         |   24 ++---
- tests/javascript/signals/signal-disconnect.js      |   31 +++---
- tests/javascript/signals/signal-exception.js       |    7 +-
- tests/javascript/signals/signal-expects.js         |   20 ++--
- tests/javascript/signals/signal-invalid.js         |   15 ++-
- tests/javascript/signals/signal-nofunc.js          |   18 ++--
- tests/javascript/signals/signal-userdata.js        |    9 +-
- tests/javascript/signals/signal.js                 |   19 ++--
- tests/javascript/signals/testsuite.js              |    1 +
- tests/javascript/spawn.js                          |    8 --
- tests/javascript/sqlite.js                         |   43 ++++----
- tests/javascript/structs/Makefile.am               |   10 ++
- tests/javascript/structs/struct-constructor.js     |   17 ++-
- tests/javascript/structs/struct-enumerate.js       |   14 +--
- tests/javascript/structs/struct-functions.js       |   13 ++-
- tests/javascript/structs/struct-nested-set.js      |   27 +++--
- tests/javascript/structs/struct-offsets.js         |   15 ++-
- tests/javascript/structs/struct-set-member.js      |   15 ++-
- tests/javascript/structs/struct-union-enumerate.js |   31 +++---
- tests/javascript/structs/testsuite.js              |    1 +
- tests/javascript/syntax-test-noasserts.js          |    1 +
- tests/javascript/syntax-test.js                    |   18 +++-
- tests/javascript/testsuite.js                      |   32 ++++++
- tests/javascript/type-conversion.js                |   42 ++++----
- tests/make-test.py                                 |   55 ----------
- tests/run-tests.py                                 |  104 ------------------
+ Makefile.am                                        |   5 +-
+ tests/Makefile.am                                  |   7 +-
+ tests/javascript/Makefile.am                       |  49 +++++++--
+ tests/javascript/argv.js                           |   6 +-
+ tests/javascript/array-gtype.js                    |  16 +--
+ tests/javascript/builtin-argument-length.js        | 111 ++++++++++-----------
+ tests/javascript/c-module.js                       |   7 --
+ tests/javascript/check-syntax.js                   |  42 ++++++--
+ tests/javascript/closure-finalization.js           |  12 ++-
+ tests/javascript/compare.js                        |  10 +-
+ tests/javascript/constructor-args.js               |  15 +--
+ tests/javascript/constructor-prototype.js          |  17 ++--
+ tests/javascript/enum.js                           |  14 ++-
+ tests/javascript/everything.js                     | 111 +++++++++++----------
+ tests/javascript/fork.js                           |  20 ++--
+ tests/javascript/function-info.js                  |  13 +--
+ tests/javascript/gdk-event.js                      |  35 ++++---
+ tests/javascript/gerror.js                         |  12 +--
+ tests/javascript/gobject-scope.js                  |  12 +--
+ tests/javascript/gtypes/Makefile.am                |  15 +++
+ .../gtypes/gtype-class-init-exception.js           |  26 +++--
+ tests/javascript/gtypes/gtype-extraprop.js         |  27 +++--
+ tests/javascript/gtypes/gtype-gtype-class-init.js  |  48 ++++-----
+ tests/javascript/gtypes/gtype-gtype.js             |  48 +++++----
+ .../javascript/gtypes/gtype-property-construct.js  |  59 ++++++-----
+ tests/javascript/gtypes/gtype-property-nice.js     |  42 ++++----
+ tests/javascript/gtypes/gtype-property.js          |  51 +++++-----
+ tests/javascript/gtypes/gtype-self.js              |  25 ++---
+ tests/javascript/gtypes/gtype-signal-args.js       |  36 +++----
+ tests/javascript/gtypes/gtype-signal.js            |  25 +++--
+ tests/javascript/gtypes/gtype-typerror.js          |  21 ++--
+ tests/javascript/gtypes/gtype.js                   |  42 ++++----
+ tests/javascript/gtypes/testsuite.js               |   1 +
+ tests/javascript/gvalue-argument.js                |   4 -
+ tests/javascript/include-syntax.js                 |  19 +++-
+ tests/javascript/include.js                        |   6 +-
+ tests/javascript/introspect.js                     |  21 ++--
+ tests/javascript/json-constructor.js               |  17 ++--
+ tests/javascript/json.js                           |  24 +++--
+ tests/javascript/list-test.js                      |  30 +++---
+ tests/javascript/modules-noasserts.js              |  25 +++++
+ tests/javascript/modules.js                        |  29 +-----
+ tests/javascript/native-closure-exception.js       |  34 ++++---
+ tests/javascript/native-closure.js                 |  27 ++---
+ tests/javascript/object-info.js                    |  29 +++---
+ tests/javascript/out-test.js                       |  22 ++--
+ tests/javascript/print.js                          |   7 --
+ tests/javascript/printf.js                         |  12 ---
+ tests/javascript/printprint.js                     |   7 --
+ tests/javascript/property-benchmark.js             |   6 +-
+ tests/javascript/property-glib-exception.js        |  25 +++--
+ tests/javascript/quit.js                           |   7 +-
+ tests/javascript/quit2.js                          |   7 --
+ tests/javascript/readline-bind.js                  |   9 --
+ tests/javascript/readline.js                       |   8 --
+ tests/javascript/signals/Makefile.am               |  11 ++
+ tests/javascript/signals/signal-connect.js         |  24 ++---
+ tests/javascript/signals/signal-disconnect.js      |  31 +++---
+ tests/javascript/signals/signal-exception.js       |   7 +-
+ tests/javascript/signals/signal-expects.js         |  20 ++--
+ tests/javascript/signals/signal-invalid.js         |  15 ++-
+ tests/javascript/signals/signal-nofunc.js          |  18 ++--
+ tests/javascript/signals/signal-userdata.js        |   9 +-
+ tests/javascript/signals/signal.js                 |  19 ++--
+ tests/javascript/signals/testsuite.js              |   1 +
+ tests/javascript/spawn.js                          |   8 --
+ tests/javascript/sqlite.js                         |  43 ++++----
+ tests/javascript/structs/Makefile.am               |  10 ++
+ tests/javascript/structs/struct-constructor.js     |  17 ++--
+ tests/javascript/structs/struct-enumerate.js       |  14 +--
+ tests/javascript/structs/struct-functions.js       |  13 ++-
+ tests/javascript/structs/struct-nested-set.js      |  27 +++--
+ tests/javascript/structs/struct-offsets.js         |  15 ++-
+ tests/javascript/structs/struct-set-member.js      |  15 ++-
+ tests/javascript/structs/struct-union-enumerate.js |  31 +++---
+ tests/javascript/structs/testsuite.js              |   1 +
+ tests/javascript/syntax-test-noasserts.js          |   1 +
+ tests/javascript/syntax-test.js                    |  18 +++-
+ tests/javascript/testsuite.js                      |  32 ++++++
+ tests/javascript/type-conversion.js                |  42 ++++----
+ tests/make-test.py                                 |  55 ----------
+ tests/run-tests.py                                 | 104 -------------------
  82 files changed, 936 insertions(+), 1020 deletions(-)
 
 commit 62bf28a41b3372cd6eed5823e941f0d54ccc9a0e
@@ -2585,7 +3941,7 @@ Date:   Wed Jan 6 02:05:05 2010 -0500
 
     Return non-zero exit code if an exception occurs
 
- src/main.c |   10 ++++++++--
+ src/main.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 585cca1d52aa7e082aaa029c585fef8ea6d25d43
@@ -2594,7 +3950,7 @@ Date:   Wed Jan 6 02:04:54 2010 -0500
 
     Remove extraneous space in output
 
- modules/example/seed-example.c |    2 +-
+ modules/example/seed-example.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 577fc25b8e4b932107f2f3a6b81a27c11d08fea8
@@ -2603,7 +3959,7 @@ Date:   Wed Jan 6 00:04:07 2010 -0500
 
     Note to self: need to properly integrate our exceptions with JS
 
- libseed/seed-exceptions.c |    3 +++
+ libseed/seed-exceptions.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 07db8b4966ca85a256137d32eeca2a634f473825
@@ -2615,7 +3971,7 @@ Date:   Mon Jan 4 00:56:29 2010 -0500
     seed_gi_argument_make_js was assuming that enums and flags are always longs,
     which is (apparently) incorrect. Check the type and convert accordingly.
 
- libseed/seed-types.c |   42 +++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-types.c | 42 +++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 41 insertions(+), 1 deletion(-)
 
 commit 2723b3a122609b9de20dab1208bf3e6ac90d140c
@@ -2624,7 +3980,7 @@ Date:   Mon Jan 4 00:56:15 2010 -0500
 
     Fix spacing in warning (double space)
 
- libseed/seed-structs.c |    2 +-
+ libseed/seed-structs.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7d21ff802d08154fe222742ed8b61b1a92bebe16
@@ -2635,7 +3991,7 @@ Date:   Sun Jan 3 22:11:03 2010 -0500
     
     This is probably not correct, since the size of the type is variable, and all...
 
- libseed/seed-gtype.c |    3 ++-
+ libseed/seed-gtype.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 4331a5c5a9d9446c2e5909a53c25a15de9f16ed8
@@ -2644,7 +4000,7 @@ Date:   Sat Jan 2 22:45:36 2010 -0500
 
     Update OS X build instructions (MacPorts!)
 
- doc/reference/building-osx.sgml |   65 ++++++++++++---------------------------
+ doc/reference/building-osx.sgml | 65 ++++++++++++-----------------------------
  1 file changed, 19 insertions(+), 46 deletions(-)
 
 commit 3a19d85fd53f5bc1e566101bacf0bc044c00cfe0
@@ -2655,7 +4011,7 @@ Date:   Sat Jan 2 22:06:35 2010 -0500
     
     Fixes bug introduced in commit 249a26bd077
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b41de3fafa5d1b0ebf89f373c3f132003b719771
@@ -2664,7 +4020,7 @@ Date:   Sat Jan 2 19:56:46 2010 -0500
 
     tests: Fix struct-union-enumerate test
 
- tests/javascript/structs/struct-union-enumerate.js |   20 ++++++++++++++++----
+ tests/javascript/structs/struct-union-enumerate.js | 20 ++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
 
 commit f2e337ff9712644cc8d2c5c2c23c2f491619fba9
@@ -2673,8 +4029,8 @@ Date:   Sat Jan 2 19:40:30 2010 -0500
 
     Fix readline tests
 
- tests/javascript/readline-bind.js |    6 +++---
- tests/javascript/readline.js      |    4 ++--
+ tests/javascript/readline-bind.js | 6 +++---
+ tests/javascript/readline.js      | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 8050bd63efb3d540aeacefefe2bd953e2b57e3cf
@@ -2683,8 +4039,8 @@ Date:   Sat Jan 2 18:40:24 2010 -0500
 
     Fix completely incorrect nested struct/union set test
 
- tests/javascript/structs/struct-nested-set.js |    8 +--
- tests/run-tests.py                            |   68 +++++++++++++------------
+ tests/javascript/structs/struct-nested-set.js |  8 ++--
+ tests/run-tests.py                            | 68 ++++++++++++++-------------
  2 files changed, 40 insertions(+), 36 deletions(-)
 
 commit de65135b89104cc49cd893951650cc3d6f4236eb
@@ -2695,7 +4051,7 @@ Date:   Sat Jan 2 18:19:27 2010 -0500
     
     This fixes testing over X forwarding to a machine lacking expected extensions
 
- tests/run-tests.py |   65 ++++++++++++++++++++++++++--------------------------
+ tests/run-tests.py | 65 +++++++++++++++++++++++++++---------------------------
  1 file changed, 32 insertions(+), 33 deletions(-)
 
 commit 2ff26650b1180982c532d801873d4af648edce9b
@@ -2704,7 +4060,7 @@ Date:   Sat Jan 2 16:55:07 2010 -0500
 
     Fix glong/gint "mismatch" elsewhere
 
- libseed/seed-types.c |    2 +-
+ libseed/seed-types.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6c075da4ca37a47e9d0938664f25d6727f107029
@@ -2715,8 +4071,8 @@ Date:   Sat Jan 2 16:51:57 2010 -0500
     
     I accidentally broke this when fixing the pkglibdir/datadir substitution
 
- extensions/Makefile.am |    2 +-
- extensions/Seed.js.in  |    2 +-
+ extensions/Makefile.am | 2 +-
+ extensions/Seed.js.in  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit bac440a2733a2b59920b0078123a073db19b9f33
@@ -2729,7 +4085,7 @@ Date:   Sat Jan 2 16:43:23 2010 -0500
     It's clear why this was broken; g_value_info_get_value says
     that it returns a glong.
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 671ad0881ca3c68e59099a18164a72f34ad3f2ad
@@ -2738,7 +4094,7 @@ Date:   Fri Jan 1 17:26:51 2010 -0500
 
     Post-release version increment
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2b12dcb4e4bfaf40ace0fb216b4ef3af5fa20256
@@ -2747,7 +4103,7 @@ Date:   Fri Jan 1 17:25:58 2010 -0500
 
     Release 2.29.5.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8f6301aa559216ac8f2c86064e1d674b9dbd650a
@@ -2756,10 +4112,10 @@ Date:   Fri Jan 1 17:23:16 2010 -0500
 
     Fix some 'duplicate symbol' errors on other platforms
 
- libseed/seed-engine.c    |    2 ++
- libseed/seed-engine.h    |    2 +-
- modules/mpfr/seed-mpfr.c |    3 +++
- modules/mpfr/seed-mpfr.h |    4 ++--
+ libseed/seed-engine.c    | 2 ++
+ libseed/seed-engine.h    | 2 +-
+ modules/mpfr/seed-mpfr.c | 3 +++
+ modules/mpfr/seed-mpfr.h | 4 ++--
  4 files changed, 8 insertions(+), 3 deletions(-)
 
 commit 329294e29b4f8c352b60940a61029723c081aafc
@@ -2768,7 +4124,7 @@ Date:   Fri Jan 1 16:47:57 2010 -0500
 
     Post-release increment
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3ac0d91449158e79b6e90072452bb033c7bc054e
@@ -2777,7 +4133,7 @@ Date:   Fri Jan 1 16:38:56 2010 -0500
 
     2.29.5 release notes
 
- NEWS |   10 ++++++++++
+ NEWS | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 78e4742fe907d08348a8c93c098761ec57b32bd6
@@ -2786,7 +4142,7 @@ Date:   Thu Dec 31 05:44:51 2009 -0500
 
     os module: oops! other GNU extensions were in use; reenable these
 
- modules/os/seed-os.c |    2 ++
+ modules/os/seed-os.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit c2be82dabf2208fc533838a2deea1c8f415583fd
@@ -2795,7 +4151,7 @@ Date:   Thu Dec 31 05:40:29 2009 -0500
 
     Use realpath() instead of the GNU libc extension canonicalize_file_path (again)
 
- modules/os/seed-os.c |    4 +---
+ modules/os/seed-os.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 53a1447c45949c8d9ab4a4e082499cf24bf9dafc
@@ -2807,9 +4163,9 @@ Date:   Thu Dec 31 05:36:09 2009 -0500
     This fixes the failure to find native modules when installing to unexpected
     prefixes.
 
- configure.ac           |    1 -
- extensions/Makefile.am |    3 +++
- extensions/Seed.js.in  |    4 ++--
+ configure.ac           | 1 -
+ extensions/Makefile.am | 3 +++
+ extensions/Seed.js.in  | 4 ++--
  3 files changed, 5 insertions(+), 3 deletions(-)
 
 commit 75f843389e2eccd25fc77d71119af09892462a0f
@@ -2818,7 +4174,7 @@ Date:   Thu Dec 31 05:12:28 2009 -0500
 
     extensions: fix some indentation oddities
 
- extensions/Seed.js.in |   16 ++++++++--------
+ extensions/Seed.js.in | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit 0f9ce34375f9bfda6b11e6ccbb54b4fd75f2eb40
@@ -2827,7 +4183,7 @@ Date:   Wed Dec 30 03:40:25 2009 -0500
 
     interpreter: display exceptions (if any) when trying to execute the repl
 
- src/main.c |   11 +++++++++++
+ src/main.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit f4576cc155a1583da3d174165748e782690bcfd9
@@ -2836,7 +4192,7 @@ Date:   Sat Dec 19 16:04:51 2009 -0500
 
     Use the right type when creating GValues for GObject subtypes
 
- libseed/seed-types.c |    2 +-
+ libseed/seed-types.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9c052e1cfed23bfed6f890895564206e37ed6fe1
@@ -2845,7 +4201,7 @@ Date:   Wed Dec 30 02:56:42 2009 -0500
 
     Distribute the repl snippet along with seed
 
- extensions/Makefile.am |    2 +-
+ extensions/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 48eabb14b1fafe329156a9dbba144586ec850454
@@ -2854,7 +4210,7 @@ Date:   Wed Dec 30 02:54:29 2009 -0500
 
     Use realpath() instead of the GNU libc extension canonicalize_file_path
 
- libseed/seed-importer.c |    5 +----
+ libseed/seed-importer.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 8a5ad68baa02968b7e521581db58b3b72d290d6b
@@ -2866,7 +4222,7 @@ Date:   Wed Dec 30 02:53:33 2009 -0500
     There's no reason to use the system's WebKit, since it has to be a nightly anyway.
     Instead, use webkit-gtk; the version in macports is now recent enough.
 
- configure.ac |   44 ++++++++++----------------------------------
+ configure.ac | 44 ++++++++++----------------------------------
  1 file changed, 10 insertions(+), 34 deletions(-)
 
 commit 1118eb7835ba0b94aee09f9f576342fcce344128
@@ -2878,9 +4234,9 @@ Date:   Wed Dec 30 02:39:26 2009 -0500
     This is necessary to make Seed build on platforms where the GCC
     TLS API is not available, such as Mac OS X.
 
- libseed/seed-engine.c |   16 ++++++++++------
- libseed/seed-engine.h |    2 +-
- libseed/seed-types.c  |    7 ++++---
+ libseed/seed-engine.c | 16 ++++++++++------
+ libseed/seed-engine.h |  2 +-
+ libseed/seed-types.c  |  7 ++++---
  3 files changed, 15 insertions(+), 10 deletions(-)
 
 commit a08ec31a2833e681b9c91a62fc1a6f60c4259187
@@ -2889,7 +4245,7 @@ Date:   Thu Dec 17 17:32:36 2009 -0500
 
     Improve handling of case where constructing struct with 0 size
 
- libseed/seed-structs.c |    7 ++++++-
+ libseed/seed-structs.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit c5c4352f77624d4717f4757c87ff7e1373082dc3
@@ -2898,8 +4254,8 @@ Date:   Thu Dec 17 17:25:21 2009 -0500
 
     [importer] Struct/union constructors need to take a reference to the GIBaseInfo they store in their privates...
 
- libseed/seed-importer.c |    4 +++-
- libseed/seed-structs.c  |    2 +-
+ libseed/seed-importer.c | 4 +++-
+ libseed/seed-structs.c  | 2 +-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit d70268ca6c3482b38f1076b13f360bade04dbe6c
@@ -2908,8 +4264,8 @@ Date:   Thu Dec 17 17:09:48 2009 -0500
 
     Built in REPL was broken because it was installing from examples tree (now seed-examples on git.gnome.org). Move a copy of REPL snippet into seed
 
- extensions/Makefile.am |    3 +++
- extensions/repl.js     |   49 ++++++++++++++++++++++++++++++++++++++++++++++++
+ extensions/Makefile.am |  3 +++
+ extensions/repl.js     | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 52 insertions(+)
 
 commit 63c58af6a128168fe79eb7be0cea048ecdb1c712
@@ -2918,8 +4274,8 @@ Date:   Thu Dec 17 15:40:07 2009 -0500
 
     Add regression test for BGO 593182
 
- tests/javascript/gtypes/Makefile.am               |    1 +
- tests/javascript/gtypes/gtype-gtype-class-init.js |   30 +++++++++++++++++++++
+ tests/javascript/gtypes/Makefile.am               |  1 +
+ tests/javascript/gtypes/gtype-gtype-class-init.js | 30 +++++++++++++++++++++++
  2 files changed, 31 insertions(+)
 
 commit a60bf4010a7c8c864cfdb5483ce3e5dc0f0d4977
@@ -2930,7 +4286,7 @@ Date:   Thu Dec 17 15:23:39 2009 -0500
     
     This is obviously not a good idea and has been rectified. Closes BGO #593182
 
- libseed/seed-gtype.c |   14 +++++++++-----
+ libseed/seed-gtype.c | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 commit 2638adf4800488a044db21f567945584030adb0a
@@ -2939,8 +4295,8 @@ Date:   Thu Dec 17 15:23:34 2009 -0500
 
     Update some autotools junk? I guess. I could only really say if I understood autotools
 
- config.h.in   |    3 +++
- m4/libtool.m4 |    3 +++
+ config.h.in   | 3 +++
+ m4/libtool.m4 | 3 +++
  2 files changed, 6 insertions(+)
 
 commit 8bccd48bafbef62671e4a1dcbe8a18e604f76370
@@ -2951,7 +4307,7 @@ Date:   Mon Nov 2 03:59:35 2009 +0000
     
     Closes BGO #599666
 
- libseed/seed-types.c |    3 +++
+ libseed/seed-types.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit fa6441078948879b7b48cd85c842f796c3e77690
@@ -2960,7 +4316,7 @@ Date:   Wed Dec 16 17:04:06 2009 -0500
 
     Post-release increment
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 04771b669d35196f8c4e87d035c7f541e324094b
@@ -2969,8 +4325,8 @@ Date:   Wed Dec 16 17:01:05 2009 -0500
 
     Update NEWS and README for 2.29.4
 
- NEWS   |   11 +++++++++++
- README |   10 +++++-----
+ NEWS   | 11 +++++++++++
+ README | 10 +++++-----
  2 files changed, 16 insertions(+), 5 deletions(-)
 
 commit cb4289137ec0ea3204e1b0ad3b7e2a86fa8a94da
@@ -2985,7 +4341,7 @@ Date:   Mon Nov 16 00:35:52 2009 +0100
     
     https://bugzilla.gnome.org/show_bug.cgi?id=602032
 
- libseed/seed-api.c |    3 ++-
+ libseed/seed-api.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 251a556dc841a8165d865771d9f30de94428d901
@@ -2996,9 +4352,9 @@ Date:   Thu Nov 19 13:03:35 2009 +0000
     
     Partial fix for BGO #602404.
 
- libseed/seed-closure.c |   34 +++++++++++----
- libseed/seed-types.c   |  113 +++++++++++++++++++++++++++++++++++++++++++++---
- libseed/seed-types.h   |   10 +++++
+ libseed/seed-closure.c |  34 +++++++++++----
+ libseed/seed-types.c   | 113 ++++++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-types.h   |  10 +++++
  3 files changed, 142 insertions(+), 15 deletions(-)
 
 commit 36ec11b954ed7a1ded45927a4788adf8c0ed0dcb
@@ -3012,9 +4368,9 @@ Date:   Tue Dec 15 14:33:27 2009 +0100
     
     https://bugzilla.gnome.org/show_bug.cgi?id=604617
 
- libseed/seed-closure.c |    5 +----
- libseed/seed-closure.h |    2 --
- libseed/seed-types.c   |    1 -
+ libseed/seed-closure.c | 5 +----
+ libseed/seed-closure.h | 2 --
+ libseed/seed-types.c   | 1 -
  3 files changed, 1 insertion(+), 7 deletions(-)
 
 commit 9989d47738853ec7226387b3ffbb50858d323037
@@ -3029,11 +4385,11 @@ Date:   Tue Dec 15 14:39:21 2009 +0100
     
     https://bugzilla.gnome.org/show_bug.cgi?id=604617
 
- libseed/seed-closure.c |    2 +-
- libseed/seed-engine.c  |    3 +--
- libseed/seed-structs.c |   10 ++++------
- libseed/seed-types.c   |    4 ++--
- libseed/seed-types.h   |    1 -
+ libseed/seed-closure.c |  2 +-
+ libseed/seed-engine.c  |  3 +--
+ libseed/seed-structs.c | 10 ++++------
+ libseed/seed-types.c   |  4 ++--
+ libseed/seed-types.h   |  1 -
  5 files changed, 8 insertions(+), 12 deletions(-)
 
 commit 67f3d46b9387e1f4166c1403a9c491732c2b022c
@@ -3042,7 +4398,7 @@ Date:   Mon Nov 30 17:24:18 2009 -0500
 
     Postincrement after release (now 2.29.4)
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cf39481aa040bc7dbdb96c891402c9132b68cbd3
@@ -3051,7 +4407,7 @@ Date:   Mon Nov 16 19:03:39 2009 -0500
 
     Postincrement version number to 2.29.3
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5462cff55d30e3c3cf54d832a02fca0fbc13ddce
@@ -3060,9 +4416,9 @@ Date:   Mon Nov 16 19:01:18 2009 -0500
 
     More 2.29.2 changes (update NEWS and version)
 
- Makefile.am  |    1 -
- NEWS         |    3 +--
- configure.ac |    2 +-
+ Makefile.am  | 1 -
+ NEWS         | 3 +--
+ configure.ac | 2 +-
  3 files changed, 2 insertions(+), 4 deletions(-)
 
 commit b4d995eccb03ce0952aebe050e13461d5970a0ee
@@ -3071,10 +4427,10 @@ Date:   Mon Nov 16 18:52:27 2009 -0500
 
     Seed 2.29.2 changes
 
- NEWS          |   11 +++++++++
- RELEASE       |   75 ---------------------------------------------------------
- config.h.in   |    3 ---
- m4/libtool.m4 |    3 ---
+ NEWS          | 11 +++++++++
+ RELEASE       | 75 -----------------------------------------------------------
+ config.h.in   |  3 ---
+ m4/libtool.m4 |  3 ---
  4 files changed, 11 insertions(+), 81 deletions(-)
 
 commit f2e49562301df3c9f50ba865eb8b0b407a2883b2
@@ -3083,7 +4439,7 @@ Date:   Sun Nov 1 00:06:18 2009 -0400
 
     libseed: make seed_value_from_filename return "null" if passed "NULL"
 
- libseed/seed-types.c |   28 ++++++++++++++++------------
+ libseed/seed-types.c | 28 ++++++++++++++++------------
  1 file changed, 16 insertions(+), 12 deletions(-)
 
 commit fa42dffc8acd356e0cfc06c5c7862ef42df21c4c
@@ -3092,7 +4448,7 @@ Date:   Sun Nov 1 00:01:25 2009 -0400
 
     tests: Update one test affected by previous commit
 
- tests/javascript/sqlite.js |    2 +-
+ tests/javascript/sqlite.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9cf4a15d929007c9dfdb3c1a1fea6d03825b8614
@@ -3101,7 +4457,7 @@ Date:   Fri Oct 30 22:08:51 2009 +0000
 
     make seed_value_from_string return "null" if passed "NULL"
 
- libseed/seed-types.c |   13 +++++++++----
+ libseed/seed-types.c | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 commit 1b648f199672e0d7521910cb70469f8882a95f84
@@ -3110,10 +4466,10 @@ Date:   Wed Oct 28 01:52:16 2009 -0400
 
     tests: A bunch of exceptions changed format a while back, update tests
 
- tests/javascript/check-syntax.js            |    2 +-
- tests/javascript/include-syntax.js          |    2 +-
- tests/javascript/property-glib-exception.js |    2 +-
- tests/javascript/syntax-test.js             |    2 +-
+ tests/javascript/check-syntax.js            | 2 +-
+ tests/javascript/include-syntax.js          | 2 +-
+ tests/javascript/property-glib-exception.js | 2 +-
+ tests/javascript/syntax-test.js             | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 9ba90d411acf73bf23325239687501bfa014cdde
@@ -3122,12 +4478,12 @@ Date:   Wed Oct 28 01:26:21 2009 -0400
 
     interpreter: Add --version argument; chain option parsing to libseed.
 
- libseed/seed-engine.c |    4 +--
- libseed/seed-engine.h |    2 ++
- libseed/seed.h        |    3 +-
- src/Makefile.am       |    3 +-
- src/args.c            |   81 +++++++++++++++++++++++++++++++++++++++++++++++++
- src/main.c            |   13 ++++++++
+ libseed/seed-engine.c |  4 +--
+ libseed/seed-engine.h |  2 ++
+ libseed/seed.h        |  3 +-
+ src/Makefile.am       |  3 +-
+ src/args.c            | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/main.c            | 13 +++++++++
  6 files changed, 102 insertions(+), 4 deletions(-)
 
 commit bc26585c4b3560a30b73c1304af6a3dc598ab459
@@ -3136,7 +4492,7 @@ Date:   Wed Oct 28 00:54:44 2009 -0400
 
     libseed: Add --seed-version argument
 
- libseed/seed-engine.c |   14 ++++++++++++--
+ libseed/seed-engine.c | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit c995b68cdd372129aed51335ed6242b758c4850f
@@ -3145,7 +4501,7 @@ Date:   Wed Oct 28 00:25:27 2009 -0400
 
     clutter extension: Add wrapper for animate_with_alpha
 
- extensions/Clutter.js |   22 ++++++++++++++++++++++
+ extensions/Clutter.js | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 commit 31ed2f1f52eb55bd5ada9c87ad31ca046bcfded1
@@ -3158,7 +4514,7 @@ Date:   Sat Aug 22 04:35:51 2009 +0000
     Use EXIT_SUCCESS/EXIT_FAILURE instead of implementation-specific values
     Use seed_exception_to_string instead of stringifying by hand
 
- src/main.c |   40 +++++++++++++++++-----------------------
+ src/main.c | 40 +++++++++++++++++-----------------------
  1 file changed, 17 insertions(+), 23 deletions(-)
 
 commit d776c49457d1f6053ecb118375c84b736ca83d51
@@ -3302,7 +4658,7 @@ Date:   Wed Oct 7 01:46:26 2009 -0400
     @libdir@ is NOT @prefix@/lib (i.e. where @libdir@ is @prefix@/lib64
     instead)
 
- extensions/Seed.js.in |    2 +-
+ extensions/Seed.js.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b60d66e40b39bd48965219228f776aff0b2d7f1c
@@ -3311,7 +4667,7 @@ Date:   Sun Sep 20 19:06:55 2009 -0400
 
     Post-release bump to 2.29.1
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a6748a7c92a0af7b430d367718d392770795b865
@@ -3320,7 +4676,7 @@ Date:   Sun Sep 20 18:48:51 2009 -0400
 
     Update NEWS for the last three releases (oops!)
 
- NEWS |   18 ++++++++++++++++++
+ NEWS | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 4411f87ddd8d2652adeadcf6f187414e653411fc
@@ -3329,7 +4685,7 @@ Date:   Mon Sep 7 22:14:07 2009 -0400
 
     Post-release bump to 2.28.0
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7053fcff8e4bbc5710b14485ec45768bc47ab37d
@@ -3338,7 +4694,7 @@ Date:   Mon Sep 7 02:13:10 2009 -0400
 
     [libseed] Implement instanceof for GObject constructors and named GObject constructors, closes BGO 592936
 
- libseed/seed-engine.c |   22 ++++++++++++++++++++--
+ libseed/seed-engine.c | 22 ++++++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)
 
 commit 6532bef01b88fafe673ea5340e6560273d5f2f5c
@@ -3347,7 +4703,7 @@ Date:   Mon Sep 7 01:57:18 2009 -0400
 
     [libseed] Implement G_TYPE_STRV in seed_gvalue_from_seed_value, closes BGO 584321
 
- libseed/seed-types.c |  161 ++++++++++++++++++++++++++++++--------------------
+ libseed/seed-types.c | 161 +++++++++++++++++++++++++++++++--------------------
  1 file changed, 97 insertions(+), 64 deletions(-)
 
 commit 2536cdd2f3da941e6dd651b4eb1279eb6d7c0c6a
@@ -3356,9 +4712,9 @@ Date:   Mon Sep 7 01:38:51 2009 -0400
 
     [libseed] Add seed_engine_destroy
 
- libseed/seed-engine.c |   10 ++++++++++
- libseed/seed.h        |    2 ++
- m4/libtool.m4         |    3 +++
+ libseed/seed-engine.c | 10 ++++++++++
+ libseed/seed.h        |  2 ++
+ m4/libtool.m4         |  3 +++
  3 files changed, 15 insertions(+)
 
 commit 94293bf711ac3fb0a1e065495107fb358ff6106e
@@ -3367,20 +4723,20 @@ Date:   Fri Sep 4 14:37:12 2009 -0400
 
     [modules] Build as loadable modules, instead of fully-versioned libraries
 
- modules/cairo/Makefile.am           |    1 +
- modules/canvas/Makefile.am          |    1 +
- modules/dbus/Makefile.am            |    1 +
- modules/example/Makefile.am         |    1 +
- modules/ffi/Makefile.am             |    1 +
- modules/gettext/Makefile.am         |    1 +
- modules/gtkbuilder/Makefile.am      |    1 +
- modules/libxml/Makefile.am          |    1 +
- modules/mpfr/Makefile.am            |    1 +
- modules/multiprocessing/Makefile.am |    1 +
- modules/os/Makefile.am              |    1 +
- modules/readline/Makefile.am        |    1 +
- modules/sandbox/Makefile.am         |    1 +
- modules/sqlite/Makefile.am          |    1 +
+ modules/cairo/Makefile.am           | 1 +
+ modules/canvas/Makefile.am          | 1 +
+ modules/dbus/Makefile.am            | 1 +
+ modules/example/Makefile.am         | 1 +
+ modules/ffi/Makefile.am             | 1 +
+ modules/gettext/Makefile.am         | 1 +
+ modules/gtkbuilder/Makefile.am      | 1 +
+ modules/libxml/Makefile.am          | 1 +
+ modules/mpfr/Makefile.am            | 1 +
+ modules/multiprocessing/Makefile.am | 1 +
+ modules/os/Makefile.am              | 1 +
+ modules/readline/Makefile.am        | 1 +
+ modules/sandbox/Makefile.am         | 1 +
+ modules/sqlite/Makefile.am          | 1 +
  14 files changed, 14 insertions(+)
 
 commit 2daaf7d97a4bfed44c554c38309243d811346a58
@@ -3391,7 +4747,7 @@ Date:   Mon Aug 24 22:00:06 2009 -0400
     
     This reverts commit c061547a7953fc7072b9e0043d0f5c33c7f3ec10.
 
- src/main.c |   41 +++++++++++++++++++++++------------------
+ src/main.c | 41 +++++++++++++++++++++++------------------
  1 file changed, 23 insertions(+), 18 deletions(-)
 
 commit c061547a7953fc7072b9e0043d0f5c33c7f3ec10
@@ -3404,7 +4760,7 @@ Date:   Sat Aug 22 00:35:51 2009 -0400
     Use EXIT_SUCCESS/EXIT_FAILURE instead of implementation-specific values
     Use seed_exception_to_string instead of stringifying by hand
 
- src/main.c |   41 ++++++++++++++++++-----------------------
+ src/main.c | 41 ++++++++++++++++++-----------------------
  1 file changed, 18 insertions(+), 23 deletions(-)
 
 commit 144161af4c10029345f864b3d82dc442b7a7a8b8
@@ -3413,7 +4769,7 @@ Date:   Fri Aug 21 18:07:58 2009 -0400
 
     Post-release bump to 2.27.92
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c45e1edf164da14432691a46523d6096a068d5a9
@@ -3424,7 +4780,7 @@ Date:   Fri Aug 21 15:17:01 2009 +0300
     
     And remove a rogue tab.
 
- modules/sqlite/Makefile.am |    3 +--
+ modules/sqlite/Makefile.am | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 9bc0c696397ff32be36bab9bd81aac6a62f69b80
@@ -3437,9 +4793,9 @@ Date:   Fri Aug 21 14:25:28 2009 +0300
     verbose. Can be disabled passing --disable-silent-rules to configure
     or V=1 to make.
 
- configure.ac             |    7 ++-
- scripts/shave-libtool.in |  109 ----------------------------------------------
- scripts/shave.in         |  109 ----------------------------------------------
+ configure.ac             |   7 ++-
+ scripts/shave-libtool.in | 109 -----------------------------------------------
+ scripts/shave.in         | 109 -----------------------------------------------
  3 files changed, 3 insertions(+), 222 deletions(-)
 
 commit 641d154b48c23971093625041a0e8eb329bde7b9
@@ -3448,10 +4804,10 @@ Date:   Thu Aug 13 22:01:41 2009 -0400
 
     [libseed] Add seed_context_create, which just wraps JSGarbageCollect
 
- doc/reference/seed-sections.txt      |    1 +
- doc/reference/tmpl/seed-context.sgml |    8 ++++++++
- libseed/seed-api.c                   |   15 +++++++++++++++
- libseed/seed.h                       |    1 +
+ doc/reference/seed-sections.txt      |  1 +
+ doc/reference/tmpl/seed-context.sgml |  8 ++++++++
+ libseed/seed-api.c                   | 15 +++++++++++++++
+ libseed/seed.h                       |  1 +
  4 files changed, 25 insertions(+)
 
 commit 19cede6431a581593df3878fb36682827bdbd893
@@ -3460,7 +4816,7 @@ Date:   Mon Aug 10 18:00:02 2009 -0400
 
     Post-release bump to 2.27.91
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 86d9b7f225d68d378148e9d86839ef55f5a1e5f5
@@ -3469,8 +4825,8 @@ Date:   Mon Aug 10 16:59:46 2009 -0400
 
     We're calling this 2.27.90 to sync up with the GNOME version now that we're a module
 
- NEWS         |    4 ++--
- configure.ac |    2 +-
+ NEWS         | 4 ++--
+ configure.ac | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 68547b8e895dc6ee0b54c88675f06ba00801d264
@@ -3479,7 +4835,7 @@ Date:   Mon Aug 10 16:28:17 2009 -0400
 
     gitignore the generated index.html
 
- .gitignore |    1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2bf2aa84be18476d1de9f662b6656982c4a96fc6
@@ -3488,7 +4844,7 @@ Date:   Mon Aug 10 16:27:26 2009 -0400
 
     [ffi] Use size_t format flag
 
- modules/ffi/seed-ffi.c |    4 ++--
+ modules/ffi/seed-ffi.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a070643f5694c154f9308087a6ab5dd3a95b506f
@@ -3497,7 +4853,7 @@ Date:   Mon Aug 10 10:12:11 2009 -0800
 
     [docs] Modules link from doc index should go to module documentation, not seed-module C API docs
 
- doc/index.html.in |    2 +-
+ doc/index.html.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6047df4d846f8788e708f365217523fbab98b09a
@@ -3506,8 +4862,8 @@ Date:   Mon Aug 10 09:59:03 2009 -0800
 
     Update example index, make HACKING point there
 
- doc/index.html.in |   82 +++++++++++++++++++++++++----------------------------
- examples/HACKING  |   81 +---------------------------------------------------
+ doc/index.html.in | 82 ++++++++++++++++++++++++++-----------------------------
+ examples/HACKING  | 81 +-----------------------------------------------------
  2 files changed, 40 insertions(+), 123 deletions(-)
 
 commit b0b64cf7998a326d16adb4aaec3cf290d7537196
@@ -3516,7 +4872,7 @@ Date:   Mon Aug 10 09:45:08 2009 -0800
 
     [docs] Point to large manual for module documentation
 
- doc/index.html.in |    4 ++--
+ doc/index.html.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5cde0e6cfab39b52a917940f6f4f461f198b7ab5
@@ -3525,12 +4881,12 @@ Date:   Mon Aug 10 09:42:08 2009 -0800
 
     [docs] Forgot to include one of the files in the last commit
 
- .gitignore                 |    2 +
- configure.ac               |    1 +
- doc/Makefile.am            |    2 +-
- doc/index.html             |  114 --------------------------------------------
- doc/index.html.in          |  114 ++++++++++++++++++++++++++++++++++++++++++++
- doc/modules/version.xml.in |    1 +
+ .gitignore                 |   2 +
+ configure.ac               |   1 +
+ doc/Makefile.am            |   2 +-
+ doc/index.html             | 114 ---------------------------------------------
+ doc/index.html.in          | 114 +++++++++++++++++++++++++++++++++++++++++++++
+ doc/modules/version.xml.in |   1 +
  6 files changed, 119 insertions(+), 115 deletions(-)
 
 commit 09bf288d0aa2a1156a29d74a98d19a4f0e17b373
@@ -3539,12 +4895,12 @@ Date:   Mon Aug 10 09:27:47 2009 -0800
 
     [docs] Factor out gtk-doc displayed version number
 
- configure.ac                 |    2 ++
- doc/modules/Makefile.am      |    5 ++---
- doc/modules/book.xml         |    9 ++++++---
- doc/reference/Makefile.am    |    4 ++--
- doc/reference/seed-docs.sgml |    8 +++++---
- doc/reference/version.xml.in |    1 +
+ configure.ac                 | 2 ++
+ doc/modules/Makefile.am      | 5 ++---
+ doc/modules/book.xml         | 9 ++++++---
+ doc/reference/Makefile.am    | 4 ++--
+ doc/reference/seed-docs.sgml | 8 +++++---
+ doc/reference/version.xml.in | 1 +
  6 files changed, 18 insertions(+), 11 deletions(-)
 
 commit 2f81bc9bd27fafc8238e0e59fa3e082998cc8234
@@ -3553,7 +4909,7 @@ Date:   Mon Aug 10 09:23:24 2009 -0800
 
     Update gitignore to match new documentation, etc.
 
- .gitignore |    8 ++++++++
+ .gitignore | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 470e46e0255fccf6f4034cb99ea58e9b9933f5ea
@@ -3562,7 +4918,7 @@ Date:   Mon Aug 10 09:10:00 2009 -0800
 
     [tests] Fix everything.js test after inspection of source
 
- tests/javascript/everything.js |    4 ++--
+ tests/javascript/everything.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit df659051b341ea09f87e3ddee644f173b3924f45
@@ -3571,9 +4927,9 @@ Date:   Mon Aug 10 09:00:51 2009 -0800
 
     Distribute various assorted files which we were missing
 
- examples/Makefile.am                |   52 ++++++++---------------------------
- modules/ffi/Makefile.am             |    6 ++++
- tests/javascript/gtypes/Makefile.am |    1 +
+ examples/Makefile.am                | 52 ++++++++-----------------------------
+ modules/ffi/Makefile.am             |  6 +++++
+ tests/javascript/gtypes/Makefile.am |  1 +
  3 files changed, 18 insertions(+), 41 deletions(-)
 
 commit f2ff30b4f37423adbeefe5895d0214974c576d3a
@@ -3582,7 +4938,7 @@ Date:   Mon Aug 10 08:29:51 2009 -0800
 
     [cairo] Quit when floating window is closed
 
- examples/cairo.js |    1 +
+ examples/cairo.js | 1 +
  1 file changed, 1 insertion(+)
 
 commit 184e3f92d8892259879b0ee575a7afb6592ac40a
@@ -3591,9 +4947,9 @@ Date:   Mon Aug 10 08:21:11 2009 -0800
 
     [browser] Use nice property installation, fix toolbar bugs
 
- examples/browser/BrowserTab.js     |   42 ++++++++++++------------------------
- examples/browser/BrowserToolbar.js |    9 ++++----
- examples/browser/TabbedBrowser.js  |    6 ++----
+ examples/browser/BrowserTab.js     | 42 +++++++++++++-------------------------
+ examples/browser/BrowserToolbar.js |  9 ++++----
+ examples/browser/TabbedBrowser.js  |  6 ++----
  3 files changed, 21 insertions(+), 36 deletions(-)
 
 commit a0eb88ad2bac6b37d022960784b132754b9e05c0
@@ -3602,7 +4958,7 @@ Date:   Mon Aug 10 08:19:29 2009 -0800
 
     [libseed] Support pretty property installation for objects
 
- libseed/seed-gtype.c |   38 ++++++++++++++++++++++++++++++++------
+ libseed/seed-gtype.c | 38 ++++++++++++++++++++++++++++++++------
  1 file changed, 32 insertions(+), 6 deletions(-)
 
 commit 286b71a4e746400b84d9cbe3bced83db3034fdeb
@@ -3611,7 +4967,7 @@ Date:   Mon Aug 10 08:00:58 2009 -0800
 
     Remove OPEN_QUESTIONS; this is from before we had a bugzilla
 
- OPEN_QUESTIONS |    4 ----
+ OPEN_QUESTIONS | 4 ----
  1 file changed, 4 deletions(-)
 
 commit fbc08d6937f2b88a9d0840051f31f989666fd6f3
@@ -3624,7 +4980,7 @@ Date:   Mon Aug 10 07:52:00 2009 -0800
     the obvious choice is 0.8.6, but since we're now an official module,
     perhaps it should be 2.27.90.
 
- NEWS |   19 +++++++++++++++++++
+ NEWS | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit 5f39a036e1e2bb7334cb3ead911a14b1e0b1b079
@@ -3633,8 +4989,8 @@ Date:   Mon Aug 10 07:37:57 2009 -0800
 
     [docs] Filename tag is "filename", not "file"
 
- doc/reference/imports.sgml        |    2 +-
- doc/reference/tmpl/seed-eval.sgml |    8 ++++++++
+ doc/reference/imports.sgml        | 2 +-
+ doc/reference/tmpl/seed-eval.sgml | 8 ++++++++
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit b6d835b0818fa56d218131d76816a21d9bc18fda
@@ -3643,9 +4999,9 @@ Date:   Mon Aug 10 07:31:58 2009 -0800
 
     [docs] Distribute importer docs, include seed_script_destroy function
 
- doc/reference/Makefile.am       |    2 +-
- doc/reference/seed-sections.txt |    1 +
- m4/libtool.m4                   |    3 ---
+ doc/reference/Makefile.am       | 2 +-
+ doc/reference/seed-sections.txt | 1 +
+ m4/libtool.m4                   | 3 ---
  3 files changed, 2 insertions(+), 4 deletions(-)
 
 commit 8a1560043c1386ef48aa848c65b4871c1a9e145d
@@ -3654,11 +5010,11 @@ Date:   Mon Aug 10 07:15:25 2009 -0800
 
     Move ChangeLog to NEWS, autogenerate ChangeLog, to fit in with other GNOME modules
 
- ChangeLog               |  271 +----------------------------------------------
- Makefile.am             |   31 ++++--
- NEWS                    |  269 ++++++++++++++++++++++++++++++++++++++++++++++
- config.h.in             |    3 -
- modules/ffi/Makefile.am |    2 +-
+ ChangeLog               | 271 +-----------------------------------------------
+ Makefile.am             |  31 ++++--
+ NEWS                    | 269 +++++++++++++++++++++++++++++++++++++++++++++++
+ config.h.in             |   3 -
+ modules/ffi/Makefile.am |   2 +-
  5 files changed, 295 insertions(+), 281 deletions(-)
 
 commit 723f390151903df2b2e3402032aee7677cab1092
@@ -3667,7 +5023,7 @@ Date:   Mon Aug 10 06:40:00 2009 -0800
 
     [docs] Standardize on 'val' for type conversion function input value
 
- libseed/seed-types.c |    6 +++---
+ libseed/seed-types.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 905aa7dfaee6f2ba561e86fff4a9fe0180940923
@@ -3676,7 +5032,7 @@ Date:   Mon Aug 10 06:33:50 2009 -0800
 
     [ffi] Include ffi flags when building ffi module for nonstandard installs
 
- modules/ffi/Makefile.am |    6 ++++--
+ modules/ffi/Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit b7d9adbb9b226c0e07a725ea8b641038c4f61332
@@ -3688,9 +5044,9 @@ Date:   Thu Aug 6 07:44:17 2009 -0400
     This puts us in sync with the rest of GNOME and makes it easier for
     other projects depending on Seed to require the latest development version.
 
- configure.ac                 |    2 +-
- doc/modules/book.xml         |    2 +-
- doc/reference/seed-docs.sgml |    2 +-
+ configure.ac                 | 2 +-
+ doc/modules/book.xml         | 2 +-
+ doc/reference/seed-docs.sgml | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 5a788b7154bb4d6f9193c99e53c2d6ac695c260f
@@ -3699,7 +5055,7 @@ Date:   Wed Aug 5 23:49:57 2009 -0400
 
     Relicense main.c as LGPLv3, closes 590810
 
- src/main.c |   32 +++++++++++++++-----------------
+ src/main.c | 32 +++++++++++++++-----------------
  1 file changed, 15 insertions(+), 17 deletions(-)
 
 commit f3e1f631102409a8cdc5c31652a854347a3a6587
@@ -3708,9 +5064,9 @@ Date:   Sun Aug 2 21:20:02 2009 -0400
 
     [ffi] Add support for pointer types to FFI. Also avoid recreating FFIFunction objects and cache them in a GHashTable in the new seed_ffi_library_priv struct.
 
- modules/ffi/seed-ffi.c     |   51 +++++++++++++++++++++++++++++++++-----------
- modules/ffi/test-strdup.js |   12 +++++++++++
- modules/ffi/test-xlib.js   |   24 +++++++++++++++++++++
+ modules/ffi/seed-ffi.c     | 51 ++++++++++++++++++++++++++++++++++------------
+ modules/ffi/test-strdup.js | 12 +++++++++++
+ modules/ffi/test-xlib.js   | 24 ++++++++++++++++++++++
  3 files changed, 74 insertions(+), 13 deletions(-)
 
 commit b2acd1899e80b0b7b0decb8b7d8d42607067f3b1
@@ -3719,7 +5075,7 @@ Date:   Sun Aug 2 14:05:53 2009 -0400
 
     [libxml] getAttribute would only work for the first attribute in a tag. Fix this
 
- modules/libxml/xml.js |    1 +
+ modules/libxml/xml.js | 1 +
  1 file changed, 1 insertion(+)
 
 commit 05fc42c0bc3939e6e6189d1a3902c12d05adec8d
@@ -3728,10 +5084,10 @@ Date:   Sun Aug 2 13:55:24 2009 -0400
 
     [ffi] Hey, ffi actually works now. Add tests to prove this
 
- modules/ffi/Makefile.am    |    3 +-
- modules/ffi/seed-ffi.c     |   83 ++++++++++++++++++++++----------------------
- modules/ffi/test-sin.js    |   12 +++++++
- modules/ffi/test-strcmp.js |   13 +++++++
+ modules/ffi/Makefile.am    |  3 +-
+ modules/ffi/seed-ffi.c     | 83 +++++++++++++++++++++++-----------------------
+ modules/ffi/test-sin.js    | 12 +++++++
+ modules/ffi/test-strcmp.js | 13 ++++++++
  4 files changed, 68 insertions(+), 43 deletions(-)
 
 commit 828878ad4200b30af64be5f539c5da0a1a493fda
@@ -3740,9 +5096,9 @@ Date:   Sat Aug 1 21:43:59 2009 -0400
 
     [examples] Distribute proper versions of clutter examples
 
- config.h.in                                 |    3 +++
- doc/reference/tmpl/seed-typeconversion.sgml |    2 +-
- examples/Makefile.am                        |    9 ++++-----
+ config.h.in                                 | 3 +++
+ doc/reference/tmpl/seed-typeconversion.sgml | 2 +-
+ examples/Makefile.am                        | 9 ++++-----
  3 files changed, 8 insertions(+), 6 deletions(-)
 
 commit 04adfffbe102296024ff2d1d8f5fb6f16d38860a
@@ -3751,8 +5107,8 @@ Date:   Sat Aug 1 21:28:14 2009 -0400
 
     [ffi] Calling functions works now...
 
- modules/ffi/Makefile.am |    2 +-
- modules/ffi/seed-ffi.c  |  220 +++++++++++++++++++++++++++++++++++++++++++++--
+ modules/ffi/Makefile.am |   2 +-
+ modules/ffi/seed-ffi.c  | 220 ++++++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 216 insertions(+), 6 deletions(-)
 
 commit 9011b640aef992b5c3d32296d47dfea564fa5b17
@@ -3761,7 +5117,7 @@ Date:   Sat Aug 1 18:48:08 2009 -0400
 
     [ffi] Start implementing the calling bits...
 
- modules/ffi/seed-ffi.c |   36 ++++++++++++++++++++++++++++++++++--
+ modules/ffi/seed-ffi.c | 36 ++++++++++++++++++++++++++++++++++--
  1 file changed, 34 insertions(+), 2 deletions(-)
 
 commit 5681c3843e90c76b85dd69d43980c89a31cf7aae
@@ -3770,7 +5126,7 @@ Date:   Sat Aug 1 18:27:21 2009 -0400
 
     ffi: Implement signature reading/building of internal representation for function signatures
 
- modules/ffi/seed-ffi.c |  135 +++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/ffi/seed-ffi.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 134 insertions(+), 1 deletion(-)
 
 commit 571e2a04909667b5f9df07648cdc9f99e1f74fa6
@@ -3786,7 +5142,7 @@ Date:   Sat Aug 1 17:52:34 2009 -0400
 
     [libseed] Fix bug in seed_value_to_string where if an object had an explicitly null toString member (overriding the default object one), it would cause a crash
 
- libseed/seed-types.c |   11 +++++++----
+ libseed/seed-types.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit f28d04531685356203c6a2c2aee28f0aa01b959a
@@ -3795,7 +5151,7 @@ Date:   Sat Aug 1 17:47:52 2009 -0400
 
     Implement getting functions from libraries...sort of...no calling yet
 
- modules/ffi/seed-ffi.c |   34 ++++++++++++++++++++++++++++++++++
+ modules/ffi/seed-ffi.c | 34 ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
 commit c9518305fb0e6403dea3cce677bc06d0d442e707
@@ -3804,8 +5160,8 @@ Date:   Sat Aug 1 17:32:23 2009 -0400
 
     Add ffi.Library constructor
 
- modules/ffi/Makefile.am |   24 ++++++++++++++
- modules/ffi/seed-ffi.c  |   80 +++++++++++++++++++++++++++++++++++++++++++++++
+ modules/ffi/Makefile.am | 24 +++++++++++++++
+ modules/ffi/seed-ffi.c  | 80 +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 104 insertions(+)
 
 commit b79b825990e62e5e6c87ec6b9815f09d58e7a56a
@@ -3814,9 +5170,9 @@ Date:   Sat Aug 1 17:19:54 2009 -0400
 
     Initial add of ffi module
 
- configure.ac        |   20 ++++++++++++--------
- libseed/seed.h      |   10 ++++++++++
- modules/Makefile.am |    2 +-
+ configure.ac        | 20 ++++++++++++--------
+ libseed/seed.h      | 10 ++++++++++
+ modules/Makefile.am |  2 +-
  3 files changed, 23 insertions(+), 9 deletions(-)
 
 commit 08095552dde09554a7a4de36a66b90ced7d7283c
@@ -3825,7 +5181,7 @@ Date:   Sat Aug 1 15:54:29 2009 -0400
 
     [libseed] Organize seed.h by value/object/context/closure/etc functions.
 
- libseed/seed.h |  132 ++++++++++++++++++++++++++------------------------------
+ libseed/seed.h | 132 +++++++++++++++++++++++++++------------------------------
  1 file changed, 62 insertions(+), 70 deletions(-)
 
 commit 00f9a08b7a743c1d9a644f65ed40ff9dc20856ab
@@ -3834,8 +5190,8 @@ Date:   Fri Jul 31 23:48:29 2009 -0400
 
     [libseed] Fix gtype-gtype.js test
 
- libseed/seed-gtype.c                   |    3 +++
- tests/javascript/gtypes/gtype-gtype.js |   15 ++++++++++-----
+ libseed/seed-gtype.c                   |  3 +++
+ tests/javascript/gtypes/gtype-gtype.js | 15 ++++++++++-----
  2 files changed, 13 insertions(+), 5 deletions(-)
 
 commit 03eaaeb6d49089b93c407dc7abcbd139770e15fc
@@ -3844,8 +5200,8 @@ Date:   Fri Jul 31 23:42:50 2009 -0400
 
     Fix build
 
- configure.ac         |    2 --
- examples/Makefile.am |    9 ++-------
+ configure.ac         | 2 --
+ examples/Makefile.am | 9 ++-------
  2 files changed, 2 insertions(+), 9 deletions(-)
 
 commit b8012a636c670949081e447116184bc338badf8b
@@ -3854,7 +5210,7 @@ Date:   Fri Jul 31 23:26:59 2009 -0400
 
     [n-oscillator] Use new semi-attractive gobject property definition
 
- examples/n-oscillator.js |   24 +++++++++++-------------
+ examples/n-oscillator.js | 24 +++++++++++-------------
  1 file changed, 11 insertions(+), 13 deletions(-)
 
 commit 9ef3f053e9a81411026b1670e8bba12d3bf08137
@@ -3863,7 +5219,7 @@ Date:   Fri Jul 31 23:19:04 2009 -0400
 
     [notify-test] Make notify test only notify on file creation, and show semi-useful information, just for fun
 
- examples/notify-test.js |   20 +++++++++++++-------
+ examples/notify-test.js | 20 +++++++++++++-------
  1 file changed, 13 insertions(+), 7 deletions(-)
 
 commit 55b773883ec6c46803849744f0f66b0593b7bbe2
@@ -3872,17 +5228,17 @@ Date:   Fri Jul 31 23:09:58 2009 -0400
 
     [examples] Move clutter-transitions to broken as it hasn't been ported from 0.8
 
- examples/broken/clutter-transitions/Makefile.am    |   15 +
- examples/broken/clutter-transitions/main.js        |   85 +++
- examples/broken/clutter-transitions/one.jpg        |  Bin 0 -> 379735 bytes
- .../clutter-transitions/transition-library.js      |  661 ++++++++++++++++++++
- examples/broken/clutter-transitions/two.jpg        |  Bin 0 -> 218469 bytes
- examples/clutter-transitions/Makefile.am           |   15 -
- examples/clutter-transitions/main.js               |   85 ---
- examples/clutter-transitions/one.jpg               |  Bin 379735 -> 0 bytes
- examples/clutter-transitions/transition-library.js |  661 --------------------
- examples/clutter-transitions/two.jpg               |  Bin 218469 -> 0 bytes
- examples/pango.js                                  |    4 +-
+ examples/broken/clutter-transitions/Makefile.am    |  15 +
+ examples/broken/clutter-transitions/main.js        |  85 +++
+ examples/broken/clutter-transitions/one.jpg        | Bin 0 -> 379735 bytes
+ .../clutter-transitions/transition-library.js      | 661 +++++++++++++++++++++
+ examples/broken/clutter-transitions/two.jpg        | Bin 0 -> 218469 bytes
+ examples/clutter-transitions/Makefile.am           |  15 -
+ examples/clutter-transitions/main.js               |  85 ---
+ examples/clutter-transitions/one.jpg               | Bin 379735 -> 0 bytes
+ examples/clutter-transitions/transition-library.js | 661 ---------------------
+ examples/clutter-transitions/two.jpg               | Bin 218469 -> 0 bytes
+ examples/pango.js                                  |   4 +-
  11 files changed, 763 insertions(+), 763 deletions(-)
 
 commit 4760f2f970f7e35bba97f737696beee4b4084f95
@@ -3891,30 +5247,30 @@ Date:   Fri Jul 31 23:05:40 2009 -0400
 
     [examples] Clutter 1.0 is stable; there's no reason to hold around 0.8 or 0.9 examples anymore. Deprecate pong because it's horrible and never got ported from 0.8.
 
- examples/broken/pong/Makefile.am        |   19 ++
- examples/broken/pong/ball.png           |  Bin 0 -> 1570 bytes
- examples/broken/pong/midline.png        |  Bin 0 -> 4741 bytes
- examples/broken/pong/player.png         |  Bin 0 -> 1671 bytes
- examples/broken/pong/player2.png        |  Bin 0 -> 1491 bytes
- examples/broken/pong/pong.js            |  341 +++++++++++++++++++++++++++++++
- examples/clutter-0.8.js                 |  118 -----------
- examples/clutter-0.9.js                 |  106 ----------
- examples/clutter-1.0.js                 |  104 ++++++++++
- examples/clutter-cairo-1.0.js           |   34 +++
- examples/clutter-cairo.js               |   34 ---
- examples/clutter-cogl-0.8.js            |  126 ------------
- examples/clutter-cogl-0.9.js            |  110 ----------
- examples/clutter-cogl-1.0.js            |  103 ++++++++++
- examples/clutter-pad/main.js            |    3 -
- examples/clutter-shader/ShaderEditor.js |    2 -
- examples/clutter-shader/ShaderView.js   |    2 -
- examples/clutter-shader/main.js         |    8 +-
- examples/pong/Makefile.am               |   19 --
- examples/pong/ball.png                  |  Bin 1570 -> 0 bytes
- examples/pong/midline.png               |  Bin 4741 -> 0 bytes
- examples/pong/player.png                |  Bin 1671 -> 0 bytes
- examples/pong/player2.png               |  Bin 1491 -> 0 bytes
- examples/pong/pong.js                   |  341 -------------------------------
+ examples/broken/pong/Makefile.am        |  19 ++
+ examples/broken/pong/ball.png           | Bin 0 -> 1570 bytes
+ examples/broken/pong/midline.png        | Bin 0 -> 4741 bytes
+ examples/broken/pong/player.png         | Bin 0 -> 1671 bytes
+ examples/broken/pong/player2.png        | Bin 0 -> 1491 bytes
+ examples/broken/pong/pong.js            | 341 ++++++++++++++++++++++++++++++++
+ examples/clutter-0.8.js                 | 118 -----------
+ examples/clutter-0.9.js                 | 106 ----------
+ examples/clutter-1.0.js                 | 104 ++++++++++
+ examples/clutter-cairo-1.0.js           |  34 ++++
+ examples/clutter-cairo.js               |  34 ----
+ examples/clutter-cogl-0.8.js            | 126 ------------
+ examples/clutter-cogl-0.9.js            | 110 -----------
+ examples/clutter-cogl-1.0.js            | 103 ++++++++++
+ examples/clutter-pad/main.js            |   3 -
+ examples/clutter-shader/ShaderEditor.js |   2 -
+ examples/clutter-shader/ShaderView.js   |   2 -
+ examples/clutter-shader/main.js         |   8 +-
+ examples/pong/Makefile.am               |  19 --
+ examples/pong/ball.png                  | Bin 1570 -> 0 bytes
+ examples/pong/midline.png               | Bin 4741 -> 0 bytes
+ examples/pong/player.png                | Bin 1671 -> 0 bytes
+ examples/pong/player2.png               | Bin 1491 -> 0 bytes
+ examples/pong/pong.js                   | 341 --------------------------------
  24 files changed, 605 insertions(+), 865 deletions(-)
 
 commit 02c31eb1b43babb8f3ddbf73bc37b4a4cbdca9d8
@@ -3923,7 +5279,7 @@ Date:   Fri Jul 31 22:20:22 2009 -0400
 
     [libseed] Throw exception if property is installed with no type
 
- libseed/seed-gtype.c |    4 +++-
+ libseed/seed-gtype.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit f77bf3533bcabf0596deda792afc628c376cbb44
@@ -3932,7 +5288,7 @@ Date:   Fri Jul 31 22:18:47 2009 -0400
 
     [libseed] More error checking for pretty property installation
 
- libseed/seed-gtype.c |   43 ++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-gtype.c | 43 ++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 40 insertions(+), 3 deletions(-)
 
 commit c5fa8fcf5afd15113c2d6d481cbc2e4ee7429a82
@@ -3947,8 +5303,8 @@ Date:   Fri Jul 31 00:28:13 2009 -0400
     
     	libseed/seed-gtype.c
 
- examples/pango.js    |    3 -
- libseed/seed-gtype.c |  165 +++++++++++++++++++++++++++++++++++++++++++++++---
+ examples/pango.js    |   3 -
+ libseed/seed-gtype.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++----
  2 files changed, 155 insertions(+), 13 deletions(-)
 
 commit 1ee31abd425e67a8d202a576a2520691ef6368be
@@ -3959,7 +5315,7 @@ Date:   Fri Jul 31 00:21:17 2009 -0400
     
     This reverts commit a5abcd40e738bc9d30cfec5369aca74b06cbab24.
 
- libseed/seed-gtype.c |   40 ----------------------------------------
+ libseed/seed-gtype.c | 40 ----------------------------------------
  1 file changed, 40 deletions(-)
 
 commit fabfb136e709eda42c2d6d11230e2c2e7b539bda
@@ -3968,7 +5324,7 @@ Date:   Thu Jul 30 22:19:16 2009 -0400
 
     [tests] Accidentally committed broken test in last commit.
 
- tests/javascript/gtypes/gtype-property-nice.js |    2 +-
+ tests/javascript/gtypes/gtype-property-nice.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5f509e54d94dca9e0a22b41054976856818e51c6
@@ -3977,8 +5333,8 @@ Date:   Thu Jul 30 22:17:51 2009 -0400
 
     [libseed] More pretty-install property types, exception handling, etc.
 
- libseed/seed-gtype.c                           |  195 ++++++++++++++++++++----
- tests/javascript/gtypes/gtype-property-nice.js |    2 +-
+ libseed/seed-gtype.c                           | 195 +++++++++++++++++++++----
+ tests/javascript/gtypes/gtype-property-nice.js |   2 +-
  2 files changed, 168 insertions(+), 29 deletions(-)
 
 commit 90ccc29b60c2ba4dd2d77c50dad497ed4f05acb3
@@ -3993,8 +5349,8 @@ Date:   Thu Jul 30 21:30:14 2009 -0400
     
     This also needs a *ton* more error checking.
 
- libseed/seed-gtype.c                           |  125 +++++++++++++++++++++++-
- tests/javascript/gtypes/gtype-property-nice.js |   32 ++++++
+ libseed/seed-gtype.c                           | 125 ++++++++++++++++++++++++-
+ tests/javascript/gtypes/gtype-property-nice.js |  32 +++++++
  2 files changed, 155 insertions(+), 2 deletions(-)
 
 commit a5abcd40e738bc9d30cfec5369aca74b06cbab24
@@ -4005,7 +5361,7 @@ Date:   Thu Jul 30 20:53:28 2009 -0400
     
     This fixes breakage in adding properties to JS-side GTypes.
 
- libseed/seed-gtype.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-gtype.c | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit c53da2b3078bfd1c29a3fa0242b1de36e985872f
@@ -4014,58 +5370,58 @@ Date:   Wed Jul 29 21:01:58 2009 -0400
 
     Update copyright headers and indentation notes.
 
- libseed/seed-api.c                             |    4 +++-
- libseed/seed-builtins.c                        |    4 +++-
- libseed/seed-builtins.h                        |    6 ++----
- libseed/seed-closure.c                         |    6 ++++--
- libseed/seed-closure.h                         |    6 ++----
- libseed/seed-debug.h                           |    6 ++----
- libseed/seed-engine.c                          |    4 +++-
- libseed/seed-engine.h                          |    6 ++----
- libseed/seed-exceptions.c                      |    4 +++-
- libseed/seed-exceptions.h                      |    6 ++----
- libseed/seed-gtype.c                           |    4 +++-
- libseed/seed-gtype.h                           |    6 ++----
- libseed/seed-importer.c                        |   19 +++++++++++++++++++
- libseed/seed-importer.h                        |   19 +++++++++++++++++++
- libseed/seed-module.h                          |   19 +++++++++++++++++++
- libseed/seed-private.h                         |    6 ++----
- libseed/seed-signals.c                         |    4 +++-
- libseed/seed-signals.h                         |    6 ++----
- libseed/seed-structs.c                         |    4 +++-
- libseed/seed-structs.h                         |    7 ++-----
- libseed/seed-types.c                           |    4 +++-
- libseed/seed-types.h                           |    6 ++----
- libseed/seed.h                                 |    6 ++----
- modules/cairo/seed-cairo-enums.c               |   19 +++++++++++++++++++
- modules/cairo/seed-cairo-image-surface.c       |   19 +++++++++++++++++++
- modules/cairo/seed-cairo-matrix.c              |   19 +++++++++++++++++++
- modules/cairo/seed-cairo-pattern.c             |   19 +++++++++++++++++++
- modules/cairo/seed-cairo-pdf-surface.c         |   19 +++++++++++++++++++
- modules/cairo/seed-cairo-surface.c             |   19 +++++++++++++++++++
- modules/cairo/seed-cairo.c                     |   19 +++++++++++++++++++
- modules/canvas/seed-canvas.c                   |   19 +++++++++++++++++++
- modules/dbus/dbus-exports.c                    |   19 +++++++++++++++++++
- modules/dbus/dbus-values.c                     |   21 +++++++++++++++++++--
- modules/dbus/module.c                          |   19 +++++++++++++++++++
- modules/example/seed-example.c                 |   19 +++++++++++++++++++
- modules/gettext/seed-gettext.c                 |   19 +++++++++++++++++++
- modules/gtkbuilder/seed-gtkbuilder.c           |   19 +++++++++++++++++++
- modules/libxml/seed-libxml.c                   |   19 +++++++++++++++++++
- modules/mpfr/seed-mpfr-arithmetic.c            |   18 ++++++++++++++++++
- modules/mpfr/seed-mpfr-cmp.c                   |   18 ++++++++++++++++++
- modules/mpfr/seed-mpfr-trig.c                  |   18 ++++++++++++++++++
- modules/mpfr/seed-mpfr.c                       |   19 +++++++++++++++++++
- modules/multiprocessing/seed-multiprocessing.c |   19 +++++++++++++++++++
- modules/os/seed-os.c                           |   19 +++++++++++++++++++
- modules/readline/seed-readline.c               |   19 +++++++++++++++++++
- modules/sandbox/seed-sandbox.c                 |   19 +++++++++++++++++++
- modules/sqlite/seed-sqlite.c                   |   19 +++++++++++++++++++
- tests/c/api-closure.c                          |   19 +++++++++++++++++++
- tests/c/api-js-signal-from-c.c                 |   19 +++++++++++++++++++
- tests/c/api-types.c                            |   19 +++++++++++++++++++
- tests/c/basic.c                                |   19 +++++++++++++++++++
- tests/c/main.c                                 |   19 +++++++++++++++++++
+ libseed/seed-api.c                             |  4 +++-
+ libseed/seed-builtins.c                        |  4 +++-
+ libseed/seed-builtins.h                        |  6 ++----
+ libseed/seed-closure.c                         |  6 ++++--
+ libseed/seed-closure.h                         |  6 ++----
+ libseed/seed-debug.h                           |  6 ++----
+ libseed/seed-engine.c                          |  4 +++-
+ libseed/seed-engine.h                          |  6 ++----
+ libseed/seed-exceptions.c                      |  4 +++-
+ libseed/seed-exceptions.h                      |  6 ++----
+ libseed/seed-gtype.c                           |  4 +++-
+ libseed/seed-gtype.h                           |  6 ++----
+ libseed/seed-importer.c                        | 19 +++++++++++++++++++
+ libseed/seed-importer.h                        | 19 +++++++++++++++++++
+ libseed/seed-module.h                          | 19 +++++++++++++++++++
+ libseed/seed-private.h                         |  6 ++----
+ libseed/seed-signals.c                         |  4 +++-
+ libseed/seed-signals.h                         |  6 ++----
+ libseed/seed-structs.c                         |  4 +++-
+ libseed/seed-structs.h                         |  7 ++-----
+ libseed/seed-types.c                           |  4 +++-
+ libseed/seed-types.h                           |  6 ++----
+ libseed/seed.h                                 |  6 ++----
+ modules/cairo/seed-cairo-enums.c               | 19 +++++++++++++++++++
+ modules/cairo/seed-cairo-image-surface.c       | 19 +++++++++++++++++++
+ modules/cairo/seed-cairo-matrix.c              | 19 +++++++++++++++++++
+ modules/cairo/seed-cairo-pattern.c             | 19 +++++++++++++++++++
+ modules/cairo/seed-cairo-pdf-surface.c         | 19 +++++++++++++++++++
+ modules/cairo/seed-cairo-surface.c             | 19 +++++++++++++++++++
+ modules/cairo/seed-cairo.c                     | 19 +++++++++++++++++++
+ modules/canvas/seed-canvas.c                   | 19 +++++++++++++++++++
+ modules/dbus/dbus-exports.c                    | 19 +++++++++++++++++++
+ modules/dbus/dbus-values.c                     | 21 +++++++++++++++++++--
+ modules/dbus/module.c                          | 19 +++++++++++++++++++
+ modules/example/seed-example.c                 | 19 +++++++++++++++++++
+ modules/gettext/seed-gettext.c                 | 19 +++++++++++++++++++
+ modules/gtkbuilder/seed-gtkbuilder.c           | 19 +++++++++++++++++++
+ modules/libxml/seed-libxml.c                   | 19 +++++++++++++++++++
+ modules/mpfr/seed-mpfr-arithmetic.c            | 18 ++++++++++++++++++
+ modules/mpfr/seed-mpfr-cmp.c                   | 18 ++++++++++++++++++
+ modules/mpfr/seed-mpfr-trig.c                  | 18 ++++++++++++++++++
+ modules/mpfr/seed-mpfr.c                       | 19 +++++++++++++++++++
+ modules/multiprocessing/seed-multiprocessing.c | 19 +++++++++++++++++++
+ modules/os/seed-os.c                           | 19 +++++++++++++++++++
+ modules/readline/seed-readline.c               | 19 +++++++++++++++++++
+ modules/sandbox/seed-sandbox.c                 | 19 +++++++++++++++++++
+ modules/sqlite/seed-sqlite.c                   | 19 +++++++++++++++++++
+ tests/c/api-closure.c                          | 19 +++++++++++++++++++
+ tests/c/api-js-signal-from-c.c                 | 19 +++++++++++++++++++
+ tests/c/api-types.c                            | 19 +++++++++++++++++++
+ tests/c/basic.c                                | 19 +++++++++++++++++++
+ tests/c/main.c                                 | 19 +++++++++++++++++++
  52 files changed, 655 insertions(+), 57 deletions(-)
 
 commit b8aa7fd72ea82785122937ab617a5cde6c21d9bf
@@ -4074,21 +5430,21 @@ Date:   Wed Jul 29 20:54:45 2009 -0400
 
     [libseed] Indentation fix. Sorry, Robb.
 
- libseed/seed-api.c        |   97 +++++++---------
- libseed/seed-builtins.c   |   23 ++--
- libseed/seed-builtins.h   |    5 +-
- libseed/seed-closure.c    |   67 ++++++-----
- libseed/seed-closure.h    |   22 ++--
- libseed/seed-engine.c     |   97 ++++++++--------
- libseed/seed-engine.h     |   11 +-
- libseed/seed-exceptions.c |    5 +-
- libseed/seed-exceptions.h |   22 ++--
- libseed/seed-gtype.c      |  119 +++++++++++---------
- libseed/seed-importer.c   |  275 +++++++++++++++++++++++----------------------
- libseed/seed-signals.c    |   75 +++++++------
- libseed/seed-structs.c    |   17 +--
- libseed/seed-types.c      |  130 ++++++++++-----------
- libseed/seed-types.h      |   15 +--
+ libseed/seed-api.c        |  97 +++++++---------
+ libseed/seed-builtins.c   |  23 ++--
+ libseed/seed-builtins.h   |   5 +-
+ libseed/seed-closure.c    |  67 ++++++-----
+ libseed/seed-closure.h    |  22 ++--
+ libseed/seed-engine.c     |  97 ++++++++--------
+ libseed/seed-engine.h     |  11 +-
+ libseed/seed-exceptions.c |   5 +-
+ libseed/seed-exceptions.h |  22 ++--
+ libseed/seed-gtype.c      | 119 +++++++++++---------
+ libseed/seed-importer.c   | 275 +++++++++++++++++++++++-----------------------
+ libseed/seed-signals.c    |  75 +++++++------
+ libseed/seed-structs.c    |  17 +--
+ libseed/seed-types.c      | 130 ++++++++++------------
+ libseed/seed-types.h      |  15 +--
  15 files changed, 496 insertions(+), 484 deletions(-)
 
 commit 79a52bf83738b259dfb4bc348a1f97198ad3f438
@@ -4097,8 +5453,8 @@ Date:   Wed Jul 29 19:24:54 2009 -0400
 
     [docs] Various tiny grammatical fixes
 
- doc/reference/tmpl/seed-exception.sgml |    8 ++++----
- doc/reference/tmpl/seed-jsclass.sgml   |    8 ++++----
+ doc/reference/tmpl/seed-exception.sgml | 8 ++++----
+ doc/reference/tmpl/seed-jsclass.sgml   | 8 ++++----
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 commit 5200efdb207f460061e5f58ac5fab5096befc0dc
@@ -4107,7 +5463,7 @@ Date:   Wed Jul 29 05:33:06 2009 -0400
 
     [libseed] Real solution to the seed_gtype_construct recursion problem when inheriting from Seed defined GTypes. In seed_gtype_construct, we see if our parent is also a Seed defined type (has constructor == seed_gtype_construct), and if so we chain up to it's parent. If not, we chain to our parent.
 
- libseed/seed-gtype.c |   53 ++++++++++++++++++++++++++++++++++++--------------
+ libseed/seed-gtype.c | 53 +++++++++++++++++++++++++++++++++++++---------------
  1 file changed, 38 insertions(+), 15 deletions(-)
 
 commit c7daca0f60ae7e687804b11a7f71990a96042b49
@@ -4116,7 +5472,7 @@ Date:   Wed Jul 29 05:00:46 2009 -0400
 
     [libseed] The real problem with seed_gtype_construct was that the qdata storing the instance init function was being overwritten, use a hash table keyed by type now
 
- libseed/seed-gtype.c |  158 ++------------------------------------------------
+ libseed/seed-gtype.c | 158 ++-------------------------------------------------
  1 file changed, 6 insertions(+), 152 deletions(-)
 
 commit 2713cdcd087e55b96467c43c7dc57c83540a02ab
@@ -4125,7 +5481,7 @@ Date:   Wed Jul 29 04:49:40 2009 -0400
 
     [libseed] Remove some unused quarks
 
- libseed/seed-gtype.c |    5 +----
+ libseed/seed-gtype.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 343c99ffe3db1d9cdec89216e3aeae17c2e68985
@@ -4134,7 +5490,7 @@ Date:   Wed Jul 29 04:40:58 2009 -0400
 
     [libseed] Fix the code duplication in init/init_with_context_group. init_with_context_group was out of sync anyway
 
- libseed/seed-engine.c |  101 ++++++++-----------------------------------------
+ libseed/seed-engine.c | 101 ++++++++------------------------------------------
  1 file changed, 16 insertions(+), 85 deletions(-)
 
 commit 6932a8fff032b8c04ce6003bc0beff6cf61ba3b9
@@ -4143,9 +5499,9 @@ Date:   Wed Jul 29 03:51:27 2009 -0400
 
     [libseed] All Seed created GTypes have the same construct function (seed_gtype_construct), and so when chaining to the parent constructor, it is neccessary to explicitly pass the parent type rather than the constructor type, or suffer imminent stack overflow closes 590049. This was introduced in the switch from using init to constructors. Also includes a test
 
- libseed/seed-gtype.c                   |    2 +-
- tests/javascript/gtypes/Makefile.am    |    1 +
- tests/javascript/gtypes/gtype-gtype.js |   26 ++++++++++++++++++++++++++
+ libseed/seed-gtype.c                   |  2 +-
+ tests/javascript/gtypes/Makefile.am    |  1 +
+ tests/javascript/gtypes/gtype-gtype.js | 26 ++++++++++++++++++++++++++
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 commit c5c340ad6dea7d0e034b1544e9ea074b03329891
@@ -4154,8 +5510,8 @@ Date:   Wed Jul 29 03:42:01 2009 -0400
 
     [libseed] Prototype of gobject_methods should be Function.prototype. JSCore does not expose the JSObjectRef for Function.prototype, so it is neccessary to evaluate Function.prototype and assign from this.
 
- libseed/seed-engine.c |   10 ++++++++++
- libseed/seed-engine.h |    2 ++
+ libseed/seed-engine.c | 10 ++++++++++
+ libseed/seed-engine.h |  2 ++
  2 files changed, 12 insertions(+)
 
 commit 2074f448e9033a28e5a56757b4a96ebdf929ed30
@@ -4164,7 +5520,7 @@ Date:   Tue Jul 28 23:55:59 2009 -0400
 
     [docs] Add remarks about JavaScriptCore exception model
 
- doc/reference/tmpl/seed-exception.sgml |   12 +++++++++++-
+ doc/reference/tmpl/seed-exception.sgml | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 705f8593007bc891d846acb94e8618b0f5534072
@@ -4173,7 +5529,7 @@ Date:   Tue Jul 28 23:48:28 2009 -0400
 
     [docs] Add some documentation to SeedClass
 
- doc/reference/tmpl/seed-jsclass.sgml |   12 +++++++++++-
+ doc/reference/tmpl/seed-jsclass.sgml | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 0665abac32a65f343e7dc645b6add2b15c9507cd
@@ -4182,7 +5538,7 @@ Date:   Mon Jul 27 16:08:33 2009 -0400
 
     [libseed] Use g_build_filename for portability
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit acdf1ac0bdb852be8da7b947a32090ca8f1f89d0
@@ -4191,10 +5547,10 @@ Date:   Sun Jul 26 12:03:11 2009 -0400
 
     [libseed] Implement __init__.js functionality. When an importer directory is loaded (say imports.lightsoff) if the folder contains __init__.js it will be run (with the imports.lightsoff object as this)
 
- libseed/seed-api.c      |    9 +++++++++
- libseed/seed-engine.h   |   11 +++++++++++
- libseed/seed-importer.c |    5 +++++
- libseed/seed.h          |    1 +
+ libseed/seed-api.c      |  9 +++++++++
+ libseed/seed-engine.h   | 11 +++++++++++
+ libseed/seed-importer.c |  5 +++++
+ libseed/seed.h          |  1 +
  4 files changed, 26 insertions(+)
 
 commit 5b17a330a7e1548ae4de440c62d1cf014b69208b
@@ -4203,7 +5559,7 @@ Date:   Sun Jul 26 11:53:28 2009 -0400
 
     [libseed] Refactor some of the importer dir handling code (adding __init__.js) soon
 
- libseed/seed-importer.c |   22 ++++++++++++++++++++--
+ libseed/seed-importer.c | 22 ++++++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)
 
 commit 35e489736416bec156ed64da969d7dd689db3299
@@ -4212,7 +5568,7 @@ Date:   Thu Jul 23 08:23:44 2009 -0400
 
     [docs] Search path documentation
 
- doc/reference/imports.sgml |   13 ++++++++++++-
+ doc/reference/imports.sgml | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 commit 42884e419cc2d06ae171bcd16b4e7baf6195ea48
@@ -4221,7 +5577,7 @@ Date:   Thu Jul 23 07:43:57 2009 -0400
 
     [docs] Loading native modules documentation
 
- doc/reference/imports.sgml |   21 +++++++++++++++++++--
+ doc/reference/imports.sgml | 21 +++++++++++++++++++--
  1 file changed, 19 insertions(+), 2 deletions(-)
 
 commit e4992b7a74635d3bd9b592d675d3cedaa4506fc7
@@ -4233,8 +5589,8 @@ Date:   Wed Jul 22 15:47:30 2009 -0400
     This and all subsequent commits should be reviewed later or by
     other eyes, as this documentation is being written on a bus...
 
- doc/reference/imports.sgml   |   59 ++++++++++++++++++++++++++++++++++++++++++
- doc/reference/seed-docs.sgml |    8 +++---
+ doc/reference/imports.sgml   | 59 ++++++++++++++++++++++++++++++++++++++++++++
+ doc/reference/seed-docs.sgml |  8 +++---
  2 files changed, 64 insertions(+), 3 deletions(-)
 
 commit ec8d13813ca60c723c98c33bf56a7af104c9a69c
@@ -4243,7 +5599,7 @@ Date:   Tue Jul 21 14:42:38 2009 -0400
 
     [docs] Make documentation respect DESTDIR install parameter
 
- doc/modules/Makefile.am |    2 +-
+ doc/modules/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 249a26bd0774ff7a3c45c295c1b355ab015981c1
@@ -4259,7 +5615,7 @@ Date:   Mon Jun 22 15:18:36 2009 +0300
     On top of that, use out_args as the arguments source, since that's the
     array that we pass to g_function_info_invoke.
 
- libseed/seed-engine.c |    9 +++++++--
+ libseed/seed-engine.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit cb2a4316ccf6c7fc923bbc9ccde1072d83b1e994
@@ -4268,7 +5624,7 @@ Date:   Thu Jul 16 16:55:27 2009 -0400
 
     [os] Also use canonicalize_file_name in os.realpath
 
- modules/os/seed-os.c |    4 ++--
+ modules/os/seed-os.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 2b6406f682002c136cb62176214859699768f2df
@@ -4280,7 +5636,7 @@ Date:   Thu Jul 16 16:32:32 2009 -0400
     Apparently MAX_PATH is broken on many systems, and realpath is just a bad idea;
     this trades one problem for another, because now we depend on a glibc extension
 
- libseed/seed-importer.c |    6 ++++--
+ libseed/seed-importer.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 357249509ac56e88629791f6f89bee2122ace403
@@ -4289,7 +5645,7 @@ Date:   Thu Jul 16 07:52:48 2009 -0400
 
     Replace use of g_strconcat with "/" with g_build_filename
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8e530b8e5f6bba577709c94e244def26eb862d8f
@@ -4298,9 +5654,9 @@ Date:   Wed Jul 15 01:54:11 2009 -0400
 
     [libseed] [os] Make __script_path__ canonical and absolute. Add os.realpath.
 
- extensions/Seed.js.in   |   23 ++++++++++++++++++++---
- libseed/seed-importer.c |   17 ++++++++++++++---
- modules/os/seed-os.c    |   23 +++++++++++++++++++++++
+ extensions/Seed.js.in   | 23 ++++++++++++++++++++---
+ libseed/seed-importer.c | 17 ++++++++++++++---
+ modules/os/seed-os.c    | 23 +++++++++++++++++++++++
  3 files changed, 57 insertions(+), 6 deletions(-)
 
 commit 5f4db73080bb6d7f5d0a6edbc5cc5eed34a01716
@@ -4309,8 +5665,8 @@ Date:   Tue Jul 14 17:22:52 2009 -0400
 
     [gtkbuilder] Override Gtk.Builder.add_from_string to automatically pass the length argument
 
- extensions/Gtk.js                    |   10 ++++++++++
- modules/gtkbuilder/seed-gtkbuilder.c |    2 +-
+ extensions/Gtk.js                    | 10 ++++++++++
+ modules/gtkbuilder/seed-gtkbuilder.c |  2 +-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 43bbb4efb5929f31a8388ccfc21bebbd71996450
@@ -4319,8 +5675,8 @@ Date:   Tue Jul 14 16:57:04 2009 -0400
 
     [libseed] Expose path to script as __script_path__ on all JS contexts
 
- extensions/Seed.js.in   |    6 +++---
- libseed/seed-importer.c |    6 ++++++
+ extensions/Seed.js.in   | 6 +++---
+ libseed/seed-importer.c | 6 ++++++
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 commit 507a6b4fd2ffabb94861f02e4854282e09d8ddbc
@@ -4329,7 +5685,7 @@ Date:   Mon Jul 13 20:33:22 2009 -0400
 
     [examples] ls.js accidentally got Seed. stripped from printf (not print)
 
- examples/ls.js |    2 +-
+ examples/ls.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f0e383e71ae80fceb558ed2334fa64459d0245f8
@@ -4338,7 +5694,7 @@ Date:   Mon Jul 13 04:20:29 2009 -0400
 
     [docs] Seed online docs moved to library.gnome.org
 
- doc/reference/seed-docs.sgml |    4 ++--
+ doc/reference/seed-docs.sgml | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c86a963cc8ad8ac6b336439d5177e1709a1a9175
@@ -4347,7 +5703,7 @@ Date:   Sun Jul 12 18:03:19 2009 -0400
 
     [docs] Native function example
 
- doc/reference/tmpl/seed-nativefuncs.sgml |   38 ++++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed-nativefuncs.sgml | 38 ++++++++++++++++++++++++++++++++
  1 file changed, 38 insertions(+)
 
 commit d07fc3f0de74f1a97066d1fde477d98a09cc2974
@@ -4356,8 +5712,8 @@ Date:   Sun Jul 12 17:49:42 2009 -0400
 
     [docs] Move SeedFunctionCallback docs to seed-api.c
 
- doc/reference/tmpl/seed-nativefuncs.sgml |   15 +++++++--------
- libseed/seed-api.c                       |   17 +++++++++++++++++
+ doc/reference/tmpl/seed-nativefuncs.sgml | 15 +++++++--------
+ libseed/seed-api.c                       | 17 +++++++++++++++++
  2 files changed, 24 insertions(+), 8 deletions(-)
 
 commit bd64bd2880e4a97ad149a9531857a2bd470c1424
@@ -4369,7 +5725,7 @@ Date:   Sun Jul 12 17:40:31 2009 -0400
     I put docs for this in the sgml template. Not sure that's right, but it seems
     wrong to put it in seed.h too
 
- doc/reference/tmpl/seed-nativefuncs.sgml |   15 ++++++++-------
+ doc/reference/tmpl/seed-nativefuncs.sgml | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit 80047cc4c1417f6bcb0ffd9664c7b8c44480566e
@@ -4378,9 +5734,9 @@ Date:   Sun Jul 12 17:30:19 2009 -0400
 
     [libseed] Fix inconsistent argument naming on seed_create_function
 
- doc/reference/tmpl/seed-nativefuncs.sgml |    4 ++--
- libseed/seed.h                           |    4 ++--
- m4/libtool.m4                            |    3 +++
+ doc/reference/tmpl/seed-nativefuncs.sgml | 4 ++--
+ libseed/seed.h                           | 4 ++--
+ m4/libtool.m4                            | 3 +++
  3 files changed, 7 insertions(+), 4 deletions(-)
 
 commit a1ef3808f0f2dd353bf32a66ae5ee9a9bbc67b16
@@ -4389,8 +5745,8 @@ Date:   Sun Jul 12 17:27:20 2009 -0400
 
     [docs] seed_create_function
 
- doc/reference/tmpl/seed-nativefuncs.sgml |   11 +++++++++++
- libseed/seed-engine.c                    |   12 ++++++++++++
+ doc/reference/tmpl/seed-nativefuncs.sgml | 11 +++++++++++
+ libseed/seed-engine.c                    | 12 ++++++++++++
  2 files changed, 23 insertions(+)
 
 commit cb832d1dd5adf4f55e50044c4e35a76254af2d9c
@@ -4399,8 +5755,8 @@ Date:   Sun Jul 12 17:21:25 2009 -0400
 
     [docs] Update native function documentation
 
- doc/reference/tmpl/seed-nativefuncs.sgml |   17 +++++------------
- libseed/seed-api.c                       |    5 ++++-
+ doc/reference/tmpl/seed-nativefuncs.sgml | 17 +++++------------
+ libseed/seed-api.c                       |  5 ++++-
  2 files changed, 9 insertions(+), 13 deletions(-)
 
 commit e1d947a9d2fe8aabae4a32703ed0e76157752269
@@ -4409,8 +5765,8 @@ Date:   Sun Jul 12 16:33:47 2009 -0400
 
     [docs] Update more seed_value* docs
 
- libseed/seed-api.c |   54 +++++++++++++++++++++++++++++++++++++++++++---------
- m4/libtool.m4      |    3 ---
+ libseed/seed-api.c | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
+ m4/libtool.m4      |  3 ---
  2 files changed, 45 insertions(+), 12 deletions(-)
 
 commit 76d4134bebfe35ff4525053f62bf32a6dde30c88
@@ -4419,7 +5775,7 @@ Date:   Sun Jul 12 16:12:39 2009 -0400
 
     [docs] seed_value_[to/from]_object
 
- libseed/seed-types.c |   28 +++++++++++++++++++++++++++-
+ libseed/seed-types.c | 28 +++++++++++++++++++++++++++-
  1 file changed, 27 insertions(+), 1 deletion(-)
 
 commit b3ab1da1d2dd3edd04d193a00b0f76b2b935849a
@@ -4428,8 +5784,8 @@ Date:   Sun Jul 12 16:04:43 2009 -0400
 
     [docs] seed_value_to/from_filename, binary_string, etc
 
- libseed/seed-api.c   |   32 ++++++++++++++++++--------------
- libseed/seed-types.c |   43 +++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-api.c   | 32 ++++++++++++++++++--------------
+ libseed/seed-types.c | 43 +++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 61 insertions(+), 14 deletions(-)
 
 commit 7b31d94a35d91ebe2149ba5ab01048dbad297c76
@@ -4438,8 +5794,8 @@ Date:   Sun Jul 12 15:51:05 2009 -0400
 
     [docs] Add example for exception throwing
 
- doc/reference/tmpl/seed-context.sgml   |    2 +-
- doc/reference/tmpl/seed-exception.sgml |   34 ++++++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed-context.sgml   |  2 +-
+ doc/reference/tmpl/seed-exception.sgml | 34 ++++++++++++++++++++++++++++++++++
  2 files changed, 35 insertions(+), 1 deletion(-)
 
 commit a3b64d47ed29af92f5cb0d4afe34962f67df6a24
@@ -4448,8 +5804,8 @@ Date:   Sun Jul 12 15:21:26 2009 -0400
 
     [docs] Update SeedScript/evaluation docs
 
- doc/reference/tmpl/seed-eval.sgml |   34 +++++++++++++++++++++++++++++++++-
- libseed/seed-api.c                |   10 ++++++++--
+ doc/reference/tmpl/seed-eval.sgml | 34 +++++++++++++++++++++++++++++++++-
+ libseed/seed-api.c                | 10 ++++++++--
  2 files changed, 41 insertions(+), 3 deletions(-)
 
 commit 2ca762eb8626ee08057a9a35e9531b917ed06102
@@ -4458,7 +5814,7 @@ Date:   Sat Jul 11 21:12:47 2009 -0400
 
     [docs] Expand seed_value_to_string docs to explain various conditions
 
- libseed/seed-types.c |   10 ++++++++++
+ libseed/seed-types.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 5b45b9c62d2171b90318d23f021a3f6f736f1f6a
@@ -4467,8 +5823,8 @@ Date:   Sat Jul 11 21:04:08 2009 -0400
 
     [libseed] Type-conversion documentation (filler, to make gtk-doc happy)
 
- libseed/seed-types.c |  114 +++++++++++++++++++++++++++++++++++++-------------
- m4/libtool.m4        |   27 ++++++++++--
+ libseed/seed-types.c | 114 ++++++++++++++++++++++++++++++++++++++-------------
+ m4/libtool.m4        |  27 ++++++++++--
  2 files changed, 109 insertions(+), 32 deletions(-)
 
 commit 78ca796573ea93c37a049ea9b9c815d79de9b0d8
@@ -4477,14 +5833,14 @@ Date:   Sat Jul 11 01:41:47 2009 -0400
 
     [libseed] More minor GLib usage and redefinition fixes.
 
- libseed/seed-api.c        |   12 ++---
- libseed/seed-builtins.c   |   59 +++++++++-------------
- libseed/seed-closure.c    |   16 +++---
- libseed/seed-engine.c     |    9 ++--
- libseed/seed-exceptions.c |    9 ++--
- libseed/seed-gtype.c      |   66 ++++++++++++------------
- libseed/seed-structs.c    |    9 ++--
- libseed/seed-types.c      |  123 +++++++++++++++++++++------------------------
+ libseed/seed-api.c        |  12 ++---
+ libseed/seed-builtins.c   |  59 +++++++++-------------
+ libseed/seed-closure.c    |  16 +++---
+ libseed/seed-engine.c     |   9 ++--
+ libseed/seed-exceptions.c |   9 ++--
+ libseed/seed-gtype.c      |  66 ++++++++++++-------------
+ libseed/seed-structs.c    |   9 ++--
+ libseed/seed-types.c      | 123 ++++++++++++++++++++++------------------------
  8 files changed, 141 insertions(+), 162 deletions(-)
 
 commit cedbd784516b7309afbeada52256f18239810768
@@ -4493,11 +5849,11 @@ Date:   Sat Jul 11 00:19:04 2009 -0400
 
     [libseed] Use glib types everywhere, don't redefine variables in inner scope, etc.
 
- libseed/seed-engine.c     |   39 ++++++++++++++---------------
- libseed/seed-exceptions.c |    8 +++---
- libseed/seed-importer.c   |   61 ++++++++++++++++++++++++---------------------
- libseed/seed-signals.c    |    9 ++++---
- libseed/seed-structs.c    |   47 +++++++++++++++++-----------------
+ libseed/seed-engine.c     | 39 +++++++++++++++---------------
+ libseed/seed-exceptions.c |  8 ++++---
+ libseed/seed-importer.c   | 61 +++++++++++++++++++++++++----------------------
+ libseed/seed-signals.c    |  9 ++++---
+ libseed/seed-structs.c    | 47 ++++++++++++++++++------------------
  5 files changed, 86 insertions(+), 78 deletions(-)
 
 commit 5391d53c3c92bea30143ea0468212f798a721bf1
@@ -4506,7 +5862,7 @@ Date:   Fri Jul 10 23:17:26 2009 -0400
 
     [tests] Distribute module test
 
- tests/javascript/Makefile.am |    1 +
+ tests/javascript/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit f879de36b63568c9ab37e437067fd538fdc6c4df
@@ -4515,15 +5871,15 @@ Date:   Fri Jul 10 23:08:31 2009 -0400
 
     [libseed] Reduced unneccessary libc string functions in favor of glib ones
 
- libseed/seed-builtins.c   |    4 +---
- libseed/seed-engine.c     |    7 +++----
- libseed/seed-exceptions.c |    3 +--
- libseed/seed-importer.c   |   28 ++++++++++++++--------------
- libseed/seed-signals.c    |    5 ++---
- libseed/seed-structs.c    |    6 ++----
- libseed/seed-types.c      |    3 +--
- m4/libtool.m4             |   24 ++++--------------------
- src/main.c                |    2 --
+ libseed/seed-builtins.c   |  4 +---
+ libseed/seed-engine.c     |  7 +++----
+ libseed/seed-exceptions.c |  3 +--
+ libseed/seed-importer.c   | 28 ++++++++++++++--------------
+ libseed/seed-signals.c    |  5 ++---
+ libseed/seed-structs.c    |  6 ++----
+ libseed/seed-types.c      |  3 +--
+ m4/libtool.m4             | 24 ++++--------------------
+ src/main.c                |  2 --
  9 files changed, 28 insertions(+), 54 deletions(-)
 
 commit a3f95340e19e82faf4c0c6e2b70a9388e33f9f93
@@ -4532,8 +5888,8 @@ Date:   Fri Jul 10 20:33:10 2009 -0400
 
     [examples] Note to the user that calculator-mpfr isn't working yet
 
- examples/calculator-mpfr.js |    3 +++
- tools/check-release.sh      |    1 +
+ examples/calculator-mpfr.js | 3 +++
+ tools/check-release.sh      | 1 +
  2 files changed, 4 insertions(+)
 
 commit 722d61cdb9da1fd2db204026a637250081187f0b
@@ -4544,7 +5900,8 @@ Date:   Fri Jul 10 20:29:36 2009 -0400
     
     This reverts commit 3acbf99b1f53e4494a9bb1a5af31a0d68188119e.
 
- 0 files changed
+ doc/reference/html/.keep | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 357f14425225a723c75d315a8e024387e7c8bc9f
 Author: Tim Horton <hortont@svn.gnome.org>
@@ -4554,7 +5911,7 @@ Date:   Fri Jul 10 20:29:27 2009 -0400
     
     This reverts commit 19658a0833b6f5fdc95d26d1151e2b42a6b2a1b8.
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 19658a0833b6f5fdc95d26d1151e2b42a6b2a1b8
@@ -4563,7 +5920,7 @@ Date:   Fri Jul 10 20:27:25 2009 -0400
 
     [docs] Missed part of the last commit
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3acbf99b1f53e4494a9bb1a5af31a0d68188119e
@@ -4572,7 +5929,8 @@ Date:   Fri Jul 10 20:16:29 2009 -0400
 
     [docs] Try to keep html directory around (empty file so git doesn't lose it)
 
- 0 files changed
+ doc/reference/html/.keep | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit ee2714fc1e4050a7237d0fd0e630064f144ccbb2
 Author: Tim Horton <hortont@svn.gnome.org>
@@ -4580,7 +5938,7 @@ Date:   Fri Jul 10 20:15:24 2009 -0400
 
     [docs] Make sure to distribute contact documentation page
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9769390e6cc3b24e10ad3f47503fdfad1e028387
@@ -4589,7 +5947,7 @@ Date:   Fri Jul 10 20:15:05 2009 -0400
 
     [tools] Use public git repo for check-release, not git+ssh
 
- tools/check-release.sh |    2 +-
+ tools/check-release.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d7ce9a47b25a7b481c2b58693a26a070195fce51
@@ -4598,7 +5956,7 @@ Date:   Fri Jul 10 20:00:53 2009 -0400
 
     [build] Clean up configure output surrounding mpfr detection
 
- configure.ac |    5 -----
+ configure.ac | 5 -----
  1 file changed, 5 deletions(-)
 
 commit 040640ee779534c623e6642d61e359ad6d91cb72
@@ -4607,7 +5965,7 @@ Date:   Fri Jul 10 19:58:10 2009 -0400
 
     [build] Distribute manpage
 
- doc/Makefile.am |    3 ++-
+ doc/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 51b6443fc5a573432af9574e48ae79167d8154e6
@@ -4616,8 +5974,9 @@ Date:   Fri Jul 10 19:56:39 2009 -0400
 
     [docs] Add empty seed.types back so make dist doesn't complain
 
- .gitignore |    1 -
- 1 file changed, 1 deletion(-)
+ .gitignore               | 1 -
+ doc/reference/seed.types | 0
+ 2 files changed, 1 deletion(-)
 
 commit dd992cfa5813a59963b7d8d4f84c5ea55773de32
 Author: Tim Horton <hortont@svn.gnome.org>
@@ -4625,8 +5984,8 @@ Date:   Fri Jul 10 18:06:25 2009 -0400
 
     [modules] Fix last remaining minor warnings in canvas and dbus
 
- modules/canvas/seed-canvas.c |    6 +++---
- modules/dbus/dbus-values.c   |    3 +++
+ modules/canvas/seed-canvas.c | 6 +++---
+ modules/dbus/dbus-values.c   | 3 +++
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 2e57474eec77500d802e255eb52767f3740a2f19
@@ -4635,7 +5994,7 @@ Date:   Fri Jul 10 17:26:42 2009 -0400
 
     [docs] Don't scan seed-debug or seed-path, as they're not public api
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4b1663647e75c94c9c202a86489108f81105cbfe
@@ -4648,15 +6007,15 @@ Date:   Fri Jul 10 17:23:03 2009 -0400
     big book, so we can have interlinking and so that everything is
     in the same devhelp book.
 
- doc/Makefile.am                       |    2 +-
- doc/modules/book.xml                  |    2 +-
- doc/modules/gtkbuilder/gtkbuilder.xml |   10 +++++-----
- doc/modules/readline/readline.xml     |   10 +++++-----
- doc/modules/sandbox/sandbox.xml       |   11 +++++------
- doc/modules/sqlite/sqlite.xml         |   16 ++++++++--------
- doc/reference/Makefile.am             |    2 +-
- doc/reference/contact.sgml            |    2 +-
- doc/reference/seed-docs.sgml          |   17 +++++++++++++----
+ doc/Makefile.am                       |  2 +-
+ doc/modules/book.xml                  |  2 +-
+ doc/modules/gtkbuilder/gtkbuilder.xml | 10 +++++-----
+ doc/modules/readline/readline.xml     | 10 +++++-----
+ doc/modules/sandbox/sandbox.xml       | 11 +++++------
+ doc/modules/sqlite/sqlite.xml         | 16 ++++++++--------
+ doc/reference/Makefile.am             |  2 +-
+ doc/reference/contact.sgml            |  2 +-
+ doc/reference/seed-docs.sgml          | 17 +++++++++++++----
  9 files changed, 40 insertions(+), 32 deletions(-)
 
 commit 4ff12561a2c7d4ad270ca296f72f8b7b5472a93e
@@ -4665,7 +6024,7 @@ Date:   Fri Jul 10 16:32:25 2009 -0400
 
     Update version to 0.8.5
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4079409f2a59ad0e8b884dacce7071eeffd54eaa
@@ -4674,7 +6033,7 @@ Date:   Fri Jul 10 16:31:43 2009 -0400
 
     Add changelog data for 0.8.5
 
- ChangeLog |   35 ++++++++++++++++++++++++++++++++---
+ ChangeLog | 35 ++++++++++++++++++++++++++++++++---
  1 file changed, 32 insertions(+), 3 deletions(-)
 
 commit 15bc4fe551bd33f3234b4b9c05fb662bc7b410e6
@@ -4683,7 +6042,7 @@ Date:   Fri Jul 10 15:50:20 2009 -0400
 
     Repair changelog (0.8 didn't conform to 80 chars, double spacing)
 
- ChangeLog |   66 ++++++++++++++++++++++++++++++++++++++++++++++---------------
+ ChangeLog | 66 +++++++++++++++++++++++++++++++++++++++++++++++----------------
  1 file changed, 50 insertions(+), 16 deletions(-)
 
 commit 1e8e6a75232f1b0c2f719a8f9383bea4a2bffc08
@@ -4692,8 +6051,8 @@ Date:   Fri Jul 10 15:45:57 2009 -0400
 
     [docs] Move webkit minimum revision details to deps list, not intro
 
- doc/reference/building.sgml     |    4 ++--
- doc/reference/introduction.sgml |    7 ++-----
+ doc/reference/building.sgml     | 4 ++--
+ doc/reference/introduction.sgml | 7 ++-----
  2 files changed, 4 insertions(+), 7 deletions(-)
 
 commit 8b599c999131de68d7fe26f09aa68e2e4a56efd6
@@ -4702,8 +6061,8 @@ Date:   Thu Jul 9 00:57:41 2009 -0400
 
     [docs] Significantly updated exception documentation
 
- doc/reference/tmpl/seed-exception.sgml |    1 +
- libseed/seed-exceptions.c              |   23 +++++++++++++++++++++--
+ doc/reference/tmpl/seed-exception.sgml |  1 +
+ libseed/seed-exceptions.c              | 23 +++++++++++++++++++++--
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 commit 914a2e95e68724fbed2ef209392b537871faca5d
@@ -4712,7 +6071,7 @@ Date:   Thu Jul 9 00:43:30 2009 -0400
 
     [docs] Remove import_namespace and include from runtime docs
 
- doc/runtime.html.in |   27 ---------------------------
+ doc/runtime.html.in | 27 ---------------------------
  1 file changed, 27 deletions(-)
 
 commit e6b1696d22f915bf5098a7d21256f164f79f53d2
@@ -4721,9 +6080,9 @@ Date:   Thu Jul 9 00:41:57 2009 -0400
 
     [docs] Add exception names to reference
 
- doc/reference/tmpl/seed-exception.sgml |   14 ++++++++++++--
- libseed/seed-exceptions.c              |    5 ++---
- libseed/seed-module.h                  |    3 ++-
+ doc/reference/tmpl/seed-exception.sgml | 14 ++++++++++++--
+ libseed/seed-exceptions.c              |  5 ++---
+ libseed/seed-module.h                  |  3 ++-
  3 files changed, 16 insertions(+), 6 deletions(-)
 
 commit ad5feadbd8a0b3f8f8d1551a1e9263fcada58061
@@ -4732,25 +6091,25 @@ Date:   Thu Jul 9 00:14:26 2009 -0400
 
     [docs] Scan seed-header.h; install seed-header.h; docs for seed-header.h
 
- doc/reference/seed-sections.txt      |    3 ++
- doc/reference/tmpl/seed-modules.sgml |   28 +++++++++++++
- libseed/Makefile.am                  |    2 +-
- libseed/seed-module.h                |   72 ++++++++++++++++++++++++++++++++++
- modules/Makefile.am                  |    2 -
- modules/cairo/Makefile.am            |    1 -
- modules/canvas/Makefile.am           |    1 -
- modules/dbus/Makefile.am             |    1 -
- modules/example/Makefile.am          |    1 -
- modules/gettext/Makefile.am          |    1 -
- modules/gtkbuilder/Makefile.am       |    1 -
- modules/libxml/Makefile.am           |    1 -
- modules/mpfr/Makefile.am             |    1 -
- modules/multiprocessing/Makefile.am  |    3 +-
- modules/os/Makefile.am               |    3 +-
- modules/readline/Makefile.am         |    2 +-
- modules/sandbox/Makefile.am          |    1 -
- modules/seed-module.h                |   33 ----------------
- modules/sqlite/Makefile.am           |    2 +-
+ doc/reference/seed-sections.txt      |  3 ++
+ doc/reference/tmpl/seed-modules.sgml | 28 ++++++++++++++
+ libseed/Makefile.am                  |  2 +-
+ libseed/seed-module.h                | 72 ++++++++++++++++++++++++++++++++++++
+ modules/Makefile.am                  |  2 -
+ modules/cairo/Makefile.am            |  1 -
+ modules/canvas/Makefile.am           |  1 -
+ modules/dbus/Makefile.am             |  1 -
+ modules/example/Makefile.am          |  1 -
+ modules/gettext/Makefile.am          |  1 -
+ modules/gtkbuilder/Makefile.am       |  1 -
+ modules/libxml/Makefile.am           |  1 -
+ modules/mpfr/Makefile.am             |  1 -
+ modules/multiprocessing/Makefile.am  |  3 +-
+ modules/os/Makefile.am               |  3 +-
+ modules/readline/Makefile.am         |  2 +-
+ modules/sandbox/Makefile.am          |  1 -
+ modules/seed-module.h                | 33 -----------------
+ modules/sqlite/Makefile.am           |  2 +-
  19 files changed, 108 insertions(+), 51 deletions(-)
 
 commit 87b930b47e17e8da289425083706058170288919
@@ -4759,7 +6118,7 @@ Date:   Wed Jul 8 21:59:00 2009 -0400
 
     [docs] Fix incorrect argument name in prepare_global_context docs.
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d6cc781232c0d804b831ec1cbe1e9e6163456e5d
@@ -4768,7 +6127,7 @@ Date:   Wed Jul 8 21:58:20 2009 -0400
 
     [docs] Add context sample code
 
- doc/reference/tmpl/seed-context.sgml |   14 ++++++++++++--
+ doc/reference/tmpl/seed-context.sgml | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit cb63a71c7e172ae696e47b257ecce9a58d0b0f4f
@@ -4777,7 +6136,7 @@ Date:   Wed Jul 8 19:30:25 2009 -0400
 
     [mpfr] Made mpfr.zeta support mpfr_zeta_ui
 
- modules/mpfr/seed-mpfr-trig.c |   11 ++++++++---
+ modules/mpfr/seed-mpfr-trig.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 commit 97f6941a9e2aa10b431e6433c6e03dbfa23a0ff8
@@ -4786,9 +6145,9 @@ Date:   Wed Jul 8 19:07:19 2009 -0400
 
     [mpfr] Added mpfr.cmp_si_2exp
 
- modules/mpfr/seed-mpfr-cmp.c |   40 ++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c     |    1 +
- modules/mpfr/seed-mpfr.h     |    1 +
+ modules/mpfr/seed-mpfr-cmp.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c     |  1 +
+ modules/mpfr/seed-mpfr.h     |  1 +
  3 files changed, 42 insertions(+)
 
 commit 43110b2c79de98c3db06c6c0482aed9d096689b1
@@ -4797,9 +6156,9 @@ Date:   Wed Jul 8 19:01:22 2009 -0400
 
     [mpfr] Added mpfr.div_2si
 
- modules/mpfr/seed-mpfr-arithmetic.c |   40 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 40 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 42 insertions(+)
 
 commit ebfee4e5c63cfd8be80e3a1f1f1048a0c9e30421
@@ -4808,9 +6167,9 @@ Date:   Wed Jul 8 19:00:15 2009 -0400
 
     [mpfr] Added mpfr.mul_2si
 
- modules/mpfr/seed-mpfr-arithmetic.c |   40 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 40 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 42 insertions(+)
 
 commit bf1f335aeb7dd36ff5cc05b891530bfff5e2775d
@@ -4819,9 +6178,9 @@ Date:   Wed Jul 8 18:50:13 2009 -0400
 
     [mpfr] Added mpfr.pow
 
- modules/mpfr/seed-mpfr-arithmetic.c |   65 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 65 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 67 insertions(+)
 
 commit 851a5a6506f87c37c1b41a8ad304eb60cc1cb162
@@ -4830,9 +6189,9 @@ Date:   Wed Jul 8 18:33:25 2009 -0400
 
     [mpfr] Added mpfr.root
 
- modules/mpfr/seed-mpfr-arithmetic.c |   41 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 41 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 43 insertions(+)
 
 commit c6fdb66f865aa6d520845a3f4fee50b758bc8dd0
@@ -4841,9 +6200,9 @@ Date:   Wed Jul 8 18:26:10 2009 -0400
 
     [mpfr] Added mpfr.sqr
 
- modules/mpfr/seed-mpfr-arithmetic.c |   30 ++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 30 ++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 32 insertions(+)
 
 commit 5738d1175fc4838440bc994cb156a9f48035887c
@@ -4852,9 +6211,9 @@ Date:   Wed Jul 8 18:24:23 2009 -0400
 
     [mpfr] Added mpfr.div
 
- modules/mpfr/seed-mpfr-arithmetic.c |   61 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 61 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 63 insertions(+)
 
 commit 8c10fb9166d09d97592951840e0029fb40ccaabb
@@ -4863,9 +6222,9 @@ Date:   Wed Jul 8 18:22:58 2009 -0400
 
     [mpfr] Added mpfr.sub
 
- modules/mpfr/seed-mpfr-arithmetic.c |   61 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 61 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 63 insertions(+)
 
 commit 404d588cd8beb3743a1427e3e34d27409e217548
@@ -4874,9 +6233,9 @@ Date:   Wed Jul 8 18:19:19 2009 -0400
 
     [mpfr] Added mpfr.mul
 
- modules/mpfr/seed-mpfr-arithmetic.c |   61 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    2 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 61 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  2 ++
  3 files changed, 64 insertions(+)
 
 commit a9aba4a900db1e383f9b14074791f5c3b41b6fce
@@ -4885,7 +6244,7 @@ Date:   Wed Jul 8 17:55:44 2009 -0400
 
     [mpfr] mpfr.check_range
 
- modules/mpfr/seed-mpfr.c |   24 ++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit 5f7e61f5c3710a2e8b91a635ad1eb56a7067f352
@@ -4894,7 +6253,7 @@ Date:   Wed Jul 8 17:54:16 2009 -0400
 
     [mpfr] Added mpfr.subnormalize
 
- modules/mpfr/seed-mpfr.c |   24 ++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit aa2c73c6f6afeb3631ee1f01aa2f9c51a002aa21
@@ -4903,9 +6262,9 @@ Date:   Wed Jul 8 17:49:29 2009 -0400
 
     [docs] Add a bit of SeedContext documentation
 
- doc/reference/tmpl/seed-context.sgml |    6 +++++-
- libseed/seed-api.c                   |    4 ++++
- libseed/seed-engine.c                |   11 +++++++++--
+ doc/reference/tmpl/seed-context.sgml |  6 +++++-
+ libseed/seed-api.c                   |  4 ++++
+ libseed/seed-engine.c                | 11 +++++++++--
  3 files changed, 18 insertions(+), 3 deletions(-)
 
 commit 11df7daf19cf4eaf064fdd1cbee83e8f24228eec
@@ -4914,8 +6273,8 @@ Date:   Wed Jul 8 16:19:41 2009 -0400
 
     [docs] Use &nbsp; to make empty lines not disappear. Hackk..
 
- doc/reference/tmpl/seed-main.sgml    |    8 ++++----
- doc/reference/tmpl/seed-modules.sgml |   25 ++++++++++++-------------
+ doc/reference/tmpl/seed-main.sgml    |  8 ++++----
+ doc/reference/tmpl/seed-modules.sgml | 25 ++++++++++++-------------
  2 files changed, 16 insertions(+), 17 deletions(-)
 
 commit ebfa0c081960c5cd2418452e768712ffff935d8f
@@ -4924,9 +6283,9 @@ Date:   Wed Jul 8 13:38:09 2009 -0400
 
     Added mpfr.clear_flags()
 
- modules/mpfr/seed-mpfr-trig.c |   12 ++++++++++++
- modules/mpfr/seed-mpfr.c      |    1 +
- modules/mpfr/seed-mpfr.h      |    1 +
+ modules/mpfr/seed-mpfr-trig.c | 12 ++++++++++++
+ modules/mpfr/seed-mpfr.c      |  1 +
+ modules/mpfr/seed-mpfr.h      |  1 +
  3 files changed, 14 insertions(+)
 
 commit bfc30ff0b89e2d0664f0763a666e9f790317627d
@@ -4935,7 +6294,7 @@ Date:   Wed Jul 8 13:35:21 2009 -0400
 
     Added other flags
 
- modules/mpfr/seed-mpfr.c |  104 ++++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 104 insertions(+)
 
 commit 4d4eb865512698b708d161da00ee6eec5d2591c7
@@ -4944,7 +6303,7 @@ Date:   Wed Jul 8 13:30:00 2009 -0400
 
     Underflow flag
 
- modules/mpfr/seed-mpfr.c |   26 ++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 commit 7668be5a9559e9f281527e1edfdf261ff4c938dc
@@ -4953,7 +6312,7 @@ Date:   Wed Jul 8 13:22:23 2009 -0400
 
     Added emin_min, emin_max, emax_min, emax_max
 
- modules/mpfr/seed-mpfr.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
 commit 62546b402f150009bcbccbf0e638b18209373ecd
@@ -4962,7 +6321,7 @@ Date:   Wed Jul 8 13:09:27 2009 -0400
 
     Made mpfr.cmp work with doubles
 
- modules/mpfr/seed-mpfr-cmp.c |   14 ++++++++++----
+ modules/mpfr/seed-mpfr-cmp.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 commit 4a0f80f582272689368d3a792078b8d07a280210
@@ -4971,7 +6330,7 @@ Date:   Wed Jul 8 14:22:44 2009 -0400
 
     [gettext] Don't free the wrong string (causing double-free crash in case of no translation)
 
- modules/gettext/seed-gettext.c |    3 ++-
+ modules/gettext/seed-gettext.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b531c83fcd6eb374a9af4fcb5c763ab2d20d1723
@@ -4980,8 +6339,8 @@ Date:   Wed Jul 8 01:24:17 2009 -0400
 
     [docs] Expand "Initialization" docs
 
- libseed/seed-api.c    |    4 +++-
- libseed/seed-engine.c |   24 +++++++++++++++++++++---
+ libseed/seed-api.c    |  4 +++-
+ libseed/seed-engine.c | 24 +++++++++++++++++++++---
  2 files changed, 24 insertions(+), 4 deletions(-)
 
 commit 596536aef46f13167f48dc664685c83768e32cd1
@@ -4990,8 +6349,8 @@ Date:   Wed Jul 8 01:10:06 2009 -0400
 
     [docs] Add a few simple examples for writing modules. Why isn't spacing preserved in inline code?
 
- doc/reference/tmpl/seed-modules.sgml     |   92 +++++++++++++++++++++++++++++-
- doc/reference/tmpl/seed-nativefuncs.sgml |    2 +-
+ doc/reference/tmpl/seed-modules.sgml     | 92 +++++++++++++++++++++++++++++++-
+ doc/reference/tmpl/seed-nativefuncs.sgml |  2 +-
  2 files changed, 91 insertions(+), 3 deletions(-)
 
 commit 976c7463e44b9eed61047488dd0e51c667ed8879
@@ -5000,7 +6359,7 @@ Date:   Wed Jul 8 00:57:18 2009 -0400
 
     [libseed] Fix spelling error in SeedFunctionCallback
 
- libseed/seed.h |    2 +-
+ libseed/seed.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 37591fb2e2c449a91b76306eb8ae2cfcae761ebe
@@ -5009,8 +6368,8 @@ Date:   Wed Jul 8 00:23:46 2009 -0400
 
     [docs] Add simple "Hello world" to docs
 
- doc/reference/tmpl/seed-main.sgml   |   25 +++++++-
- doc/reference/tmpl/seed-unused.sgml |  110 -----------------------------------
+ doc/reference/tmpl/seed-main.sgml   |  25 +++++++-
+ doc/reference/tmpl/seed-unused.sgml | 110 ------------------------------------
  2 files changed, 24 insertions(+), 111 deletions(-)
 
 commit f2913266b2903527b55333c32318974259608b4a
@@ -5019,12 +6378,12 @@ Date:   Wed Jul 8 00:11:10 2009 -0400
 
     [docs] Add overrides for some of the structs which aren't getting scanned
 
- .gitignore                           |    1 -
- doc/reference/seed-overrides.txt     |   41 ++++++++++++++++++++++++++++++++++
- doc/reference/tmpl/seed-closure.sgml |   11 +++++++++
- doc/reference/tmpl/seed-eval.sgml    |    4 ++++
- doc/reference/tmpl/seed-main.sgml    |   12 +++++++++-
- libseed/seed-api.c                   |    5 +++--
+ .gitignore                           |  1 -
+ doc/reference/seed-overrides.txt     | 41 ++++++++++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed-closure.sgml | 11 ++++++++++
+ doc/reference/tmpl/seed-eval.sgml    |  4 ++++
+ doc/reference/tmpl/seed-main.sgml    | 12 ++++++++++-
+ libseed/seed-api.c                   |  5 +++--
  6 files changed, 70 insertions(+), 4 deletions(-)
 
 commit 9c5c7ca039b69bf4dea73057452977ca98b27d2a
@@ -5033,11 +6392,11 @@ Date:   Tue Jul 7 22:17:52 2009 -0400
 
     [docs] Fix numerous gtk-doc warnings
 
- doc/reference/tmpl/seed-jsclass.sgml     |    2 +-
- doc/reference/tmpl/seed-nativefuncs.sgml |    2 +-
- doc/reference/tmpl/seed-nativetypes.sgml |    2 +-
- libseed/seed-exceptions.c                |    4 +++-
- libseed/seed.h                           |    7 +++----
+ doc/reference/tmpl/seed-jsclass.sgml     | 2 +-
+ doc/reference/tmpl/seed-nativefuncs.sgml | 2 +-
+ doc/reference/tmpl/seed-nativetypes.sgml | 2 +-
+ libseed/seed-exceptions.c                | 4 +++-
+ libseed/seed.h                           | 7 +++----
  5 files changed, 9 insertions(+), 8 deletions(-)
 
 commit 8d02ea7b7780a0aaef4430eccadf94fb93ba0e72
@@ -5046,7 +6405,7 @@ Date:   Tue Jul 7 01:48:27 2009 -0400
 
     [os] Fix a few more warnings
 
- modules/os/seed-os.c |    7 +------
+ modules/os/seed-os.c | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit dd5906ddfc057e865ab10647457d52d749f1593c
@@ -5055,9 +6414,9 @@ Date:   Tue Jul 7 01:46:56 2009 -0400
 
     [modules] Fix many warnings
 
- Makefile.am                                    |    4 ++--
- modules/multiprocessing/seed-multiprocessing.c |    1 -
- modules/readline/seed-readline.c               |    6 +-----
+ Makefile.am                                    | 4 ++--
+ modules/multiprocessing/seed-multiprocessing.c | 1 -
+ modules/readline/seed-readline.c               | 6 +-----
  3 files changed, 3 insertions(+), 8 deletions(-)
 
 commit dbabb34e177646246a6f5aa2e60fbd6b9c301e7f
@@ -5066,9 +6425,9 @@ Date:   Tue Jul 7 01:33:34 2009 -0400
 
     [libseed] Make seed_make_pointer public; libxml module uses it, and I see no reason not to
 
- doc/reference/seed-sections.txt             |    3 ++-
- doc/reference/tmpl/seed-typeconversion.sgml |   10 ++++++++++
- libseed/seed.h                              |    1 +
+ doc/reference/seed-sections.txt             |  3 ++-
+ doc/reference/tmpl/seed-typeconversion.sgml | 10 ++++++++++
+ libseed/seed.h                              |  1 +
  3 files changed, 13 insertions(+), 1 deletion(-)
 
 commit ade592dd81d8ef69484d0192eb9ad3679251606a
@@ -5077,7 +6436,7 @@ Date:   Tue Jul 7 01:29:11 2009 -0400
 
     [libxml] Fix many warnings now that -Wall is on
 
- modules/libxml/seed-libxml.c |   18 +++++++++---------
+ modules/libxml/seed-libxml.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit 3da6f00a365d347db51e88430fdc84ea8ad339d6
@@ -5086,8 +6445,8 @@ Date:   Tue Jul 7 01:18:45 2009 -0400
 
     [example module] Fix warnings (include glib, etc)
 
- modules/example/Makefile.am    |    1 -
- modules/example/seed-example.c |    5 +++--
+ modules/example/Makefile.am    | 1 -
+ modules/example/seed-example.c | 5 +++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 78284d355c6046536472034429fdf4787e703b6b
@@ -5096,7 +6455,7 @@ Date:   Tue Jul 7 01:16:28 2009 -0400
 
     [gettext] Fix missing return from dcgettext
 
- modules/gettext/seed-gettext.c |    2 ++
+ modules/gettext/seed-gettext.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 77a6cdd64f3e7326e6b8b75716d1ee3a213de8d7
@@ -5105,8 +6464,8 @@ Date:   Mon Jul 6 13:07:08 2009 -0400
 
     [docs] Add seed_empty_class to classes doc, needs to be prettier
 
- doc/reference/seed-sections.txt      |    1 +
- doc/reference/tmpl/seed-jsclass.sgml |    7 +++++++
+ doc/reference/seed-sections.txt      | 1 +
+ doc/reference/tmpl/seed-jsclass.sgml | 7 +++++++
  2 files changed, 8 insertions(+)
 
 commit 4cb03f4187c65cc7f5c54403e14d86de810d1911
@@ -5115,7 +6474,7 @@ Date:   Mon Jul 6 08:44:28 2009 -0400
 
     [docs] Update wording of module deps
 
- doc/reference/building.sgml |    6 +++---
+ doc/reference/building.sgml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 01a8c1016a764cc89955929ddc7d57a8a1f5619c
@@ -5124,19 +6483,19 @@ Date:   Mon Jul 6 08:36:05 2009 -0400
 
     [docs] Add bugzilla to contact page
 
- doc/reference/contact.sgml                  |    6 +++++-
- doc/reference/tmpl/seed-closure.sgml        |    1 -
- doc/reference/tmpl/seed-context.sgml        |    1 -
- doc/reference/tmpl/seed-eval.sgml           |    1 -
- doc/reference/tmpl/seed-exception.sgml      |    1 -
- doc/reference/tmpl/seed-jsclass.sgml        |    1 -
- doc/reference/tmpl/seed-main.sgml           |    1 -
- doc/reference/tmpl/seed-modules.sgml        |    1 -
- doc/reference/tmpl/seed-nativefuncs.sgml    |    1 -
- doc/reference/tmpl/seed-nativetypes.sgml    |    1 -
- doc/reference/tmpl/seed-object.sgml         |    1 -
- doc/reference/tmpl/seed-signals.sgml        |    1 -
- doc/reference/tmpl/seed-typeconversion.sgml |    1 -
+ doc/reference/contact.sgml                  | 6 +++++-
+ doc/reference/tmpl/seed-closure.sgml        | 1 -
+ doc/reference/tmpl/seed-context.sgml        | 1 -
+ doc/reference/tmpl/seed-eval.sgml           | 1 -
+ doc/reference/tmpl/seed-exception.sgml      | 1 -
+ doc/reference/tmpl/seed-jsclass.sgml        | 1 -
+ doc/reference/tmpl/seed-main.sgml           | 1 -
+ doc/reference/tmpl/seed-modules.sgml        | 1 -
+ doc/reference/tmpl/seed-nativefuncs.sgml    | 1 -
+ doc/reference/tmpl/seed-nativetypes.sgml    | 1 -
+ doc/reference/tmpl/seed-object.sgml         | 1 -
+ doc/reference/tmpl/seed-signals.sgml        | 1 -
+ doc/reference/tmpl/seed-typeconversion.sgml | 1 -
  13 files changed, 5 insertions(+), 13 deletions(-)
 
 commit 761d0ef1c02cea817263eab77def83e80434e199
@@ -5145,19 +6504,19 @@ Date:   Mon Jul 6 08:31:23 2009 -0400
 
     [docs] Apparently, keeping the generated sgml files around is OK, they get *merged* with new data from the source (and they're where our section titles are)
 
- doc/reference/tmpl/seed-closure.sgml        |   66 ++++
- doc/reference/tmpl/seed-context.sgml        |   90 ++++++
- doc/reference/tmpl/seed-eval.sgml           |   69 ++++
- doc/reference/tmpl/seed-exception.sgml      |   78 +++++
- doc/reference/tmpl/seed-jsclass.sgml        |   54 ++++
- doc/reference/tmpl/seed-main.sgml           |   49 +++
- doc/reference/tmpl/seed-modules.sgml        |   19 ++
- doc/reference/tmpl/seed-nativefuncs.sgml    |   46 +++
- doc/reference/tmpl/seed-nativetypes.sgml    |  109 +++++++
- doc/reference/tmpl/seed-object.sgml         |  273 ++++++++++++++++
- doc/reference/tmpl/seed-signals.sgml        |   33 ++
- doc/reference/tmpl/seed-typeconversion.sgml |  452 +++++++++++++++++++++++++++
- doc/reference/tmpl/seed-unused.sgml         |   38 +++
+ doc/reference/tmpl/seed-closure.sgml        |  66 ++++
+ doc/reference/tmpl/seed-context.sgml        |  90 ++++++
+ doc/reference/tmpl/seed-eval.sgml           |  69 +++++
+ doc/reference/tmpl/seed-exception.sgml      |  78 +++++
+ doc/reference/tmpl/seed-jsclass.sgml        |  54 ++++
+ doc/reference/tmpl/seed-main.sgml           |  49 +++
+ doc/reference/tmpl/seed-modules.sgml        |  19 ++
+ doc/reference/tmpl/seed-nativefuncs.sgml    |  46 +++
+ doc/reference/tmpl/seed-nativetypes.sgml    | 109 +++++++
+ doc/reference/tmpl/seed-object.sgml         | 273 +++++++++++++++++
+ doc/reference/tmpl/seed-signals.sgml        |  33 ++
+ doc/reference/tmpl/seed-typeconversion.sgml | 452 ++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed-unused.sgml         |  38 +++
  13 files changed, 1376 insertions(+)
 
 commit bd1ba3812693afa393f300f18a9721136880a5e4
@@ -5166,8 +6525,8 @@ Date:   Mon Jul 6 08:21:18 2009 -0400
 
     [docs] Add manpage (seed.1)
 
- Makefile.am |    3 ++-
- doc/seed.1  |   29 +++++++++++++++++++++++++++++
+ Makefile.am |  3 ++-
+ doc/seed.1  | 29 +++++++++++++++++++++++++++++
  2 files changed, 31 insertions(+), 1 deletion(-)
 
 commit acb8a8b4571dd903cfb90bc48f214e762ea4f2df
@@ -5176,7 +6535,7 @@ Date:   Mon Jul 6 07:56:21 2009 -0400
 
     [docs] Set namespace to "seed" so reference index is usable
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f8ccfef5944328395a88247fa9e482e6bd6091f1
@@ -5185,7 +6544,7 @@ Date:   Mon Jul 6 07:54:03 2009 -0400
 
     [docs] Only list seed/seed.html once in sections
 
- doc/reference/seed-sections.txt |   14 ++------------
+ doc/reference/seed-sections.txt | 14 ++------------
  1 file changed, 2 insertions(+), 12 deletions(-)
 
 commit 6876b5287e00ce7b26dc03d973ab0737e6710b72
@@ -5194,7 +6553,7 @@ Date:   Mon Jul 6 07:50:41 2009 -0400
 
     [docs] Update makefile (put static sgml files in the right section)
 
- doc/reference/Makefile.am |    6 +++---
+ doc/reference/Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6dd8133e74a65a1c3594f07ce0e5ef5959ac3131
@@ -5203,16 +6562,16 @@ Date:   Mon Jul 6 07:44:02 2009 -0400
 
     [docs] Continuing reorg; break into new sections, name sections
 
- doc/reference/seed-docs.sgml                |   28 ++--
- doc/reference/seed-sections.txt             |  218 +++++++++++++++------------
- doc/reference/tmpl/seed-eval.sgml           |   10 ++
- doc/reference/tmpl/seed-jsclass.sgml        |   10 ++
- doc/reference/tmpl/seed-modules.sgml        |   10 ++
- doc/reference/tmpl/seed-nativefuncs.sgml    |   10 ++
- doc/reference/tmpl/seed-nativetypes.sgml    |   10 ++
- doc/reference/tmpl/seed-signals.sgml        |   10 ++
- doc/reference/tmpl/seed-typeconversion.sgml |   10 ++
- doc/reference/tmpl/seed-value.sgml          |   10 --
+ doc/reference/seed-docs.sgml                |  28 ++--
+ doc/reference/seed-sections.txt             | 218 +++++++++++++++-------------
+ doc/reference/tmpl/seed-eval.sgml           |  10 ++
+ doc/reference/tmpl/seed-jsclass.sgml        |  10 ++
+ doc/reference/tmpl/seed-modules.sgml        |  10 ++
+ doc/reference/tmpl/seed-nativefuncs.sgml    |  10 ++
+ doc/reference/tmpl/seed-nativetypes.sgml    |  10 ++
+ doc/reference/tmpl/seed-signals.sgml        |  10 ++
+ doc/reference/tmpl/seed-typeconversion.sgml |  10 ++
+ doc/reference/tmpl/seed-value.sgml          |  10 --
  10 files changed, 209 insertions(+), 117 deletions(-)
 
 commit b59d855ec74057fee31e1265e51d0c1410cefd32
@@ -5221,8 +6580,8 @@ Date:   Sun Jul 5 23:00:01 2009 -0400
 
     [mpfr] Put stuff on mpfr namespace that belongs there
 
- modules/gettext/seed-gettext.c |    4 +-
- modules/mpfr/seed-mpfr.c       |   95 +++++++++++++++++++---------------------
+ modules/gettext/seed-gettext.c |  4 +-
+ modules/mpfr/seed-mpfr.c       | 95 ++++++++++++++++++++----------------------
  2 files changed, 47 insertions(+), 52 deletions(-)
 
 commit 12960844df76632b0aa020d85be58ffc0133da2a
@@ -5231,7 +6590,7 @@ Date:   Sun Jul 5 21:52:36 2009 -0400
 
     [mpfr] get/set emin/emax
 
- modules/mpfr/seed-mpfr.c |   66 ++++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 66 insertions(+)
 
 commit 9dbc65f301ad4fb32ff86ad0746243fe4bb04f1a
@@ -5240,7 +6599,7 @@ Date:   Sun Jul 5 21:19:03 2009 -0400
 
     [mpfr] Added mpfr.get_version and get_patches
 
- modules/mpfr/seed-mpfr.c |   38 ++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 38 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 38 insertions(+)
 
 commit 6023680fe5d5cfaf92327024ba21b977f9c10c30
@@ -5249,9 +6608,9 @@ Date:   Sun Jul 5 21:06:41 2009 -0400
 
     [mpfr] Added mpfr.setsign mpfr.signbit, mpfr.copysign
 
- modules/mpfr/seed-mpfr-arithmetic.c |   82 ++++++++++++++++++++++++++++++++++-
- modules/mpfr/seed-mpfr.c            |    3 ++
- modules/mpfr/seed-mpfr.h            |    3 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 82 ++++++++++++++++++++++++++++++++++++-
+ modules/mpfr/seed-mpfr.c            |  3 ++
+ modules/mpfr/seed-mpfr.h            |  3 ++
  3 files changed, 87 insertions(+), 1 deletion(-)
 
 commit e4db8303b02e73cd9ecf9e551866e53d92f71801
@@ -5260,7 +6619,7 @@ Date:   Sun Jul 5 20:22:48 2009 -0400
 
     [mpfr] Add mpfr.can_round and other fixes
 
- modules/mpfr/seed-mpfr.c |   33 +++++++++++++++++++++++++++++----
+ modules/mpfr/seed-mpfr.c | 33 +++++++++++++++++++++++++++++----
  1 file changed, 29 insertions(+), 4 deletions(-)
 
 commit dd843896e1a3ba40e61790121fe8613d984034e8
@@ -5269,7 +6628,7 @@ Date:   Sun Jul 5 20:01:37 2009 -0400
 
     [mpfr] get/set default rounding mode
 
- modules/mpfr/seed-mpfr.c |   24 ++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit bda517ed18032de986345e84a7b500af8fde0d97
@@ -5278,9 +6637,9 @@ Date:   Sun Jul 5 19:51:13 2009 -0400
 
     [mpfr] Added mpfr.prec_round
 
- modules/mpfr/seed-mpfr-arithmetic.c |   23 +++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    2 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 23 +++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  2 ++
  3 files changed, 26 insertions(+)
 
 commit 8de7ca10090920cd681563b89ad52c9753a11395
@@ -5289,9 +6648,9 @@ Date:   Sun Jul 5 19:40:02 2009 -0400
 
     [mpfr] Added mpfr.min, mpfr.max
 
- modules/mpfr/seed-mpfr-arithmetic.c |   64 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    2 ++
- modules/mpfr/seed-mpfr.h            |    3 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 64 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  2 ++
+ modules/mpfr/seed-mpfr.h            |  3 ++
  3 files changed, 69 insertions(+)
 
 commit ceefddab9e23f237c3f25f4a79cd1a0fdc5556e1
@@ -5300,9 +6659,9 @@ Date:   Sun Jul 5 19:28:31 2009 -0400
 
     [mpfr] Added nexttoward, nextabove, nextbelow
 
- modules/mpfr/seed-mpfr-arithmetic.c |   61 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    3 ++
- modules/mpfr/seed-mpfr.h            |    4 +++
+ modules/mpfr/seed-mpfr-arithmetic.c | 61 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  3 ++
+ modules/mpfr/seed-mpfr.h            |  4 +++
  3 files changed, 68 insertions(+)
 
 commit 013123ce3fc5d75c56070ea624e192609be6b7fe
@@ -5311,7 +6670,7 @@ Date:   Sun Jul 5 19:07:25 2009 -0400
 
     [mpfr] Fixed wrong function name in exception
 
- modules/mpfr/seed-mpfr-trig.c |    2 +-
+ modules/mpfr/seed-mpfr-trig.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b38405d41a87e45e9eebab79e4b701362ef5289a
@@ -5320,9 +6679,9 @@ Date:   Sun Jul 5 19:06:28 2009 -0400
 
     [mpfr] More rounding related functions
 
- modules/mpfr/seed-mpfr-arithmetic.c |  112 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    4 ++
- modules/mpfr/seed-mpfr.h            |    5 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 112 ++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |   4 ++
+ modules/mpfr/seed-mpfr.h            |   5 ++
  3 files changed, 121 insertions(+)
 
 commit 8606bdc33cab90824bb263a65c98cae041c91625
@@ -5331,7 +6690,7 @@ Date:   Sun Jul 5 23:06:36 2009 -0400
 
     [docs] Update contact docs to have Git repo and email addresses
 
- doc/reference/contact.sgml |   11 +++++++++--
+ doc/reference/contact.sgml | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 commit 4607806086a74b4caca92e96659ad03446247ba5
@@ -5340,12 +6699,12 @@ Date:   Sun Jul 5 22:57:55 2009 -0400
 
     [docs] Add contact information to docs
 
- doc/reference/contact.sgml   |   23 +++++++++++++++++++++++
- doc/reference/seed-docs.sgml |   19 ++++++++-----------
- libseed/seed-api.c           |   12 ------------
- libseed/seed-closure.h       |    6 ------
- libseed/seed-exceptions.h    |    6 ------
- libseed/seed-types.h         |   12 ------------
+ doc/reference/contact.sgml   | 23 +++++++++++++++++++++++
+ doc/reference/seed-docs.sgml | 19 ++++++++-----------
+ libseed/seed-api.c           | 12 ------------
+ libseed/seed-closure.h       |  6 ------
+ libseed/seed-exceptions.h    |  6 ------
+ libseed/seed-types.h         | 12 ------------
  6 files changed, 31 insertions(+), 47 deletions(-)
 
 commit 3c2c736db83736b4cfe2f87d2eec5aae58ce83b8
@@ -5354,13 +6713,13 @@ Date:   Sun Jul 5 22:45:03 2009 -0400
 
     [docs] Add the rest of the sgml templates
 
- doc/reference/tmpl/seed-closure.sgml   |   10 ++
- doc/reference/tmpl/seed-exception.sgml |   10 ++
- doc/reference/tmpl/seed-main.sgml      |   10 ++
- doc/reference/tmpl/seed-main.sgml.sgml |  226 ++++++++++++++++++++++++++++++++
- doc/reference/tmpl/seed-object.sgml    |   10 ++
- doc/reference/tmpl/seed-string.sgml    |   10 ++
- doc/reference/tmpl/seed-value.sgml     |   10 ++
+ doc/reference/tmpl/seed-closure.sgml   |  10 ++
+ doc/reference/tmpl/seed-exception.sgml |  10 ++
+ doc/reference/tmpl/seed-main.sgml      |  10 ++
+ doc/reference/tmpl/seed-main.sgml.sgml | 226 +++++++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed-object.sgml    |  10 ++
+ doc/reference/tmpl/seed-string.sgml    |  10 ++
+ doc/reference/tmpl/seed-value.sgml     |  10 ++
  7 files changed, 286 insertions(+)
 
 commit 4d07b99f9e26454a1f4fc553a8d401013c73fe9d
@@ -5374,9 +6733,9 @@ Date:   Sun Jul 5 19:29:43 2009 -0400
     quite a few sections, and will end up looking much more like Gtk/Glib once
     I'm done. After that, I'm planning on porting the tutorial.
 
- .gitignore                           |   14 ++------------
- doc/reference/tmpl/seed-context.sgml |   10 ++++++++++
- libseed/seed-engine.h                |    6 ------
+ .gitignore                           | 14 ++------------
+ doc/reference/tmpl/seed-context.sgml | 10 ++++++++++
+ libseed/seed-engine.h                |  6 ------
  3 files changed, 12 insertions(+), 18 deletions(-)
 
 commit d31406898690806d151375ab0fffdabb05acdaa9
@@ -5385,9 +6744,9 @@ Date:   Sun Jul 5 18:15:57 2009 -0400
 
     More rounding functions
 
- modules/mpfr/seed-mpfr-arithmetic.c |  120 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    4 ++
- modules/mpfr/seed-mpfr.h            |    5 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 120 ++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |   4 ++
+ modules/mpfr/seed-mpfr.h            |   5 ++
  3 files changed, 129 insertions(+)
 
 commit 986c52b0841740882b3310088c8203ba38a54a9f
@@ -5396,9 +6755,9 @@ Date:   Sun Jul 5 18:08:40 2009 -0400
 
     Added rounding functions
 
- modules/mpfr/seed-mpfr-arithmetic.c |  145 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    5 ++
- modules/mpfr/seed-mpfr.h            |    6 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 145 ++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |   5 ++
+ modules/mpfr/seed-mpfr.h            |   6 ++
  3 files changed, 156 insertions(+)
 
 commit 3a4d4d994fee72505bae0d969dd3ed8fb6a4b0e0
@@ -5407,7 +6766,7 @@ Date:   Sun Jul 5 17:40:55 2009 -0400
 
     Added mpfr.print as sort of fake printf
 
- modules/mpfr/seed-mpfr.c |   26 ++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 commit 74260aa0f5bcb9bd888c600bfb617f832dbdb96a
@@ -5416,8 +6775,8 @@ Date:   Sun Jul 5 17:20:50 2009 -0400
 
     [mpfr] Fixed various problems / cleaned up warnings
 
- modules/mpfr/seed-mpfr-arithmetic.c |    1 -
- modules/mpfr/seed-mpfr.c            |    6 ++----
+ modules/mpfr/seed-mpfr-arithmetic.c | 1 -
+ modules/mpfr/seed-mpfr.c            | 6 ++----
  2 files changed, 2 insertions(+), 5 deletions(-)
 
 commit 334cb9666eadda35d01e3cd0c6488b1e393687ca
@@ -5426,9 +6785,9 @@ Date:   Sun Jul 5 17:15:55 2009 -0400
 
     [mpfr] Added mpfr.dim
 
- modules/mpfr/seed-mpfr-arithmetic.c |   32 ++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 32 ++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 34 insertions(+)
 
 commit 51eb7abf52b250f4524e63b2f99b318455d5dbc5
@@ -5437,9 +6796,9 @@ Date:   Sun Jul 5 16:58:50 2009 -0400
 
     [mpfr] Added mpfr.abs and mpfr.neg
 
- modules/mpfr/seed-mpfr-arithmetic.c |   60 +++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    2 ++
- modules/mpfr/seed-mpfr.h            |    3 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 60 +++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  2 ++
+ modules/mpfr/seed-mpfr.h            |  3 ++
  3 files changed, 65 insertions(+)
 
 commit f792cc58d87fa8e0efba1fad48a6527db4828fad
@@ -5448,9 +6807,9 @@ Date:   Sun Jul 5 16:31:15 2009 -0400
 
     [mpfr] Added mpfr.free_cache
 
- modules/mpfr/seed-mpfr-trig.c |   12 ++++++++++++
- modules/mpfr/seed-mpfr.c      |    1 +
- modules/mpfr/seed-mpfr.h      |    2 ++
+ modules/mpfr/seed-mpfr-trig.c | 12 ++++++++++++
+ modules/mpfr/seed-mpfr.c      |  1 +
+ modules/mpfr/seed-mpfr.h      |  2 ++
  3 files changed, 15 insertions(+)
 
 commit c580721293d0da555710c7eac2172b3af011e9fa
@@ -5459,9 +6818,9 @@ Date:   Sun Jul 5 16:26:52 2009 -0400
 
     [mpfr] Added mpfr.hypot
 
- modules/mpfr/seed-mpfr-trig.c |   32 ++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    1 +
- modules/mpfr/seed-mpfr.h      |    1 +
+ modules/mpfr/seed-mpfr-trig.c | 32 ++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  1 +
+ modules/mpfr/seed-mpfr.h      |  1 +
  3 files changed, 34 insertions(+)
 
 commit f199c315b3f9742a028f0b0afc5c8ec1feb2e80e
@@ -5470,9 +6829,9 @@ Date:   Sun Jul 5 16:21:47 2009 -0400
 
     [mpfr] Added mpfr.agm
 
- modules/mpfr/seed-mpfr-trig.c |   32 ++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    1 +
- modules/mpfr/seed-mpfr.h      |    1 +
+ modules/mpfr/seed-mpfr-trig.c | 32 ++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  1 +
+ modules/mpfr/seed-mpfr.h      |  1 +
  3 files changed, 34 insertions(+)
 
 commit 7f4db360a4cf9166b9a48e80cc6f796d7dc86bc5
@@ -5481,9 +6840,9 @@ Date:   Sun Jul 5 16:19:33 2009 -0400
 
     [mpfr] Added mpfr.fma and mpfr.fms
 
- modules/mpfr/seed-mpfr-trig.c |   68 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    2 ++
- modules/mpfr/seed-mpfr.h      |    3 ++
+ modules/mpfr/seed-mpfr-trig.c | 68 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  2 ++
+ modules/mpfr/seed-mpfr.h      |  3 ++
  3 files changed, 73 insertions(+)
 
 commit 71e62c1cc04edff826e8dda6a146a5a5454af889
@@ -5492,9 +6851,9 @@ Date:   Sun Jul 5 16:12:44 2009 -0400
 
     [mpfr] Added bessel functions
 
- modules/mpfr/seed-mpfr-trig.c |  199 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    6 ++
- modules/mpfr/seed-mpfr.h      |    7 ++
+ modules/mpfr/seed-mpfr-trig.c | 199 ++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |   6 ++
+ modules/mpfr/seed-mpfr.h      |   7 ++
  3 files changed, 212 insertions(+)
 
 commit 49d206c70cacc50106dff7696dcf22ef910bde8c
@@ -5503,7 +6862,7 @@ Date:   Sun Jul 5 16:29:30 2009 -0400
 
     [build] Turn -Wall on globally (was just in libseed)
 
- configure.ac |    5 ++---
+ configure.ac | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit f74d61a0bf6db72110def769da3eca2217062e2d
@@ -5512,9 +6871,9 @@ Date:   Sun Jul 5 12:28:29 2009 -0400
 
     [mpfr] Added various special functions
 
- modules/mpfr/seed-mpfr-trig.c |  240 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    8 ++
- modules/mpfr/seed-mpfr.h      |   10 ++
+ modules/mpfr/seed-mpfr-trig.c | 240 ++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |   8 ++
+ modules/mpfr/seed-mpfr.h      |  10 ++
  3 files changed, 258 insertions(+)
 
 commit f1b1b0747ac4ac190bb004f9df448c5bf90c7469
@@ -5523,9 +6882,9 @@ Date:   Sun Jul 5 12:19:12 2009 -0400
 
     [mpfr] Added various comparison functions
 
- modules/mpfr/seed-mpfr-cmp.c |  188 ++++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c     |    7 ++
- modules/mpfr/seed-mpfr.h     |    7 ++
+ modules/mpfr/seed-mpfr-cmp.c | 188 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c     |   7 ++
+ modules/mpfr/seed-mpfr.h     |   7 ++
  3 files changed, 202 insertions(+)
 
 commit 5776376b8879038f7f18f5fd5e76b320349772b0
@@ -5534,9 +6893,9 @@ Date:   Sun Jul 5 12:08:03 2009 -0400
 
     [mpfr] Added mpfr.greater_p
 
- modules/mpfr/seed-mpfr-cmp.c |   28 ++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c     |    1 +
- modules/mpfr/seed-mpfr.h     |    2 ++
+ modules/mpfr/seed-mpfr-cmp.c | 28 ++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c     |  1 +
+ modules/mpfr/seed-mpfr.h     |  2 ++
  3 files changed, 31 insertions(+)
 
 commit cb57e058f41fb89052f94cb98a2eb15999117a70
@@ -5545,9 +6904,9 @@ Date:   Sun Jul 5 12:04:13 2009 -0400
 
     [mpfr] Added mpfr.nan_p, inf_p, number_p, zero_p
 
- modules/mpfr/seed-mpfr-cmp.c |   80 ++++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c     |    4 +++
- modules/mpfr/seed-mpfr.h     |    5 +++
+ modules/mpfr/seed-mpfr-cmp.c | 80 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c     |  4 +++
+ modules/mpfr/seed-mpfr.h     |  5 +++
  3 files changed, 89 insertions(+)
 
 commit 57bcef156892fd17be9aacc30d7cfea749610215
@@ -5556,9 +6915,9 @@ Date:   Sun Jul 5 11:58:56 2009 -0400
 
     [mpfr] Added mfpr.cmpabs
 
- modules/mpfr/seed-mpfr-cmp.c |   28 ++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c     |    1 +
- modules/mpfr/seed-mpfr.h     |    1 +
+ modules/mpfr/seed-mpfr-cmp.c | 28 ++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c     |  1 +
+ modules/mpfr/seed-mpfr.h     |  1 +
  3 files changed, 30 insertions(+)
 
 commit f0ab9ba15066f982e524b3a5954cb077ec336dff
@@ -5567,10 +6926,10 @@ Date:   Sun Jul 5 11:57:20 2009 -0400
 
     [mpfr] Added mpfr.cmp, and new file for comparsion functions
 
- modules/mpfr/Makefile.am     |    3 ++-
- modules/mpfr/seed-mpfr-cmp.c |   32 ++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c     |    1 +
- modules/mpfr/seed-mpfr.h     |    2 ++
+ modules/mpfr/Makefile.am     |  3 ++-
+ modules/mpfr/seed-mpfr-cmp.c | 32 ++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c     |  1 +
+ modules/mpfr/seed-mpfr.h     |  2 ++
  4 files changed, 37 insertions(+), 1 deletion(-)
 
 commit 76def6eb1a80f10763bd43cf080144976bb6a4ee
@@ -5579,9 +6938,9 @@ Date:   Sun Jul 5 11:51:07 2009 -0400
 
     [mpfr] Added mpfr.cbrt
 
- modules/mpfr/seed-mpfr-arithmetic.c |   30 ++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 30 ++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 32 insertions(+)
 
 commit 333c71453eb3a68a0d56f0160c82d057cc3e6ab2
@@ -5590,9 +6949,9 @@ Date:   Sun Jul 5 11:49:29 2009 -0400
 
     [mpfr] Added mpfr.rec_sqrt
 
- modules/mpfr/seed-mpfr-arithmetic.c |   30 ++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    1 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 30 ++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  1 +
  3 files changed, 32 insertions(+)
 
 commit d7784d2347a8437774e2ecd87a5f18c2539e4f35
@@ -5601,9 +6960,9 @@ Date:   Sun Jul 5 11:35:42 2009 -0400
 
     [mpfr] Added mpfr.sqrt
 
- modules/mpfr/seed-mpfr-arithmetic.c |   31 +++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c            |    1 +
- modules/mpfr/seed-mpfr.h            |    2 ++
+ modules/mpfr/seed-mpfr-arithmetic.c | 31 +++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c            |  1 +
+ modules/mpfr/seed-mpfr.h            |  2 ++
  3 files changed, 34 insertions(+)
 
 commit 2fb758ce6ba25b6d3cac349b27464bcec8a692dc
@@ -5612,7 +6971,7 @@ Date:   Sun Jul 5 11:32:22 2009 -0400
 
     [mpfr] mpfr fits functions
 
- modules/mpfr/seed-mpfr.c |  184 ++++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 184 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 184 insertions(+)
 
 commit 2136e91a86b33044ad7b09bae738398be3eda49e
@@ -5621,7 +6980,7 @@ Date:   Sun Jul 5 11:21:37 2009 -0400
 
     [mpfr] Added mpfr.get_d
 
- modules/mpfr/seed-mpfr.c |   23 +++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
 commit 55369c5f50d41093d05d04f657491c8df1ac0cdc
@@ -5630,7 +6989,7 @@ Date:   Sun Jul 5 11:17:36 2009 -0400
 
     [mpfr] Added mpfr.swap
 
- modules/mpfr/seed-mpfr.c |   27 +++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
 
 commit 3ccb5d97b96d995ea7248ad0de2919f100a1ff01
@@ -5639,7 +6998,7 @@ Date:   Sun Jul 5 11:13:51 2009 -0400
 
     [mpfr] Added mpfr.set_nan
 
- modules/mpfr/seed-mpfr.c |   16 ++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
 commit b2e3858551476c5cc4142d0dfbc514efac017131
@@ -5648,7 +7007,7 @@ Date:   Sun Jul 5 11:12:13 2009 -0400
 
     [mpfr] Added mpfr.set_inf
 
- modules/mpfr/seed-mpfr.c |   33 +++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
 commit ee44ad8fc38e04d2302340304a25d497359fa7aa
@@ -5657,9 +7016,9 @@ Date:   Sun Jul 5 02:45:50 2009 -0400
 
     [mpfr] Added asinh, acosh, atanh
 
- modules/mpfr/seed-mpfr-trig.c |   92 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    3 ++
- modules/mpfr/seed-mpfr.h      |    4 ++
+ modules/mpfr/seed-mpfr-trig.c | 92 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  3 ++
+ modules/mpfr/seed-mpfr.h      |  4 ++
  3 files changed, 99 insertions(+)
 
 commit a4d7e13b1fa4ccbd9e0396222c9a98ddadfcb933
@@ -5668,9 +7027,9 @@ Date:   Sun Jul 5 02:39:46 2009 -0400
 
     [mpfr] Added sech, csch, coth
 
- modules/mpfr/seed-mpfr-trig.c |   91 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    3 ++
- modules/mpfr/seed-mpfr.h      |    4 ++
+ modules/mpfr/seed-mpfr-trig.c | 91 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  3 ++
+ modules/mpfr/seed-mpfr.h      |  4 ++
  3 files changed, 98 insertions(+)
 
 commit 0db0b75a50f935f3472890b59583bc93b4dafcef
@@ -5679,9 +7038,9 @@ Date:   Sun Jul 5 02:34:07 2009 -0400
 
     [mpfr] Implement sinh, cosh, tanh
 
- modules/mpfr/seed-mpfr-trig.c |   92 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    3 ++
- modules/mpfr/seed-mpfr.h      |    4 ++
+ modules/mpfr/seed-mpfr-trig.c | 92 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  3 ++
+ modules/mpfr/seed-mpfr.h      |  4 ++
  3 files changed, 99 insertions(+)
 
 commit 1acdc8bb40cf8270de9c641c6b4575a13cc9d3cf
@@ -5690,9 +7049,9 @@ Date:   Sun Jul 5 02:20:45 2009 -0400
 
     [mpfr] log functions
 
- modules/mpfr/seed-mpfr-trig.c |   93 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.c      |    3 ++
- modules/mpfr/seed-mpfr.h      |    4 ++
+ modules/mpfr/seed-mpfr-trig.c | 93 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c      |  3 ++
+ modules/mpfr/seed-mpfr.h      |  4 ++
  3 files changed, 100 insertions(+)
 
 commit e0ed90d2a8b5f5720ce56926c4bb6591a97e3227
@@ -5701,7 +7060,7 @@ Date:   Sun Jul 5 02:15:18 2009 -0400
 
     [mpfr] Forgot to add functions from last commit to function list
 
- modules/mpfr/seed-mpfr.c |    8 ++++++++
+ modules/mpfr/seed-mpfr.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 24882acbee597b5bd129d3dfebb5c733bc7217c1
@@ -5710,8 +7069,8 @@ Date:   Sun Jul 5 02:12:06 2009 -0400
 
     [mpfr] Implement inverse trig functions
 
- modules/mpfr/seed-mpfr-trig.c |   91 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.h      |    4 ++
+ modules/mpfr/seed-mpfr-trig.c | 91 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.h      |  4 ++
  2 files changed, 95 insertions(+)
 
 commit f93379064725ad720b03e14b1b409edd2a5d6ddb
@@ -5720,8 +7079,8 @@ Date:   Sun Jul 5 02:05:47 2009 -0400
 
     [mpfr] Implement csc, sec, cot
 
- modules/mpfr/seed-mpfr-trig.c |   90 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.h      |    4 ++
+ modules/mpfr/seed-mpfr-trig.c | 90 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.h      |  4 ++
  2 files changed, 94 insertions(+)
 
 commit 7b1baa89cea536db733ca949099881bd759a909e
@@ -5730,8 +7089,8 @@ Date:   Sun Jul 5 01:48:44 2009 -0400
 
     [mpfr] Added mpfr.cos and mpfr.tan
 
- modules/mpfr/seed-mpfr-trig.c |   59 +++++++++++++++++++++++++++++++++++++++++
- modules/mpfr/seed-mpfr.h      |    2 ++
+ modules/mpfr/seed-mpfr-trig.c | 59 +++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.h      |  2 ++
  2 files changed, 61 insertions(+)
 
 commit a7ccaea5d7e2ae5715be36d9705c487740933361
@@ -5740,8 +7099,8 @@ Date:   Sun Jul 5 01:43:12 2009 -0400
 
     [mpfr] More fixes to the mpfr multi-file build.
 
- modules/mpfr/seed-mpfr.c |   48 ++--------------------------------------------
- modules/mpfr/seed-mpfr.h |   47 +++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr.c | 48 ++----------------------------------------------
+ modules/mpfr/seed-mpfr.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 49 insertions(+), 46 deletions(-)
 
 commit f3a901a607d1b52813e893b9022a29d1d94eca51
@@ -5750,7 +7109,7 @@ Date:   Sun Jul 5 01:36:40 2009 -0400
 
     [mpfr] Add continuation chars to makefile so we actually build all source files
 
- modules/mpfr/Makefile.am |    6 +++---
+ modules/mpfr/Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 1b4d49cbf1b05997cd7fe468c06cf78a2a90af43
@@ -5759,7 +7118,7 @@ Date:   Sun Jul 5 01:52:28 2009 -0400
 
     [modules] Change wording of argument count check
 
- modules/seed-module.h |    2 +-
+ modules/seed-module.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0a6091a19d52f12cddd41653441b121d534b1eca
@@ -5768,7 +7127,7 @@ Date:   Sun Jul 5 01:49:27 2009 -0400
 
     [modules] No more pluralization of argument count, no more asprintf
 
- modules/seed-module.h |   12 +++---------
+ modules/seed-module.h | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
 
 commit f246677a0e84531f83cc6b5c7a05954901bbc156
@@ -5777,7 +7136,7 @@ Date:   Sun Jul 5 01:17:55 2009 -0400
 
     [mpfr] Add seed-mpfr.h to extra-dist
 
- modules/mpfr/Makefile.am |    2 ++
+ modules/mpfr/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d7d77a8110245c8a083b4ab3169f2515ab989113
@@ -5786,11 +7145,11 @@ Date:   Sun Jul 5 01:12:03 2009 -0400
 
     [mpfr] Split up mpfr module into multiple files
 
- modules/mpfr/Makefile.am            |    2 +
- modules/mpfr/seed-mpfr-arithmetic.c |   66 ++++++++++++++++++++++++
- modules/mpfr/seed-mpfr-trig.c       |   36 +++++++++++++
- modules/mpfr/seed-mpfr.c            |   96 +----------------------------------
- modules/mpfr/seed-mpfr.h            |   14 +++++
+ modules/mpfr/Makefile.am            |  2 +
+ modules/mpfr/seed-mpfr-arithmetic.c | 66 +++++++++++++++++++++++++
+ modules/mpfr/seed-mpfr-trig.c       | 36 ++++++++++++++
+ modules/mpfr/seed-mpfr.c            | 96 +------------------------------------
+ modules/mpfr/seed-mpfr.h            | 14 ++++++
  5 files changed, 120 insertions(+), 94 deletions(-)
 
 commit 12925f69b95dee3b4f62922df9b4a54aa3b43aec
@@ -5799,7 +7158,7 @@ Date:   Sun Jul 5 01:14:39 2009 -0400
 
     [build] Remove INSTALL.osx from extra_dist.
 
- Makefile.am |    3 +--
+ Makefile.am | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 0cf7425ca1cb58f72635b79470de2fbcf737d62a
@@ -5808,7 +7167,7 @@ Date:   Sat Jul 4 23:39:34 2009 -0400
 
     [docs] Update doc index. Should work in-tree, not on the web (Robb: fix structure on server)
 
- doc/index.html |   10 +++++-----
+ doc/index.html | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit f6fda2bf1b40acc32b2f3a2857eb4102cdb775c4
@@ -5817,10 +7176,10 @@ Date:   Sat Jul 4 23:33:51 2009 -0400
 
     [docs] Move INSTALL.osx to docs
 
- INSTALL.osx                     |   38 ---------------------
- doc/reference/Makefile.am       |    2 +-
- doc/reference/building-osx.sgml |   70 +++++++++++++++++++++++++++++++++++++++
- doc/reference/seed-docs.sgml    |    1 +
+ INSTALL.osx                     | 38 ----------------------
+ doc/reference/Makefile.am       |  2 +-
+ doc/reference/building-osx.sgml | 70 +++++++++++++++++++++++++++++++++++++++++
+ doc/reference/seed-docs.sgml    |  1 +
  4 files changed, 72 insertions(+), 39 deletions(-)
 
 commit c9a940dc0c6fa65ea5364ade09389b109fd462ca
@@ -5829,7 +7188,7 @@ Date:   Sat Jul 4 23:17:00 2009 -0400
 
     [docs] Forgot introduction file in last commit.
 
- doc/reference/introduction.sgml |   22 ++++++++++++++++++++++
+ doc/reference/introduction.sgml | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 commit 22775e447fef732fb5af5165b3a2fea556e2666f
@@ -5838,8 +7197,8 @@ Date:   Sat Jul 4 23:16:18 2009 -0400
 
     [docs] Add introduction (from README)
 
- doc/reference/Makefile.am    |    2 +-
- doc/reference/seed-docs.sgml |    1 +
+ doc/reference/Makefile.am    | 2 +-
+ doc/reference/seed-docs.sgml | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 3aa18d4aade45c19d1a554f15ceefa8915b8b445
@@ -5848,8 +7207,8 @@ Date:   Sat Jul 4 23:12:37 2009 -0400
 
     [docs] Add building seed documentation (borrowed from glib)
 
- doc/reference/building.sgml  |  294 ++++++++++++++++++++++++++++++++++++++++++
- doc/reference/seed-docs.sgml |    2 +-
+ doc/reference/building.sgml  | 294 +++++++++++++++++++++++++++++++++++++++++++
+ doc/reference/seed-docs.sgml |   2 +-
  2 files changed, 295 insertions(+), 1 deletion(-)
 
 commit 5d47a099bb6c15efbf01187954dbecadd7d60c82
@@ -5858,12 +7217,12 @@ Date:   Sat Jul 4 21:55:52 2009 -0400
 
     [docs] Reorganize index to be more like Gtk
 
- doc/reference/seed-docs.sgml |   45 +++++++++++++++++++++---------------------
- libseed/seed-api.c           |   12 +++++++++++
- libseed/seed-closure.h       |    6 ++++++
- libseed/seed-engine.h        |    6 ++++++
- libseed/seed-exceptions.h    |    2 +-
- libseed/seed-types.h         |    4 ++--
+ doc/reference/seed-docs.sgml | 45 ++++++++++++++++++++++----------------------
+ libseed/seed-api.c           | 12 ++++++++++++
+ libseed/seed-closure.h       |  6 ++++++
+ libseed/seed-engine.h        |  6 ++++++
+ libseed/seed-exceptions.h    |  2 +-
+ libseed/seed-types.h         |  4 ++--
  6 files changed, 50 insertions(+), 25 deletions(-)
 
 commit 815831645b9a9785345d340a3f5ba84b3a01b3a1
@@ -5872,7 +7231,7 @@ Date:   Sat Jul 4 20:57:59 2009 -0400
 
     Add afp temporary files to gitignore
 
- .gitignore |    1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0fb0f93f63698a503df033b9bb5f1d993976815e
@@ -5881,17 +7240,17 @@ Date:   Sat Jul 4 17:11:23 2009 -0400
 
     [multiprocessing] For some reason, this is the only capitalized module. No longer.
 
- configure.ac                                   |    2 +-
- examples/gtkplug.js                            |    4 +-
- modules/Makefile.am                            |    2 +-
- modules/Multiprocessing/Makefile.am            |   26 ----
- modules/Multiprocessing/bi.js                  |   28 ----
- modules/Multiprocessing/fork.js                |   42 ------
- modules/Multiprocessing/seed-Multiprocessing.c |  193 ------------------------
- modules/multiprocessing/Makefile.am            |   26 ++++
- modules/multiprocessing/bi.js                  |   28 ++++
- modules/multiprocessing/fork.js                |   42 ++++++
- modules/multiprocessing/seed-multiprocessing.c |  193 ++++++++++++++++++++++++
+ configure.ac                                   |   2 +-
+ examples/gtkplug.js                            |   4 +-
+ modules/Makefile.am                            |   2 +-
+ modules/Multiprocessing/Makefile.am            |  26 ----
+ modules/Multiprocessing/bi.js                  |  28 ----
+ modules/Multiprocessing/fork.js                |  42 ------
+ modules/Multiprocessing/seed-Multiprocessing.c | 193 -------------------------
+ modules/multiprocessing/Makefile.am            |  26 ++++
+ modules/multiprocessing/bi.js                  |  28 ++++
+ modules/multiprocessing/fork.js                |  42 ++++++
+ modules/multiprocessing/seed-multiprocessing.c | 193 +++++++++++++++++++++++++
  11 files changed, 293 insertions(+), 293 deletions(-)
 
 commit a927140a4161bfb55f70744621af529945be99ee
@@ -5900,9 +7259,9 @@ Date:   Sat Jul 4 17:07:36 2009 -0400
 
     [multiprocessing] Update examples to new imports system (!)
 
- modules/Multiprocessing/bi.js                  |   10 ++++++----
- modules/Multiprocessing/fork.js                |   14 ++++++++------
- modules/Multiprocessing/seed-Multiprocessing.c |   16 +++++++++++-----
+ modules/Multiprocessing/bi.js                  | 10 ++++++----
+ modules/Multiprocessing/fork.js                | 14 ++++++++------
+ modules/Multiprocessing/seed-Multiprocessing.c | 16 +++++++++++-----
  3 files changed, 25 insertions(+), 15 deletions(-)
 
 commit 91c4679c6f9a81f12c8d6e7d352533bc4fcce69f
@@ -5911,8 +7270,8 @@ Date:   Sat Jul 4 17:00:24 2009 -0400
 
     [gtkbuilder] Port to seed-module.h (not much to do)
 
- modules/gtkbuilder/seed-gtkbuilder.c |   12 ++++++++----
- modules/seed-module.h                |    2 +-
+ modules/gtkbuilder/seed-gtkbuilder.c | 12 ++++++++----
+ modules/seed-module.h                |  2 +-
  2 files changed, 9 insertions(+), 5 deletions(-)
 
 commit 0fc6c3c40112bc3f58d0f3c1b936c849b59719ce
@@ -5921,7 +7280,7 @@ Date:   Sat Jul 4 16:44:38 2009 -0400
 
     [calculator-mpfr] Stole prefix parser from ease to make a calculator for Matt to fill in with mpfr functions
 
- examples/calculator-mpfr.js |  142 +++++++++++++++++++++++++++++++++++++++++++
+ examples/calculator-mpfr.js | 142 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 142 insertions(+)
 
 commit 8041f4719aed21ebc1066bc95cd86b601eaaf2e3
@@ -5936,20 +7295,20 @@ Date:   Sat Jul 4 16:13:30 2009 -0400
     However, if you currently have a seed checkout, you need to remove the
     .libs directory from modules/[readline,mpfr] before the problem will be solved.
 
- libseed/seed-importer.c             |    2 +-
- modules/Multiprocessing/Makefile.am |    8 ++++----
- modules/cairo/Makefile.am           |    8 ++++----
- modules/canvas/Makefile.am          |    8 ++++----
- modules/dbus/Makefile.am            |    8 ++++----
- modules/example/Makefile.am         |    6 +++---
- modules/gettext/Makefile.am         |    6 +++---
- modules/gtkbuilder/Makefile.am      |    6 +++---
- modules/libxml/Makefile.am          |    6 +++---
- modules/mpfr/Makefile.am            |    8 ++++----
- modules/os/Makefile.am              |    8 ++++----
- modules/readline/Makefile.am        |   10 +++++-----
- modules/sandbox/Makefile.am         |    6 +++---
- modules/sqlite/Makefile.am          |    8 ++++----
+ libseed/seed-importer.c             |  2 +-
+ modules/Multiprocessing/Makefile.am |  8 ++++----
+ modules/cairo/Makefile.am           |  8 ++++----
+ modules/canvas/Makefile.am          |  8 ++++----
+ modules/dbus/Makefile.am            |  8 ++++----
+ modules/example/Makefile.am         |  6 +++---
+ modules/gettext/Makefile.am         |  6 +++---
+ modules/gtkbuilder/Makefile.am      |  6 +++---
+ modules/libxml/Makefile.am          |  6 +++---
+ modules/mpfr/Makefile.am            |  8 ++++----
+ modules/os/Makefile.am              |  8 ++++----
+ modules/readline/Makefile.am        | 10 +++++-----
+ modules/sandbox/Makefile.am         |  6 +++---
+ modules/sqlite/Makefile.am          |  8 ++++----
  14 files changed, 49 insertions(+), 49 deletions(-)
 
 commit 0b7fba5a148898e7fbd22044ebfe4af5d65a31b6
@@ -5991,8 +7350,8 @@ Date:   Sat Jul 4 04:09:40 2009 -0400
 
     [readline] Port readline module to seed-module.h
 
- modules/readline/Makefile.am     |    2 +-
- modules/readline/seed-readline.c |   85 ++++++++++++++------------------------
+ modules/readline/Makefile.am     |  2 +-
+ modules/readline/seed-readline.c | 85 ++++++++++++++--------------------------
  2 files changed, 31 insertions(+), 56 deletions(-)
 
 commit aa01ea84d8ba93a2a7e8128909b947289a74a717
@@ -6001,7 +7360,7 @@ Date:   Sat Jul 4 04:03:50 2009 -0400
 
     [gettext] Forgot to put static functions on gettext ns
 
- modules/gettext/gettext.c |    3 ++-
+ modules/gettext/gettext.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit eaf23273742a500e58edb47f2fa88d38d3f150f1
@@ -6010,16 +7369,16 @@ Date:   Sat Jul 4 03:57:14 2009 -0400
 
     [modules] Include /modules in all modules so they can eventually find the header
 
- modules/Multiprocessing/Makefile.am |    1 +
- modules/cairo/Makefile.am           |    1 +
- modules/canvas/Makefile.am          |    1 +
- modules/dbus/Makefile.am            |    1 +
- modules/example/Makefile.am         |    1 +
- modules/gtkbuilder/Makefile.am      |    1 +
- modules/libxml/Makefile.am          |    1 +
- modules/os/Makefile.am              |    1 +
- modules/sandbox/Makefile.am         |    1 +
- modules/sqlite/Makefile.am          |    1 +
+ modules/Multiprocessing/Makefile.am | 1 +
+ modules/cairo/Makefile.am           | 1 +
+ modules/canvas/Makefile.am          | 1 +
+ modules/dbus/Makefile.am            | 1 +
+ modules/example/Makefile.am         | 1 +
+ modules/gtkbuilder/Makefile.am      | 1 +
+ modules/libxml/Makefile.am          | 1 +
+ modules/os/Makefile.am              | 1 +
+ modules/sandbox/Makefile.am         | 1 +
+ modules/sqlite/Makefile.am          | 1 +
  10 files changed, 10 insertions(+)
 
 commit 2fcc8a61cee0ae09d505bab260990db7a67493df
@@ -6028,9 +7387,9 @@ Date:   Sat Jul 4 03:52:42 2009 -0400
 
     [mpfr] Port mpfr module to seed-module.h
 
- modules/mpfr/Makefile.am |    1 +
- modules/mpfr/mpfr.c      |  213 ++++++++++++++++++++--------------------------
- modules/seed-module.h    |    6 +-
+ modules/mpfr/Makefile.am |   1 +
+ modules/mpfr/mpfr.c      | 213 +++++++++++++++++++++--------------------------
+ modules/seed-module.h    |   6 +-
  3 files changed, 100 insertions(+), 120 deletions(-)
 
 commit db8549329d691bde6e54f45eaf1c905bdda7a289
@@ -6039,7 +7398,7 @@ Date:   Sat Jul 4 03:39:27 2009 -0400
 
     [gettext] Use static class functions to cleanup init
 
- modules/gettext/gettext.c |   91 +++++++++++++++++----------------------------
+ modules/gettext/gettext.c | 91 ++++++++++++++++++-----------------------------
  1 file changed, 35 insertions(+), 56 deletions(-)
 
 commit 4a89fc578ed73092ec4c901374ec1a95a42dccb2
@@ -6048,8 +7407,8 @@ Date:   Sat Jul 4 03:33:26 2009 -0400
 
     [modules] Split DEFINE_ENUM_MEMBER into two parts, one which uses the enum member's C name, and one which enables the user to override the name
 
- modules/gettext/gettext.c |   28 ++++++++++++++--------------
- modules/seed-module.h     |    7 ++++++-
+ modules/gettext/gettext.c | 28 ++++++++++++++--------------
+ modules/seed-module.h     |  7 ++++++-
  2 files changed, 20 insertions(+), 15 deletions(-)
 
 commit 04c61a9c60158908c3275c43674b9ad8b450cf0f
@@ -6058,7 +7417,7 @@ Date:   Sat Jul 4 03:29:18 2009 -0400
 
     [gettext] Port gettext to DEFINE_ENUM_MEMBER
 
- modules/gettext/gettext.c |   41 +++++++++++++++--------------------------
+ modules/gettext/gettext.c | 41 +++++++++++++++--------------------------
  1 file changed, 15 insertions(+), 26 deletions(-)
 
 commit 15e99ed21d8833d0663062ae137eb59d5fb2bd3c
@@ -6067,7 +7426,7 @@ Date:   Sat Jul 4 03:28:55 2009 -0400
 
     [modules] DEFINE_ENUM_MEMBER macro
 
- modules/seed-module.h |   11 +++++++++++
+ modules/seed-module.h | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 4b6e53ca0ad55681acdf462eeed3596fac9785a6
@@ -6076,8 +7435,8 @@ Date:   Sat Jul 4 03:17:55 2009 -0400
 
     [gettext] Port gettext to new CHECK_ARG_COUNT macro
 
- modules/gettext/Makefile.am |    1 +
- modules/gettext/gettext.c   |   83 +++++++------------------------------------
+ modules/gettext/Makefile.am |  1 +
+ modules/gettext/gettext.c   | 83 +++++++--------------------------------------
  2 files changed, 13 insertions(+), 71 deletions(-)
 
 commit 614ae012babc0da5dd7d6d0474e7f9ea5d9adbec
@@ -6086,8 +7445,8 @@ Date:   Sat Jul 4 03:13:30 2009 -0400
 
     [modules] Begin seed-modules.h, filled with argument-checking macros, etc
 
- modules/Makefile.am   |    2 ++
- modules/seed-module.h |   19 +++++++++++++++++++
+ modules/Makefile.am   |  2 ++
+ modules/seed-module.h | 19 +++++++++++++++++++
  2 files changed, 21 insertions(+)
 
 commit 726d1085ef332f1458b3bc7c727c24b0fc92da8b
@@ -6096,7 +7455,7 @@ Date:   Sat Jul 4 02:40:43 2009 -0400
 
     [mpfr] mpfr set/get exp
 
- modules/mpfr/mpfr.c |   26 ++++++++++++++++++++++++++
+ modules/mpfr/mpfr.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 commit 7f2b9694fbbe839824ad07f509f714928b4b792f
@@ -6105,7 +7464,7 @@ Date:   Sat Jul 4 02:29:23 2009 -0400
 
     [mpfr] Added other mpfr constants
 
- modules/mpfr/mpfr.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/mpfr.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
 commit 6446deb35db7171957ade662337a8b01868d7e1b
@@ -6114,7 +7473,7 @@ Date:   Sat Jul 4 02:32:57 2009 -0400
 
     [docs] Add the three new seed_value functions to the reference
 
- doc/reference/seed-sections.txt |    3 +++
+ doc/reference/seed-sections.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 9a62819429d9ddf95bf06b95f19c9a1afead556e
@@ -6123,7 +7482,7 @@ Date:   Sat Jul 4 02:23:28 2009 -0400
 
     [tests] We don't care what the modules test outputs (except to stderr)
 
- tests/javascript/modules.js |    2 +-
+ tests/javascript/modules.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5efda6a612269a871c0db17974e3fc8da03ccc11
@@ -6132,7 +7491,7 @@ Date:   Sat Jul 4 02:11:51 2009 -0400
 
     [mpfr] Added mpfr.pi
 
- modules/mpfr/mpfr.c |   25 +++++++++++++++++++++++++
+ modules/mpfr/mpfr.c | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 commit d672ce7bf680c9831939a2db767df2dc5f62dc70
@@ -6141,7 +7500,7 @@ Date:   Sat Jul 4 02:03:32 2009 -0400
 
     [mpfr] Added mpfr enums and constants
 
- modules/mpfr/mpfr.c |   27 +++++++++++++++++++++++++++
+ modules/mpfr/mpfr.c | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
 
 commit e501b043ee8a9133f577e21f46a40a597fec0109
@@ -6150,7 +7509,7 @@ Date:   Sat Jul 4 01:45:27 2009 -0400
 
     [mpfr] Minor type consistency change (size_t -> gsize)
 
- modules/mpfr/mpfr.c |    6 +++---
+ modules/mpfr/mpfr.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 008d509824ea2b6c92b4a4821b1e679b1debb33f
@@ -6159,7 +7518,7 @@ Date:   Sat Jul 4 01:43:21 2009 -0400
 
     [mpfr] Fixed mistakes in use of macro
 
- modules/mpfr/mpfr.c |    8 ++++++++
+ modules/mpfr/mpfr.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit dfce47fb03b2d3d619509d82bec1871eba93c2c2
@@ -6168,7 +7527,7 @@ Date:   Sat Jul 4 01:30:26 2009 -0400
 
     [mpfr] Fixed missing type in seed_mpfr_arg_type
 
- modules/mpfr/mpfr.c |    2 ++
+ modules/mpfr/mpfr.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d9b222410e9c4d122c9d31dcbcc7b11e90cb29dd
@@ -6177,7 +7536,7 @@ Date:   Sat Jul 4 01:28:50 2009 -0400
 
     [mpfr] Switched to using macro madness for exceptions
 
- modules/mpfr/mpfr.c |  147 ++++++++++++++++++++-------------------------------
+ modules/mpfr/mpfr.c | 147 +++++++++++++++++++++-------------------------------
  1 file changed, 58 insertions(+), 89 deletions(-)
 
 commit 67a2c92cae81778de056edc01a78be7b002a359b
@@ -6186,7 +7545,7 @@ Date:   Sat Jul 4 00:56:29 2009 -0400
 
     [mpfr] Renamed class "mpfr" to "mpfr_t"
 
- modules/mpfr/mpfr.c |    4 ++--
+ modules/mpfr/mpfr.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 286e3a9905c09a8d24da65b1bda437189a8dc55a
@@ -6195,7 +7554,7 @@ Date:   Sat Jul 4 00:54:02 2009 -0400
 
     [mpfr] Added mpfr.sin
 
- modules/mpfr/mpfr.c |   41 +++++++++++++++++++++++++++++++++++++++++
+ modules/mpfr/mpfr.c | 41 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 41 insertions(+)
 
 commit b55b77184e5aa920e782d39e0aa24018c948ee76
@@ -6204,7 +7563,7 @@ Date:   Sat Jul 4 00:38:30 2009 -0400
 
     [mpfr] Redid mpfr with set constructor to be better. Don't use the init with set functions as they always use default precision
 
- modules/mpfr/mpfr.c |   90 +++++++++++++++++++++++++++------------------------
+ modules/mpfr/mpfr.c | 90 ++++++++++++++++++++++++++++-------------------------
  1 file changed, 47 insertions(+), 43 deletions(-)
 
 commit 17e76fbdcb249c64d28b5c2e68bc9066b365eb21
@@ -6213,7 +7572,7 @@ Date:   Sat Jul 4 00:16:01 2009 -0400
 
     [mpfr] Added mpfr.set function
 
- modules/mpfr/mpfr.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/mpfr/mpfr.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 55 insertions(+), 1 deletion(-)
 
 commit 7812a6eededd99df9e24e1937178be563a56e71d
@@ -6222,7 +7581,7 @@ Date:   Fri Jul 3 22:14:37 2009 -0400
 
     Add module test to check for undefined symbols and assist the coverage tool
 
- tests/javascript/modules.js |   29 +++++++++++++++++++++++++++++
+ tests/javascript/modules.js | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit 74de3a26e0e75dc8146b25d1bc7ef5bab092df85
@@ -6231,8 +7590,8 @@ Date:   Fri Jul 3 22:08:44 2009 -0400
 
     Fix profiling for modules
 
- Makefile.am  |   18 +++++++++++++-----
- configure.ac |   35 ++++++++++++++++++++---------------
+ Makefile.am  | 18 +++++++++++++-----
+ configure.ac | 35 ++++++++++++++++++++---------------
  2 files changed, 33 insertions(+), 20 deletions(-)
 
 commit 059d45c14ac1fe078d1935697e02435eb30a5883
@@ -6241,7 +7600,7 @@ Date:   Fri Jul 3 21:39:52 2009 -0400
 
     Add profiling output to gitignore
 
- .gitignore |    5 ++++-
+ .gitignore | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 887666a521731cb820439a4821e946fcef3b4005
@@ -6250,8 +7609,8 @@ Date:   Fri Jul 3 21:38:50 2009 -0400
 
     [libseed] Repair bizarre indentation in Makefile
 
- Makefile.am         |    2 +-
- libseed/Makefile.am |   20 ++++++++++----------
+ Makefile.am         |  2 +-
+ libseed/Makefile.am | 20 ++++++++++----------
  2 files changed, 11 insertions(+), 11 deletions(-)
 
 commit 62c77eb8d4dddc043cf584a2083539f63d3e83fa
@@ -6260,7 +7619,7 @@ Date:   Fri Jul 3 21:32:08 2009 -0400
 
     [gettext] On some systems, we need to explicitly include locale.h to get the LC_* consts
 
- modules/gettext/gettext.c |    1 +
+ modules/gettext/gettext.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 57018389d9926914c389e98facffffa8450a0a40
@@ -6269,7 +7628,7 @@ Date:   Fri Jul 3 13:47:52 2009 -0400
 
     [mpfr] Added mpfr.out_str()
 
- modules/mpfr/mpfr.c |   42 +++++++++++++++++++++++++++++++++++++++++-
+ modules/mpfr/mpfr.c | 42 +++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 41 insertions(+), 1 deletion(-)
 
 commit 83745245f8021add925b3a779cd630922297a2f6
@@ -6278,7 +7637,7 @@ Date:   Fri Jul 3 13:14:49 2009 -0400
 
     [mpfr] Redid mpfr_add. Not sure it should be done this way.
 
- modules/mpfr/mpfr.c |   80 +++++++++++++++++++++++++++++++++++++++++++++------
+ modules/mpfr/mpfr.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 72 insertions(+), 8 deletions(-)
 
 commit 50ebd8774fda73e4f90a7cd3708c41e1d8977ffc
@@ -6287,7 +7646,7 @@ Date:   Fri Jul 3 11:12:01 2009 -0400
 
     [mpfr] Removed seed_mpfr_init2 since real constructor replaces it.
 
- modules/mpfr/mpfr.c |   28 ----------------------------
+ modules/mpfr/mpfr.c | 28 ----------------------------
  1 file changed, 28 deletions(-)
 
 commit 35bbf203bcc3bff37aa9c4ff8576837f788b70fc
@@ -6300,8 +7659,8 @@ Date:   Fri Jul 3 04:42:19 2009 -0400
     
     We *still* have this problem.
 
- modules/mpfr/Makefile.am     |    2 +-
- modules/readline/Makefile.am |    3 +--
+ modules/mpfr/Makefile.am     | 2 +-
+ modules/readline/Makefile.am | 3 +--
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit a52f17f0a9d4b5bc6dcd2bb97218a5e4e323dcc9
@@ -6310,7 +7669,7 @@ Date:   Fri Jul 3 02:32:28 2009 -0400
 
     [mpfr] Minor fixes to mpfr module
 
- modules/mpfr/mpfr.c |   10 +++++-----
+ modules/mpfr/mpfr.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 46d3d35ab601f6ceede89cca519aba012e1b6dfd
@@ -6319,7 +7678,7 @@ Date:   Fri Jul 3 02:11:12 2009 -0400
 
     [mpfr] Added attempts at constructors for mpfr types
 
- modules/mpfr/mpfr.c |  136 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ modules/mpfr/mpfr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 133 insertions(+), 3 deletions(-)
 
 commit 7acd9008ae3d901d02a3d745ed52c8a0d0761035
@@ -6328,8 +7687,8 @@ Date:   Fri Jul 3 00:52:02 2009 -0400
 
     [libseed] Added seed_value_is_object_of_class()
 
- libseed/seed-api.c |   15 +++++++++++++++
- libseed/seed.h     |    1 +
+ libseed/seed-api.c | 15 +++++++++++++++
+ libseed/seed.h     |  1 +
  2 files changed, 16 insertions(+)
 
 commit 1c2eb6bd0f55aa47594387fad35791da96b1f287
@@ -6338,8 +7697,8 @@ Date:   Fri Jul 3 00:25:00 2009 -0400
 
     [libseed] Added seed_value_is_string() and seed_value_is_number()
 
- libseed/seed-api.c |   28 ++++++++++++++++++++++++++++
- libseed/seed.h     |    2 ++
+ libseed/seed-api.c | 28 ++++++++++++++++++++++++++++
+ libseed/seed.h     |  2 ++
  2 files changed, 30 insertions(+)
 
 commit d153da7ca50fb5ddccc34e9da135fababbb80d99
@@ -6348,7 +7707,7 @@ Date:   Thu Jul 2 22:11:26 2009 -0400
 
     [mpfr] Renamed set and get precision to prec to be consistent with mpfr
 
- modules/mpfr/mpfr.c |   20 ++++++++++----------
+ modules/mpfr/mpfr.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 commit 99ed7947d9b96333b93e628cf56da2cf29445a01
@@ -6362,8 +7721,8 @@ Date:   Thu Jul 2 23:38:17 2009 -0400
     as the libraries (and because we're not using pkg-config to find the
     libraries).
 
- modules/mpfr/Makefile.am     |    2 +-
- modules/readline/Makefile.am |    3 ++-
+ modules/mpfr/Makefile.am     | 2 +-
+ modules/readline/Makefile.am | 3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit fc5e7a3ba5709a68db75ee269a4fc95d994b1554
@@ -6372,8 +7731,8 @@ Date:   Thu Jul 2 20:09:55 2009 -0400
 
     [mpfr] Changes to the mpfr_module to make more sense
 
- modules/mpfr/Makefile.am |    2 +
- modules/mpfr/mpfr.c      |   96 +++++++++++++++++++++++++++++++++++++---------
+ modules/mpfr/Makefile.am |  2 +
+ modules/mpfr/mpfr.c      | 96 ++++++++++++++++++++++++++++++++++++++----------
  2 files changed, 79 insertions(+), 19 deletions(-)
 
 commit d3a75783ac03281c8408cd1f9037a86127f1e891
@@ -6382,7 +7741,7 @@ Date:   Thu Jul 2 17:08:10 2009 -0400
 
     [mpfr] Added test mpfr_add binding. Fixed backwards from/to seed type functions
 
- modules/mpfr/mpfr.c |   37 ++++++++++++++++++++++++++++++++++---
+ modules/mpfr/mpfr.c | 37 ++++++++++++++++++++++++++++++++++---
  1 file changed, 34 insertions(+), 3 deletions(-)
 
 commit 0c0f41d84d2ea976e51d6f135253f4f9ec43121c
@@ -6391,9 +7750,9 @@ Date:   Thu Jul 2 16:14:59 2009 -0400
 
     [mpfr] Finish integrating mpfr module into build system
 
- configure.ac             |    3 +--
- modules/mpfr/Makefile.am |    2 +-
- modules/mpfr/mpfr.c      |   10 +++-------
+ configure.ac             |  3 +--
+ modules/mpfr/Makefile.am |  2 +-
+ modules/mpfr/mpfr.c      | 10 +++-------
  3 files changed, 5 insertions(+), 10 deletions(-)
 
 commit a0616eb8785cd07a33c20ab587b5466846f3e43d
@@ -6402,15 +7761,15 @@ Date:   Thu Jul 2 15:58:26 2009 -0400
 
     [build] Stylistic updates and bug-fixes to module makefiles
 
- modules/Multiprocessing/Makefile.am |    6 +++---
- modules/cairo/Makefile.am           |    4 ++--
- modules/canvas/Makefile.am          |    4 ++--
- modules/example/Makefile.am         |    2 +-
- modules/gettext/Makefile.am         |    2 +-
- modules/libxml/Makefile.am          |    2 +-
- modules/os/Makefile.am              |   10 +++++-----
- modules/sandbox/Makefile.am         |    2 +-
- modules/sqlite/Makefile.am          |   12 ++++++------
+ modules/Multiprocessing/Makefile.am |  6 +++---
+ modules/cairo/Makefile.am           |  4 ++--
+ modules/canvas/Makefile.am          |  4 ++--
+ modules/example/Makefile.am         |  2 +-
+ modules/gettext/Makefile.am         |  2 +-
+ modules/libxml/Makefile.am          |  2 +-
+ modules/os/Makefile.am              | 10 +++++-----
+ modules/sandbox/Makefile.am         |  2 +-
+ modules/sqlite/Makefile.am          | 12 ++++++------
  9 files changed, 22 insertions(+), 22 deletions(-)
 
 commit 675321d80b0d710b3747de47ae7be573e420da97
@@ -6419,10 +7778,10 @@ Date:   Thu Jul 2 12:29:35 2009 -0400
 
     [mpfr] Start of mpfr module
 
- configure.ac             |   42 ++++++++++++++++++++++++++++++++
- modules/Makefile.am      |    2 +-
- modules/mpfr/Makefile.am |   24 +++++++++++++++++++
- modules/mpfr/mpfr.c      |   60 ++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac             | 42 +++++++++++++++++++++++++++++++++
+ modules/Makefile.am      |  2 +-
+ modules/mpfr/Makefile.am | 24 +++++++++++++++++++
+ modules/mpfr/mpfr.c      | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 127 insertions(+), 1 deletion(-)
 
 commit 70a5a5339e0282e6d93f1285e25fd1749e730f26
@@ -6431,7 +7790,7 @@ Date:   Thu Jul 2 11:57:54 2009 -0400
 
     [libseed] Added to/from type functions for short/ushort
 
- libseed/seed-types.c |   86 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-types.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 85 insertions(+), 1 deletion(-)
 
 commit 2946295d9e5fd7e1f200c04897a6341a129731e6
@@ -6440,7 +7799,7 @@ Date:   Thu Jul 2 11:05:50 2009 -0400
 
     [gettext] Various bits of code cleanup
 
- modules/gettext/gettext.c |   84 ++++++++++++++++++++++-----------------------
+ modules/gettext/gettext.c | 84 +++++++++++++++++++++++------------------------
  1 file changed, 42 insertions(+), 42 deletions(-)
 
 commit 6322cd3f3767d3c1c2a40ff7f1e288978d9f6e50
@@ -6453,7 +7812,7 @@ Date:   Thu Jul 2 11:01:58 2009 -0400
     gettext (they're in the stdclib), but that's where they logically
     fit for the time being.
 
- modules/gettext/gettext.c |   28 ++++++++++++++++++++++++++++
+ modules/gettext/gettext.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 commit 2a96d5fc390899e4bad0401fa6aed4c30938ad44
@@ -6462,7 +7821,7 @@ Date:   Thu Jul 2 05:07:38 2009 -0400
 
     [clutter-pad] Update spring example to recent Clutter API changes
 
- examples/clutter-pad/examples/spring.js |    2 --
+ examples/clutter-pad/examples/spring.js | 2 --
  1 file changed, 2 deletions(-)
 
 commit f6dd1bc8902254444c4a9e0a5729f043bf26dca8
@@ -6471,7 +7830,7 @@ Date:   Thu Jul 2 04:55:28 2009 -0400
 
     [gettext] Matt made up some functions, and build failed to warn about them (?)
 
- modules/gettext/gettext.c |   10 +++++-----
+ modules/gettext/gettext.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 9bf91d0ebefa62815aa116f821610539c6eb4b61
@@ -6480,7 +7839,7 @@ Date:   Thu Jul 2 04:50:35 2009 -0400
 
     [tests] Update everything.js to match g-i changes
 
- tests/javascript/everything.js |    2 +-
+ tests/javascript/everything.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 462e6de4a157adb27d319b8c95ed141945c2f64e
@@ -6489,7 +7848,7 @@ Date:   Thu Jul 2 04:16:19 2009 -0400
 
     [build] Matt lost some quotes in make-functions.js earlier
 
- doc/modules/make-functions.js |    2 +-
+ doc/modules/make-functions.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6603afe7d8ea933484e5b15dd4f5cba677ac2804
@@ -6498,7 +7857,7 @@ Date:   Thu Jul 2 04:11:24 2009 -0400
 
     [build] Distribute Seed extension script as Seed.js.in
 
- extensions/Makefile.am |    2 +-
+ extensions/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3683483d9a9b0cc0d909926361a52fa757128ce1
@@ -6507,7 +7866,7 @@ Date:   Thu Jul 2 03:20:49 2009 -0400
 
     Add all sorts of stuff to .gitignore
 
- .gitignore |   34 +++++++++++++++++++++++++++++++++-
+ .gitignore | 34 +++++++++++++++++++++++++++++++++-
  1 file changed, 33 insertions(+), 1 deletion(-)
 
 commit 9d1f826b05856ca8e3f7a3b9e7d4883a3d059502
@@ -6516,7 +7875,7 @@ Date:   Thu Jul 2 02:57:02 2009 -0400
 
     [gettext] Fix up various indentation problems in gettext module
 
- modules/gettext/gettext.c |  161 +++++++++++++++++++++++----------------------
+ modules/gettext/gettext.c | 161 +++++++++++++++++++++++-----------------------
  1 file changed, 82 insertions(+), 79 deletions(-)
 
 commit e01e9cdfd6fe51b4631b653de0ad278eb367e78e
@@ -6525,7 +7884,7 @@ Date:   Thu Jul 2 02:42:33 2009 -0400
 
     [gettext] Bind the remainder of the gettext functions
 
- modules/gettext/gettext.c |  312 ++++++++++++++++++++++++++++++++++++++++++---
+ modules/gettext/gettext.c | 312 +++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 297 insertions(+), 15 deletions(-)
 
 commit a18b603ca8c82e0d4da7e9c7037f4d8fba4f249f
@@ -6534,7 +7893,7 @@ Date:   Thu Jul 2 00:32:14 2009 -0400
 
     [gettext] Add textdomain binding, rename i18n->gettext for consistency
 
- modules/gettext/gettext.c |   51 ++++++++++++++++++++++++++++++++++-----------
+ modules/gettext/gettext.c | 51 ++++++++++++++++++++++++++++++++++++-----------
  1 file changed, 39 insertions(+), 12 deletions(-)
 
 commit 37bb655d4baa753f863a819a67a4dd99f778515f
@@ -6543,7 +7902,7 @@ Date:   Wed Jul 1 11:10:59 2009 -0400
 
     [build] Use print instead of Seed.printf during doc build, as it doesn't depend on an installed version of seed
 
- doc/modules/make-functions.js |   24 ++++++++++++------------
+ doc/modules/make-functions.js | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit b3a3479cfd299097371eb7c451e4d4303e0b3910
@@ -6552,73 +7911,73 @@ Date:   Wed Jul 1 10:49:09 2009 -0400
 
     Remove trailing whitespace all throughout examples/libseed, as it infuriates Git.
 
- examples/HACKING                                   |    4 +-
- examples/actions.js                                |    4 +-
- examples/async-quine.js                            |    4 +-
- examples/cairo.js                                  |    8 +-
- examples/calculator.js                             |    2 +-
- examples/clutter-0.9.js                            |   30 +-
- examples/clutter-cogl-0.8.js                       |   30 +-
- examples/clutter-cogl-0.9.js                       |   30 +-
- examples/n-oscillator.js                           |   26 +-
- examples/pango-fontset.js                          |    4 +-
- examples/pango.js                                  |  134 ++++----
- libseed/seed-api.c                                 |   80 ++---
- libseed/seed-builtins.c                            |   99 +++---
- libseed/seed-builtins.h                            |   20 +-
- libseed/seed-closure.c                             |   50 +--
- libseed/seed-closure.h                             |   22 +-
- libseed/seed-debug.h                               |   20 +-
- libseed/seed-engine.c                              |   82 ++---
- libseed/seed-engine.h                              |   22 +-
- libseed/seed-exceptions.c                          |   24 +-
- libseed/seed-exceptions.h                          |   22 +-
- libseed/seed-gtype.c                               |  106 +++---
- libseed/seed-gtype.h                               |   20 +-
- libseed/seed-importer.c                            |  256 +++++++-------
- libseed/seed-private.h                             |   20 +-
- libseed/seed-signals.c                             |   50 +--
- libseed/seed-signals.h                             |   22 +-
- libseed/seed-structs.c                             |   18 +-
- libseed/seed-structs.h                             |   20 +-
- libseed/seed-types.c                               |   86 ++---
- libseed/seed-types.h                               |   20 +-
- libseed/seed.h                                     |   38 +--
- modules/Multiprocessing/bi.js                      |    2 +-
- modules/Multiprocessing/fork.js                    |    4 +-
- modules/Multiprocessing/multi.c                    |    2 +-
- modules/cairo/seed-cairo-enums.c                   |   10 +-
- modules/cairo/seed-cairo-image-surface.c           |   18 +-
- modules/cairo/seed-cairo-matrix.c                  |   88 ++---
- modules/cairo/seed-cairo-matrix.h                  |    4 +-
- modules/cairo/seed-cairo-pattern.c                 |   34 +-
- modules/cairo/seed-cairo-pdf-surface.c             |   24 +-
- modules/cairo/seed-cairo-surface.c                 |   48 +--
- modules/cairo/seed-cairo.c                         |  358 ++++++++++----------
- modules/canvas/seed-canvas.c                       |   72 ++--
- modules/dbus/dbus-exports.c                        |  106 +++---
- modules/dbus/dbus-values.c                         |   54 +--
- modules/dbus/module.c                              |   52 +--
- modules/gettext/gettext.c                          |   12 +-
- modules/gtkbuilder/gtkbuilder.c                    |   14 +-
- modules/libxml/libxml.c                            |   68 ++--
- modules/os/os.c                                    |  242 ++++++-------
- modules/readline/seed-readline.c                   |   16 +-
- modules/sandbox/sandbox.c                          |   30 +-
- modules/sqlite/seed-sqlite.c                       |    4 +-
- src/main.c                                         |    4 +-
- tests/c/api-types.c                                |    4 +-
- tests/javascript/enum.js                           |    2 +-
- tests/javascript/gdk-event.js                      |    2 +-
- .../gtypes/gtype-class-init-exception.js           |    2 +-
- tests/javascript/gtypes/gtype-extraprop.js         |    2 +-
- tests/javascript/gtypes/gtype-self.js              |    2 +-
- tests/javascript/gtypes/gtype.js                   |    2 +-
- tests/javascript/introspect.js                     |    2 +-
- tests/javascript/json.js                           |    2 +-
- tests/javascript/type-conversion.js                |    2 +-
- tests/make-test.py                                 |    2 +-
- tests/run-tests.py                                 |   10 +-
+ examples/HACKING                                   |   4 +-
+ examples/actions.js                                |   4 +-
+ examples/async-quine.js                            |   4 +-
+ examples/cairo.js                                  |   8 +-
+ examples/calculator.js                             |   2 +-
+ examples/clutter-0.9.js                            |  30 +-
+ examples/clutter-cogl-0.8.js                       |  30 +-
+ examples/clutter-cogl-0.9.js                       |  30 +-
+ examples/n-oscillator.js                           |  26 +-
+ examples/pango-fontset.js                          |   4 +-
+ examples/pango.js                                  | 134 ++++----
+ libseed/seed-api.c                                 |  80 ++---
+ libseed/seed-builtins.c                            |  99 +++---
+ libseed/seed-builtins.h                            |  20 +-
+ libseed/seed-closure.c                             |  50 +--
+ libseed/seed-closure.h                             |  22 +-
+ libseed/seed-debug.h                               |  20 +-
+ libseed/seed-engine.c                              |  82 ++---
+ libseed/seed-engine.h                              |  22 +-
+ libseed/seed-exceptions.c                          |  24 +-
+ libseed/seed-exceptions.h                          |  22 +-
+ libseed/seed-gtype.c                               | 106 +++---
+ libseed/seed-gtype.h                               |  20 +-
+ libseed/seed-importer.c                            | 256 +++++++--------
+ libseed/seed-private.h                             |  20 +-
+ libseed/seed-signals.c                             |  50 +--
+ libseed/seed-signals.h                             |  22 +-
+ libseed/seed-structs.c                             |  18 +-
+ libseed/seed-structs.h                             |  20 +-
+ libseed/seed-types.c                               |  86 ++---
+ libseed/seed-types.h                               |  20 +-
+ libseed/seed.h                                     |  38 +--
+ modules/Multiprocessing/bi.js                      |   2 +-
+ modules/Multiprocessing/fork.js                    |   4 +-
+ modules/Multiprocessing/multi.c                    |   2 +-
+ modules/cairo/seed-cairo-enums.c                   |  10 +-
+ modules/cairo/seed-cairo-image-surface.c           |  18 +-
+ modules/cairo/seed-cairo-matrix.c                  |  88 ++---
+ modules/cairo/seed-cairo-matrix.h                  |   4 +-
+ modules/cairo/seed-cairo-pattern.c                 |  34 +-
+ modules/cairo/seed-cairo-pdf-surface.c             |  24 +-
+ modules/cairo/seed-cairo-surface.c                 |  48 +--
+ modules/cairo/seed-cairo.c                         | 358 ++++++++++-----------
+ modules/canvas/seed-canvas.c                       |  72 ++---
+ modules/dbus/dbus-exports.c                        | 106 +++---
+ modules/dbus/dbus-values.c                         |  54 ++--
+ modules/dbus/module.c                              |  52 +--
+ modules/gettext/gettext.c                          |  12 +-
+ modules/gtkbuilder/gtkbuilder.c                    |  14 +-
+ modules/libxml/libxml.c                            |  68 ++--
+ modules/os/os.c                                    | 242 +++++++-------
+ modules/readline/seed-readline.c                   |  16 +-
+ modules/sandbox/sandbox.c                          |  30 +-
+ modules/sqlite/seed-sqlite.c                       |   4 +-
+ src/main.c                                         |   4 +-
+ tests/c/api-types.c                                |   4 +-
+ tests/javascript/enum.js                           |   2 +-
+ tests/javascript/gdk-event.js                      |   2 +-
+ .../gtypes/gtype-class-init-exception.js           |   2 +-
+ tests/javascript/gtypes/gtype-extraprop.js         |   2 +-
+ tests/javascript/gtypes/gtype-self.js              |   2 +-
+ tests/javascript/gtypes/gtype.js                   |   2 +-
+ tests/javascript/introspect.js                     |   2 +-
+ tests/javascript/json.js                           |   2 +-
+ tests/javascript/type-conversion.js                |   2 +-
+ tests/make-test.py                                 |   2 +-
+ tests/run-tests.py                                 |  10 +-
  67 files changed, 1347 insertions(+), 1326 deletions(-)
 
 commit 536c0bfa32413cbe323cb5c9d95bc98ea53d9c97
@@ -6627,14 +7986,14 @@ Date:   Wed Jul 1 04:03:26 2009 -0400
 
     [examples] Use implicitly created Clutter stage; fixes Clutter examples on platforms without multistage support
 
- examples/clutter-0.8.js              |    2 +-
- examples/clutter-0.9.js              |    2 +-
- examples/clutter-cairo.js            |    2 +-
- examples/clutter-cogl-0.8.js         |    2 +-
- examples/clutter-cogl-0.9.js         |    2 +-
- examples/clutter-transitions/main.js |    2 +-
- examples/opengl/triangle-actor.js    |    2 +-
- examples/pong/pong.js                |    2 +-
+ examples/clutter-0.8.js              | 2 +-
+ examples/clutter-0.9.js              | 2 +-
+ examples/clutter-cairo.js            | 2 +-
+ examples/clutter-cogl-0.8.js         | 2 +-
+ examples/clutter-cogl-0.9.js         | 2 +-
+ examples/clutter-transitions/main.js | 2 +-
+ examples/opengl/triangle-actor.js    | 2 +-
+ examples/pong/pong.js                | 2 +-
  8 files changed, 8 insertions(+), 8 deletions(-)
 
 commit d3002bd3e9809f25838f1fa1822afa1db70209c1
@@ -6643,8 +8002,8 @@ Date:   Mon Jun 29 03:25:57 2009 -0400
 
     Remove various import_namespace calls that have been hanging around.
 
- extensions/Seed.js.in |    6 +++---
- tools/run-lint.js     |    2 +-
+ extensions/Seed.js.in | 6 +++---
+ tools/run-lint.js     | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 36800fa11648026654c18ff9e38e023ad870967d
@@ -6653,7 +8012,7 @@ Date:   Fri Jun 26 17:31:44 2009 -0400
 
     [libseed] When importing, search "." _last_
 
- extensions/Seed.js.in |    7 ++++---
+ extensions/Seed.js.in | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit f4591162662e0671a92e240fbe2c283faa493c34
@@ -6662,7 +8021,7 @@ Date:   Fri Jun 26 17:12:21 2009 -0400
 
     [examples] Also forgot to remove same from Makefile.am. Apparently I've lost my mind...
 
- examples/Makefile.am |    1 -
+ examples/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 commit 4f7cacb99cd0b12ef1cf3f78f17ee3f3130dbda8
@@ -6671,7 +8030,7 @@ Date:   Fri Jun 26 17:09:07 2009 -0400
 
     [examples] Forgot to remove same from configure.ac in last commit
 
- configure.ac |    1 -
+ configure.ac | 1 -
  1 file changed, 1 deletion(-)
 
 commit 39a587147b7835bc31309ee1215f8767fd80738d
@@ -6681,20 +8040,20 @@ Date:   Fri Jun 26 17:03:57 2009 -0400
     [examples] Same Seed (now, for a time, same-gnome-clutter) now lives in
     the gsoc-seed-games branch of gnome-games.
 
- doc/index.html                  |    1 -
- examples/HACKING                |    5 +-
- examples/same-seed/Makefile.am  |   29 ----
- examples/same-seed/bkg.svg      |   95 -----------
- examples/same-seed/blue.svg     |   97 -----------
- examples/same-seed/board.js     |  338 ---------------------------------------
- examples/same-seed/green.svg    |   97 -----------
- examples/same-seed/light.js     |  122 --------------
- examples/same-seed/main.js      |   48 ------
- examples/same-seed/red.svg      |   97 -----------
- examples/same-seed/same-seed.ui |   72 ---------
- examples/same-seed/same.c       |  296 ----------------------------------
- examples/same-seed/score.js     |   79 ---------
- examples/same-seed/yellow.svg   |   97 -----------
+ doc/index.html                  |   1 -
+ examples/HACKING                |   5 +-
+ examples/same-seed/Makefile.am  |  29 ----
+ examples/same-seed/bkg.svg      |  95 -----------
+ examples/same-seed/blue.svg     |  97 ------------
+ examples/same-seed/board.js     | 338 ----------------------------------------
+ examples/same-seed/green.svg    |  97 ------------
+ examples/same-seed/light.js     | 122 ---------------
+ examples/same-seed/main.js      |  48 ------
+ examples/same-seed/red.svg      |  97 ------------
+ examples/same-seed/same-seed.ui |  72 ---------
+ examples/same-seed/same.c       | 296 -----------------------------------
+ examples/same-seed/score.js     |  79 ----------
+ examples/same-seed/yellow.svg   |  97 ------------
  14 files changed, 3 insertions(+), 1470 deletions(-)
 
 commit 950cccdefb33aef4b5ba2cfd928d7a0f0394d4d8
@@ -6706,10 +8065,10 @@ Date:   Wed Jun 24 18:13:17 2009 -0400
     This seems like a strange place for this to go, but I can't find
     any other way to access gettext strings.
 
- configure.ac                |   10 +++++++++
- modules/Makefile.am         |    2 +-
- modules/gettext/Makefile.am |   24 ++++++++++++++++++++
- modules/gettext/gettext.c   |   52 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac                | 10 +++++++++
+ modules/Makefile.am         |  2 +-
+ modules/gettext/Makefile.am | 24 +++++++++++++++++++++
+ modules/gettext/gettext.c   | 52 +++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 87 insertions(+), 1 deletion(-)
 
 commit ca16639cc269e1075dcb485a5c33f87bc8ea5e12
@@ -6718,7 +8077,7 @@ Date:   Wed Jun 24 02:12:01 2009 -0400
 
     [patches] Clutter animatev patch and gobject-introspection patches landed upstream
 
- patches/clutter-animatev-annotation.patch |   22 ----------------------
+ patches/clutter-animatev-annotation.patch | 22 ----------------------
  1 file changed, 22 deletions(-)
 
 commit 6acb6c0a7f4c1ad730bbe0c289b2dc586eec2ba3
@@ -6727,7 +8086,7 @@ Date:   Tue Jun 23 04:20:33 2009 -0400
 
     [extensions] Include the path of the executed script in the default search path
 
- extensions/Seed.js.in |   21 ++++++++++++++++++---
+ extensions/Seed.js.in | 21 ++++++++++++++++++---
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 commit 84c119ae565650740358b08dc8fe7d2c8faca837
@@ -6736,10 +8095,10 @@ Date:   Fri Jun 19 22:55:51 2009 -0400
 
     [build] Update to more recent shave
 
- configure.ac             |    2 +-
- m4/shave.m4              |  118 +++++++++++++++++++++++++++++++++++-----------
- scripts/shave-libtool.in |   46 ++++++++++++++++--
- scripts/shave.in         |   37 ++++++++++++++-
+ configure.ac             |   2 +-
+ m4/shave.m4              | 118 ++++++++++++++++++++++++++++++++++++-----------
+ scripts/shave-libtool.in |  46 ++++++++++++++++--
+ scripts/shave.in         |  37 ++++++++++++++-
  4 files changed, 169 insertions(+), 34 deletions(-)
 
 commit e6728b422f97eae1b8154cee6bbfc55055b7013c
@@ -6748,8 +8107,8 @@ Date:   Fri Jun 19 22:40:01 2009 -0400
 
     [dbus] Fix two small (stylistic) warnings in DBUS extension module
 
- modules/dbus/dbus-exports.c |    2 +-
- modules/dbus/util/dbus.c    |    2 +-
+ modules/dbus/dbus-exports.c | 2 +-
+ modules/dbus/util/dbus.c    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 823f39f8cde2fba97540826f73a95cd89324b79a
@@ -6758,12 +8117,12 @@ Date:   Fri Jun 19 22:25:11 2009 -0400
 
     [docs] Fix a large number of the GtkDoc warnings we get on build
 
- doc/reference/Makefile.am       |    2 +-
- doc/reference/seed-docs.sgml    |    4 ++--
- doc/reference/seed-sections.txt |    9 +++++++--
- libseed/seed-exceptions.c       |    2 +-
- libseed/seed.h                  |    4 +++-
- m4/libtool.m4                   |    3 ---
+ doc/reference/Makefile.am       | 2 +-
+ doc/reference/seed-docs.sgml    | 4 ++--
+ doc/reference/seed-sections.txt | 9 +++++++--
+ libseed/seed-exceptions.c       | 2 +-
+ libseed/seed.h                  | 4 +++-
+ m4/libtool.m4                   | 3 ---
  6 files changed, 14 insertions(+), 10 deletions(-)
 
 commit 551c9202b327267efb9f72e08e148faa85a06280
@@ -6772,7 +8131,7 @@ Date:   Fri Jun 19 22:00:12 2009 -0400
 
     [same-seed] Implement animation in C (testing) port
 
- examples/same-seed/same.c |   75 ++++++++++++++++++++++++++++++++++++++++++---
+ examples/same-seed/same.c | 75 +++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 70 insertions(+), 5 deletions(-)
 
 commit a0c3b943d2b8ccb7c07a45b3852d50e7329afc2c
@@ -6781,7 +8140,7 @@ Date:   Thu Jun 18 19:05:49 2009 -0400
 
     Add patch to add "out" annotation to gtk_tree_model_get_value
 
- patches/gir-repo-gtktreemodel-get-value.patch |   30 +++++++++++++++++++++++++
+ patches/gir-repo-gtktreemodel-get-value.patch | 30 +++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
 
 commit 94a37cadc4d209948fef5d7799c1db31f8903687
@@ -6790,7 +8149,7 @@ Date:   Thu Jun 18 02:52:18 2009 -0400
 
     [same-seed] Preliminary C version, mostly for debugging purposes.
 
- examples/same-seed/same.c |  231 +++++++++++++++++++++++++++++++++++++++++++++
+ examples/same-seed/same.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 231 insertions(+)
 
 commit 7a908d8694450a56bffaea2dfc0b5389b3e6bb79
@@ -6799,7 +8158,7 @@ Date:   Mon Jun 15 21:03:18 2009 -0400
 
     This patch landed upstream (in an expanded fashion).
 
- patches/clutter-animatev-caching.patch |   90 --------------------------------
+ patches/clutter-animatev-caching.patch | 90 ----------------------------------
  1 file changed, 90 deletions(-)
 
 commit a0298a4f36e7fd1799592fc436ba5c40361c17ed
@@ -6812,8 +8171,8 @@ Date:   Sun Jun 14 14:21:33 2009 -0400
     as I'm almost to the point where I'm going to move this into the gnome-games
     repository, and take a good hard look at the various bugs...
 
- examples/same-seed/board.js |    5 +++--
- examples/same-seed/light.js |   14 +++++++++-----
+ examples/same-seed/board.js |  5 +++--
+ examples/same-seed/light.js | 14 +++++++++-----
  2 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 22ec7bb209d838b5bdd8a8742b7d83f9c0877167
@@ -6822,7 +8181,7 @@ Date:   Sun Jun 14 13:54:42 2009 -0400
 
     [clutter-cogl] Update 0.9 version of the example to match the fact that the COGL introspection data is now separate from that of Clutter
 
- examples/clutter-cogl-0.9.js |   21 +++++++++++----------
+ examples/clutter-cogl-0.9.js | 21 +++++++++++----------
  1 file changed, 11 insertions(+), 10 deletions(-)
 
 commit b951c6023bb2898dfddf877b8d0d61822ee94e76
@@ -6831,7 +8190,7 @@ Date:   Fri Jun 12 18:43:34 2009 -0400
 
     Update spring example to recent clutter API changes.
 
- examples/clutter-pad/examples/spring.js |    3 ++-
+ examples/clutter-pad/examples/spring.js | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 646f2c8878ee436644c457f444ecea3754fb6765
@@ -6840,7 +8199,7 @@ Date:   Fri Jun 5 19:25:20 2009 -0400
 
     New patch against clutter; removes some caching, a silly way to fix bug 1631
 
- patches/clutter-animatev-caching.patch |   90 ++++++++++++++++++++++++++++++++
+ patches/clutter-animatev-caching.patch | 90 ++++++++++++++++++++++++++++++++++
  1 file changed, 90 insertions(+)
 
 commit 87220e8e64ad3804ceb8b2a69ca760505c1131c2
@@ -6849,7 +8208,7 @@ Date:   Wed Jun 3 21:32:17 2009 -0400
 
     Extensions: Don't recreate the importer search path unless it doesn't exist or is empty.
 
- extensions/Seed.js.in |    3 ++-
+ extensions/Seed.js.in | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b6b6402f8b0977d9fb237d6a114195f3d8f1463f
@@ -6860,12 +8219,12 @@ Date:   Wed Jun 3 20:44:49 2009 -0400
     
     This reverts commit d6de7e0060d6ae2eda59a52ca029af0114951e31.
 
- configure.ac                             |    1 -
- tests/javascript/Makefile.am             |    3 +--
- tests/javascript/importer-search-path.js |    7 -------
- tests/javascript/searchpath/Makefile.am  |    1 -
- tests/javascript/searchpath/a.js         |    9 ---------
- tests/javascript/searchpath/b.js         |    8 --------
+ configure.ac                             | 1 -
+ tests/javascript/Makefile.am             | 3 +--
+ tests/javascript/importer-search-path.js | 7 -------
+ tests/javascript/searchpath/Makefile.am  | 1 -
+ tests/javascript/searchpath/a.js         | 9 ---------
+ tests/javascript/searchpath/b.js         | 8 --------
  6 files changed, 1 insertion(+), 28 deletions(-)
 
 commit d6de7e0060d6ae2eda59a52ca029af0114951e31
@@ -6895,12 +8254,12 @@ Date:   Wed Jun 3 20:39:17 2009 -0400
     
     note that the print statement is never run... but if you don't import Clutter in both of them, it doesn't break.
 
- configure.ac                             |    1 +
- tests/javascript/Makefile.am             |    3 ++-
- tests/javascript/importer-search-path.js |    7 +++++++
- tests/javascript/searchpath/Makefile.am  |    1 +
- tests/javascript/searchpath/a.js         |    9 +++++++++
- tests/javascript/searchpath/b.js         |    8 ++++++++
+ configure.ac                             | 1 +
+ tests/javascript/Makefile.am             | 3 ++-
+ tests/javascript/importer-search-path.js | 7 +++++++
+ tests/javascript/searchpath/Makefile.am  | 1 +
+ tests/javascript/searchpath/a.js         | 9 +++++++++
+ tests/javascript/searchpath/b.js         | 8 ++++++++
  6 files changed, 28 insertions(+), 1 deletion(-)
 
 commit a206010b423b3d335df7c73192aad7275a0bbab3
@@ -6909,7 +8268,7 @@ Date:   Wed Jun 3 01:34:30 2009 -0400
 
     Partially update README (we use Git, we need gnome-js-common, etc.)
 
- README |    5 +++--
+ README | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 0239b5004084565cedc22cf460c2f65021dba3a5
@@ -6918,7 +8277,7 @@ Date:   Sat May 30 18:44:04 2009 -0400
 
     dont install threaded repl twice
 
- examples/Makefile.am |    1 -
+ examples/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 commit 3bd3b2282d860ff29c8c75839d0adf97c1770eea
@@ -6927,7 +8286,7 @@ Date:   Fri May 29 10:13:09 2009 -0400
 
     Update object-info test to latest introspection changes.
 
- tests/javascript/object-info.js |    4 +++-
+ tests/javascript/object-info.js | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 609b2428af638a89636b60eb640ddfd498556659
@@ -6936,8 +8295,8 @@ Date:   Fri May 29 05:57:34 2009 -0400
 
     libseed: Fix struct-union-enumerate test
 
- libseed/seed-importer.c                            |   19 +++++++++++++++++--
- tests/javascript/structs/struct-union-enumerate.js |    2 +-
+ libseed/seed-importer.c                            | 19 +++++++++++++++++--
+ tests/javascript/structs/struct-union-enumerate.js |  2 +-
  2 files changed, 18 insertions(+), 3 deletions(-)
 
 commit d75e22e723ce94f901295bd6edb54a65b9f9219e
@@ -6946,7 +8305,7 @@ Date:   Fri May 29 05:38:17 2009 -0400
 
     examples: Cleanup actions example
 
- examples/actions.js |   62 +++++++++++++++++++++------------------------------
+ examples/actions.js | 62 ++++++++++++++++++++++-------------------------------
  1 file changed, 26 insertions(+), 36 deletions(-)
 
 commit db8c640fef0dc29d6ce2dac4519101264d91fd6a
@@ -6955,10 +8314,10 @@ Date:   Fri May 29 09:40:21 2009 -0400
 
     More build fixes
 
- doc/modules/gtkbuilder/Makefile.am |    4 ++--
- doc/modules/readline/Makefile.am   |    4 ++--
- doc/modules/sandbox/Makefile.am    |    4 ++--
- doc/modules/sqlite/Makefile.am     |    4 ++--
+ doc/modules/gtkbuilder/Makefile.am | 4 ++--
+ doc/modules/readline/Makefile.am   | 4 ++--
+ doc/modules/sandbox/Makefile.am    | 4 ++--
+ doc/modules/sqlite/Makefile.am     | 4 ++--
  4 files changed, 8 insertions(+), 8 deletions(-)
 
 commit 4323ba6f7a793bce156a4e5bb395414ac526ddfa
@@ -6967,7 +8326,7 @@ Date:   Fri May 29 09:34:18 2009 -0400
 
     Fix more relative paths.
 
- doc/reference/Makefile.am |    4 ++--
+ doc/reference/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 78631a0ec9e53c3beaf919c08e5bdec8a2f0a6f5
@@ -6976,7 +8335,7 @@ Date:   Fri May 29 05:30:30 2009 -0400
 
     Fix printf in tests
 
- tests/javascript/printf.js |   12 ++++++------
+ tests/javascript/printf.js | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit eb2e927bdbbcbc18e161cae0346c67e5300d8141
@@ -6985,9 +8344,9 @@ Date:   Fri May 29 05:13:35 2009 -0400
 
     libseed: Propogate the GIArgInfo through the native closure privates
 
- libseed/seed-closure.c |    6 +++++-
- libseed/seed-closure.h |    2 ++
- libseed/seed-types.c   |    1 +
+ libseed/seed-closure.c | 6 +++++-
+ libseed/seed-closure.h | 2 ++
+ libseed/seed-types.c   | 1 +
  3 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 98f826b22fdc83cc72118c74497fb9989330e779
@@ -6996,11 +8355,11 @@ Date:   Fri May 29 05:08:07 2009 -0400
 
     libseed: Propogate the GIArgInfo in to seed_gi_make_argument
 
- libseed/seed-closure.c |    2 +-
- libseed/seed-engine.c  |    2 +-
- libseed/seed-structs.c |    6 +++---
- libseed/seed-types.c   |    4 +++-
- libseed/seed-types.h   |    1 +
+ libseed/seed-closure.c | 2 +-
+ libseed/seed-engine.c  | 2 +-
+ libseed/seed-structs.c | 6 +++---
+ libseed/seed-types.c   | 4 +++-
+ libseed/seed-types.h   | 1 +
  5 files changed, 9 insertions(+), 6 deletions(-)
 
 commit 783ee52a18d26f9184a56c1c3463d1cf830fe264
@@ -7009,10 +8368,10 @@ Date:   Fri May 29 09:27:07 2009 -0400
 
     Build: oops; last commit should have used srcdir, not builddir.
 
- doc/modules/gtkbuilder/Makefile.am |    2 +-
- doc/modules/readline/Makefile.am   |    2 +-
- doc/modules/sandbox/Makefile.am    |    2 +-
- doc/modules/sqlite/Makefile.am     |    2 +-
+ doc/modules/gtkbuilder/Makefile.am | 2 +-
+ doc/modules/readline/Makefile.am   | 2 +-
+ doc/modules/sandbox/Makefile.am    | 2 +-
+ doc/modules/sqlite/Makefile.am     | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit d70dd092b8975a3c699a4a676cabf924534b60a3
@@ -7021,10 +8380,10 @@ Date:   Fri May 29 09:23:22 2009 -0400
 
     Build: don't refer to files relatively; fixes build-in-different-dir.
 
- doc/modules/gtkbuilder/Makefile.am |    2 +-
- doc/modules/readline/Makefile.am   |    2 +-
- doc/modules/sandbox/Makefile.am    |    2 +-
- doc/modules/sqlite/Makefile.am     |    2 +-
+ doc/modules/gtkbuilder/Makefile.am | 2 +-
+ doc/modules/readline/Makefile.am   | 2 +-
+ doc/modules/sandbox/Makefile.am    | 2 +-
+ doc/modules/sqlite/Makefile.am     | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 827b88c830283774eeea18aede40f65252c34da8
@@ -7033,10 +8392,10 @@ Date:   Fri May 29 09:14:28 2009 -0400
 
     Build: don't write into the build-from dir, write into build-to.
 
- doc/modules/gtkbuilder/Makefile.am |    2 +-
- doc/modules/readline/Makefile.am   |    2 +-
- doc/modules/sandbox/Makefile.am    |    2 +-
- doc/modules/sqlite/Makefile.am     |    2 +-
+ doc/modules/gtkbuilder/Makefile.am | 2 +-
+ doc/modules/readline/Makefile.am   | 2 +-
+ doc/modules/sandbox/Makefile.am    | 2 +-
+ doc/modules/sqlite/Makefile.am     | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit f6067c478553eb92e03dcd2c3bbf56876b1247b5
@@ -7045,7 +8404,7 @@ Date:   Fri May 29 09:04:20 2009 -0400
 
     Build: dist cairo module headers.
 
- modules/cairo/Makefile.am |    8 ++++++++
+ modules/cairo/Makefile.am | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 8aa5f1c09af3e32519e4027df71819aa681007b1
@@ -7054,7 +8413,7 @@ Date:   Fri May 29 09:00:37 2009 -0400
 
     Distribute dbus-exports.h
 
- modules/dbus/Makefile.am |    3 ++-
+ modules/dbus/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 5b8e240c427c891458d6d458265f3a035d2faef2
@@ -7063,8 +8422,8 @@ Date:   Fri May 29 08:56:47 2009 -0400
 
     Build: dist sandbox.xml
 
- doc/modules/gtkbuilder/Makefile.am |    3 ++-
- doc/modules/sandbox/Makefile.am    |    2 +-
+ doc/modules/gtkbuilder/Makefile.am | 3 ++-
+ doc/modules/sandbox/Makefile.am    | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit f77029ebae2aa07bb4ff7686b4d6bcfd20d5e55b
@@ -7073,7 +8432,7 @@ Date:   Fri May 29 08:50:03 2009 -0400
 
     Build: readline.xml dist.
 
- doc/modules/readline/Makefile.am |    2 +-
+ doc/modules/readline/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5bc98ab41ac4ed3671cc60ee59736faada74330f
@@ -7082,7 +8441,7 @@ Date:   Fri May 29 08:43:35 2009 -0400
 
     Build: dist sqlite.xml
 
- doc/modules/sqlite/Makefile.am |    2 +-
+ doc/modules/sqlite/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a40d0943b870d86e6ee3aba17a8d5720efc534ab
@@ -7091,7 +8450,7 @@ Date:   Fri May 29 08:37:59 2009 -0400
 
     Build: fix another file missing from dist.
 
- doc/modules/Makefile.am |    2 +-
+ doc/modules/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f4ed437134af34eb0c31cdc30355e90910fddb17
@@ -7100,7 +8459,7 @@ Date:   Fri May 29 08:29:26 2009 -0400
 
     Doc: printf is not global yet
 
- doc/modules/make-functions.js |    6 +++---
+ doc/modules/make-functions.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit a1ef3fa3874a1443d3302b1f8a515373b264c5b7
@@ -7109,9 +8468,9 @@ Date:   Fri May 29 08:14:56 2009 -0400
 
     Build: Fix various missing things from EXTRA_DISTs
 
- doc/modules/Makefile.am   |    1 +
- extensions/Makefile.am    |    2 +-
- modules/cairo/Makefile.am |    1 -
+ doc/modules/Makefile.am   | 1 +
+ extensions/Makefile.am    | 2 +-
+ modules/cairo/Makefile.am | 1 -
  3 files changed, 2 insertions(+), 2 deletions(-)
 
 commit b218b24953ff876670f2f6ca218c06d7aa9bb52a
@@ -7120,7 +8479,7 @@ Date:   Thu May 28 18:56:55 2009 -0400
 
     Bump autotools version
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 11bed8dabf1dea3ca2c21008128e73fbadfd2551
@@ -7129,8 +8488,8 @@ Date:   Wed May 27 09:44:24 2009 -0400
 
     extensions: Whoops, put Seed.printf back
 
- extensions/Clutter.js |   12 +++++++-----
- extensions/Seed.js.in |    2 +-
+ extensions/Clutter.js | 12 +++++++-----
+ extensions/Seed.js.in |  2 +-
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 commit c43e194fed29593a31f8be0f2d88abb8c8227de0
@@ -7139,8 +8498,8 @@ Date:   Wed May 27 06:09:23 2009 -0400
 
     Update RELEASE file
 
- ChangeLog |    2 +
- RELEASE   |  161 ++++++++++++++++++++++++++++---------------------------------
+ ChangeLog |   2 +
+ RELEASE   | 161 ++++++++++++++++++++++++++++----------------------------------
  2 files changed, 75 insertions(+), 88 deletions(-)
 
 commit cab81299c32ad1918c52c8b01e6d5f5d345e5841
@@ -7149,9 +8508,9 @@ Date:   Wed May 27 05:47:18 2009 -0400
 
     libseed: Conversion to/from date objects to time_t
 
- ChangeLog            |    1 +
- libseed/seed-types.c |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-types.h |    8 ++++++++
+ ChangeLog            |  1 +
+ libseed/seed-types.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-types.h |  8 ++++++++
  3 files changed, 64 insertions(+)
 
 commit 975b83c9a8e245c359eddd62967ec236ceaac014
@@ -7160,11 +8519,11 @@ Date:   Wed May 27 04:41:38 2009 -0400
 
     libseed: Move Seed.fork into os module
 
- doc/runtime.html.in      |   21 ---------------------
- examples/gtkplug.js      |    3 ++-
- libseed/seed-builtins.c  |   14 --------------
- modules/os/os.c          |   14 ++++++++++++++
- tests/javascript/fork.js |    4 ++--
+ doc/runtime.html.in      | 21 ---------------------
+ examples/gtkplug.js      |  3 ++-
+ libseed/seed-builtins.c  | 14 --------------
+ modules/os/os.c          | 14 ++++++++++++++
+ tests/javascript/fork.js |  4 ++--
  5 files changed, 18 insertions(+), 38 deletions(-)
 
 commit 6d23b7c340419153dbffcbd56e5a12f6b82bc106
@@ -7173,102 +8532,102 @@ Date:   Wed May 27 04:32:17 2009 -0400
 
     find . -path ./.git -prune -o -type f -print0 | xargs -o perl -pi -e 's/Seed\.print/g'
 
- doc/mapping/mapping.html.in                        |   10 +--
- doc/modules/make-functions.js                      |   16 ++--
- doc/modules/readline/readline.xml                  |    2 +-
- doc/modules/sandbox/sandbox.xml                    |    2 +-
- doc/modules/sqlite/sqlite.xml                      |    2 +-
- doc/runtime.html.in                                |   38 +++++-----
- doc/tutorial-standalone/1.js                       |    8 +-
- doc/tutorial-standalone/tutorial.html.in           |   32 ++++----
- examples/Gnio-server.js                            |    4 +-
- examples/Gnio.js                                   |    2 +-
- examples/actions.js                                |    6 +-
- examples/async-quine.js                            |    2 +-
- examples/broken/browser/browser-actions.js         |    2 +-
- examples/broken/browser/browser-tab.js             |    2 +-
- examples/broken/browser/main.js                    |    8 +-
- examples/clutter-pad/main.js                       |    4 +-
- examples/clutter-pad/test.js                       |    2 +-
- examples/clutter-transitions/transition-library.js |    2 +-
- examples/dbus/dbus-banshee.js                      |    4 +-
- examples/dbus/dbus-consolekit.js                   |    4 +-
- examples/dbus/dbus-networkmanager.js               |    2 +-
- examples/gconf.js                                  |    2 +-
- examples/glib/env.js                               |    4 +-
- examples/glib/thread.js                            |    4 +-
- examples/glib/timeout.js                           |    2 +-
- examples/glib/timer.js                             |    2 +-
- examples/json-reddit.js                            |    6 +-
- examples/ls.js                                     |    2 +-
- examples/notify-test.js                            |    2 +-
- examples/pango-fontset.js                          |    2 +-
- examples/pango.js                                  |    2 +-
- examples/quine.js                                  |    2 +-
- examples/repl.js                                   |    4 +-
- examples/same-seed/board.js                        |    6 +-
- examples/soup.js                                   |    2 +-
- examples/twitter/twitter.js                        |    2 +-
- examples/xml/weather.js                            |    6 +-
- examples/xml/xml-dom.js                            |    2 +-
- examples/xml/xml-tree.js                           |    2 +-
- examples/xml/xml-xpath.js                          |    2 +-
- extensions/Seed.js.in                              |    8 +-
- libseed/seed-builtins.c                            |    2 +-
- libseed/seed-engine.c                              |    4 +-
- modules/Multiprocessing/bi.js                      |    2 +-
- modules/dbus/dbus.js                               |    2 +-
- modules/sqlite/example.js                          |    2 +-
- tests/javascript/argv.js                           |    2 +-
- tests/javascript/builtin-argument-length.js        |   42 +++++-----
- tests/javascript/check-syntax.js                   |   12 +--
- tests/javascript/closure-finalization.js           |    2 +-
- tests/javascript/compare.js                        |    4 +-
- tests/javascript/constructor-args.js               |    6 +-
- tests/javascript/constructor-prototype.js          |    2 +-
- tests/javascript/enum.js                           |    2 +-
- tests/javascript/everything.js                     |   80 ++++++++++----------
- tests/javascript/fork.js                           |    4 +-
- tests/javascript/function-info.js                  |    2 +-
- tests/javascript/gdk-event.js                      |    8 +-
- tests/javascript/gerror.js                         |    2 +-
- tests/javascript/gtypes/gtype-extraprop.js         |    2 +-
- .../javascript/gtypes/gtype-property-construct.js  |    2 +-
- tests/javascript/gtypes/gtype-property.js          |    4 +-
- tests/javascript/gtypes/gtype-self.js              |    2 +-
- tests/javascript/gtypes/gtype-signal-args.js       |    4 +-
- tests/javascript/gtypes/gtype-signal.js            |    4 +-
- tests/javascript/gtypes/gtype-typerror.js          |    2 +-
- tests/javascript/gtypes/gtype.js                   |    8 +-
- tests/javascript/introspect.js                     |    2 +-
- tests/javascript/json-constructor.js               |    2 +-
- tests/javascript/json.js                           |    2 +-
- tests/javascript/list-test.js                      |    6 +-
- tests/javascript/native-closure.js                 |    2 +-
- tests/javascript/object-info.js                    |    4 +-
- tests/javascript/out-test.js                       |    2 +-
- tests/javascript/print.js                          |    2 +-
- tests/javascript/printf.js                         |   12 +--
- tests/javascript/printprint.js                     |    2 +-
- tests/javascript/readline-bind.js                  |    4 +-
- tests/javascript/readline.js                       |    2 +-
- tests/javascript/signals/signal-connect.js         |    6 +-
- tests/javascript/signals/signal-disconnect.js      |    2 +-
- tests/javascript/signals/signal-expects.js         |    2 +-
- tests/javascript/signals/signal-invalid.js         |    2 +-
- tests/javascript/signals/signal-nofunc.js          |    2 +-
- tests/javascript/signals/signal-userdata.js        |    2 +-
- tests/javascript/signals/signal.js                 |    2 +-
- tests/javascript/spawn.js                          |    2 +-
- tests/javascript/sqlite.js                         |    2 +-
- tests/javascript/structs/struct-constructor.js     |    6 +-
- tests/javascript/structs/struct-enumerate.js       |    2 +-
- tests/javascript/structs/struct-nested-set.js      |    6 +-
- tests/javascript/structs/struct-offsets.js         |    4 +-
- tests/javascript/structs/struct-set-member.js      |    4 +-
- tests/javascript/structs/struct-union-enumerate.js |    2 +-
- tests/javascript/type-conversion.js                |    2 +-
- tools/run-lint.js                                  |    6 +-
+ doc/mapping/mapping.html.in                        | 10 +--
+ doc/modules/make-functions.js                      | 16 ++---
+ doc/modules/readline/readline.xml                  |  2 +-
+ doc/modules/sandbox/sandbox.xml                    |  2 +-
+ doc/modules/sqlite/sqlite.xml                      |  2 +-
+ doc/runtime.html.in                                | 38 +++++-----
+ doc/tutorial-standalone/1.js                       |  8 +--
+ doc/tutorial-standalone/tutorial.html.in           | 32 ++++-----
+ examples/Gnio-server.js                            |  4 +-
+ examples/Gnio.js                                   |  2 +-
+ examples/actions.js                                |  6 +-
+ examples/async-quine.js                            |  2 +-
+ examples/broken/browser/browser-actions.js         |  2 +-
+ examples/broken/browser/browser-tab.js             |  2 +-
+ examples/broken/browser/main.js                    |  8 +--
+ examples/clutter-pad/main.js                       |  4 +-
+ examples/clutter-pad/test.js                       |  2 +-
+ examples/clutter-transitions/transition-library.js |  2 +-
+ examples/dbus/dbus-banshee.js                      |  4 +-
+ examples/dbus/dbus-consolekit.js                   |  4 +-
+ examples/dbus/dbus-networkmanager.js               |  2 +-
+ examples/gconf.js                                  |  2 +-
+ examples/glib/env.js                               |  4 +-
+ examples/glib/thread.js                            |  4 +-
+ examples/glib/timeout.js                           |  2 +-
+ examples/glib/timer.js                             |  2 +-
+ examples/json-reddit.js                            |  6 +-
+ examples/ls.js                                     |  2 +-
+ examples/notify-test.js                            |  2 +-
+ examples/pango-fontset.js                          |  2 +-
+ examples/pango.js                                  |  2 +-
+ examples/quine.js                                  |  2 +-
+ examples/repl.js                                   |  4 +-
+ examples/same-seed/board.js                        |  6 +-
+ examples/soup.js                                   |  2 +-
+ examples/twitter/twitter.js                        |  2 +-
+ examples/xml/weather.js                            |  6 +-
+ examples/xml/xml-dom.js                            |  2 +-
+ examples/xml/xml-tree.js                           |  2 +-
+ examples/xml/xml-xpath.js                          |  2 +-
+ extensions/Seed.js.in                              |  8 +--
+ libseed/seed-builtins.c                            |  2 +-
+ libseed/seed-engine.c                              |  4 +-
+ modules/Multiprocessing/bi.js                      |  2 +-
+ modules/dbus/dbus.js                               |  2 +-
+ modules/sqlite/example.js                          |  2 +-
+ tests/javascript/argv.js                           |  2 +-
+ tests/javascript/builtin-argument-length.js        | 42 ++++++------
+ tests/javascript/check-syntax.js                   | 12 ++--
+ tests/javascript/closure-finalization.js           |  2 +-
+ tests/javascript/compare.js                        |  4 +-
+ tests/javascript/constructor-args.js               |  6 +-
+ tests/javascript/constructor-prototype.js          |  2 +-
+ tests/javascript/enum.js                           |  2 +-
+ tests/javascript/everything.js                     | 80 +++++++++++-----------
+ tests/javascript/fork.js                           |  4 +-
+ tests/javascript/function-info.js                  |  2 +-
+ tests/javascript/gdk-event.js                      |  8 +--
+ tests/javascript/gerror.js                         |  2 +-
+ tests/javascript/gtypes/gtype-extraprop.js         |  2 +-
+ .../javascript/gtypes/gtype-property-construct.js  |  2 +-
+ tests/javascript/gtypes/gtype-property.js          |  4 +-
+ tests/javascript/gtypes/gtype-self.js              |  2 +-
+ tests/javascript/gtypes/gtype-signal-args.js       |  4 +-
+ tests/javascript/gtypes/gtype-signal.js            |  4 +-
+ tests/javascript/gtypes/gtype-typerror.js          |  2 +-
+ tests/javascript/gtypes/gtype.js                   |  8 +--
+ tests/javascript/introspect.js                     |  2 +-
+ tests/javascript/json-constructor.js               |  2 +-
+ tests/javascript/json.js                           |  2 +-
+ tests/javascript/list-test.js                      |  6 +-
+ tests/javascript/native-closure.js                 |  2 +-
+ tests/javascript/object-info.js                    |  4 +-
+ tests/javascript/out-test.js                       |  2 +-
+ tests/javascript/print.js                          |  2 +-
+ tests/javascript/printf.js                         | 12 ++--
+ tests/javascript/printprint.js                     |  2 +-
+ tests/javascript/readline-bind.js                  |  4 +-
+ tests/javascript/readline.js                       |  2 +-
+ tests/javascript/signals/signal-connect.js         |  6 +-
+ tests/javascript/signals/signal-disconnect.js      |  2 +-
+ tests/javascript/signals/signal-expects.js         |  2 +-
+ tests/javascript/signals/signal-invalid.js         |  2 +-
+ tests/javascript/signals/signal-nofunc.js          |  2 +-
+ tests/javascript/signals/signal-userdata.js        |  2 +-
+ tests/javascript/signals/signal.js                 |  2 +-
+ tests/javascript/spawn.js                          |  2 +-
+ tests/javascript/sqlite.js                         |  2 +-
+ tests/javascript/structs/struct-constructor.js     |  6 +-
+ tests/javascript/structs/struct-enumerate.js       |  2 +-
+ tests/javascript/structs/struct-nested-set.js      |  6 +-
+ tests/javascript/structs/struct-offsets.js         |  4 +-
+ tests/javascript/structs/struct-set-member.js      |  4 +-
+ tests/javascript/structs/struct-union-enumerate.js |  2 +-
+ tests/javascript/type-conversion.js                |  2 +-
+ tools/run-lint.js                                  |  6 +-
  96 files changed, 261 insertions(+), 261 deletions(-)
 
 commit 405feab8bf95281cdf2bc80fe8524730aaf1c222
@@ -7277,9 +8636,9 @@ Date:   Wed May 27 04:19:07 2009 -0400
 
     Move Seed.print to the global object, as 'print', keep Seed.print for this release
 
- libseed/seed-builtins.c |    9 ++++++++-
- libseed/seed-builtins.h |    2 ++
- libseed/seed-engine.c   |    2 ++
+ libseed/seed-builtins.c | 9 ++++++++-
+ libseed/seed-builtins.h | 2 ++
+ libseed/seed-engine.c   | 2 ++
  3 files changed, 12 insertions(+), 1 deletion(-)
 
 commit ce61b7ee195041524cafbe56b85fa075b691718e
@@ -7288,7 +8647,7 @@ Date:   Wed May 27 04:08:34 2009 -0400
 
     More work on release ChangeLog
 
- ChangeLog |    4 ++++
+ ChangeLog | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit ad46d5dfd1d429d58c4b3848d01fa124b911498e
@@ -7297,7 +8656,7 @@ Date:   Wed May 27 04:01:46 2009 -0400
 
     libseed: seed_value_to_(int)(uint)(long)(ulong)(int64)(uint64) should not choke on boolean
 
- libseed/seed-types.c |   10 +++++-----
+ libseed/seed-types.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 3b440058f07ebf37992d89367776ca438321924e
@@ -7306,7 +8665,7 @@ Date:   Wed May 27 03:58:43 2009 -0400
 
     libseed: seed_value_to_boolean should permit JSValueIsNumber, and not just return FALSE
 
- libseed/seed-types.c |    2 +-
+ libseed/seed-types.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7fcf30dd0567aa1db5a35cb7f71a5a90fe477d56
@@ -7315,8 +8674,8 @@ Date:   Wed May 27 03:57:21 2009 -0400
 
     libseed: fix exception name spelling error
 
- libseed/seed-engine.c |    4 ++--
- m4/libtool.m4         |    3 +++
+ libseed/seed-engine.c | 4 ++--
+ m4/libtool.m4         | 3 +++
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit c45bfb66be620844ef40890f914df24628a6d412
@@ -7325,10 +8684,10 @@ Date:   Tue May 26 15:42:08 2009 -0400
 
     Add seed_value_to_format to API, converts an array of SeedValue based on a format string. Also add C test and docs
 
- doc/reference/seed-sections.txt |    1 +
- libseed/seed-api.c              |   90 +++++++++++++++++++++++++++++++++++++++
- libseed/seed.h                  |    4 ++
- tests/c/api-types.c             |   11 +++++
+ doc/reference/seed-sections.txt |  1 +
+ libseed/seed-api.c              | 90 +++++++++++++++++++++++++++++++++++++++++
+ libseed/seed.h                  |  4 ++
+ tests/c/api-types.c             | 11 +++++
  4 files changed, 106 insertions(+)
 
 commit 4bbbff52cc0f3b9069591b727f5229e98f579b01
@@ -7337,8 +8696,8 @@ Date:   Tue May 26 14:56:45 2009 -0400
 
     libseed: seed_gobject_equals and the .equals() method has been useless since toggle refs were added in november, so remove it
 
- libseed/seed-engine.c       |   27 ---------------------------
- tests/javascript/compare.js |    4 ++--
+ libseed/seed-engine.c       | 27 ---------------------------
+ tests/javascript/compare.js |  4 ++--
  2 files changed, 2 insertions(+), 29 deletions(-)
 
 commit f2b7048a7459455bc136796f05a072a9afab3592
@@ -7347,8 +8706,8 @@ Date:   Tue May 26 08:50:48 2009 -0400
 
     dbus: Logging statements
 
- modules/dbus/dbus-values.c |  250 ++++++++++++++++++++++----------------------
- modules/dbus/module.c      |   59 ++++++-----
+ modules/dbus/dbus-values.c | 250 ++++++++++++++++++++++-----------------------
+ modules/dbus/module.c      |  59 +++++------
  2 files changed, 154 insertions(+), 155 deletions(-)
 
 commit ef7342724d32afba2cee6bbf1fe57769e0f0aac1
@@ -7357,11 +8716,11 @@ Date:   Tue May 26 03:57:08 2009 -0400
 
     extensions: Seed.js uses search path from @prefix@ now. Also queries gnome-js-common for moduledir. Seed depends on gnome-js-common now
 
- configure.ac           |    4 +-
- extensions/Seed.js     |  174 ------------------------------------------------
- extensions/Seed.js.in  |  174 ++++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.c  |    4 +-
- libseed/seed-path.h.in |    2 +-
+ configure.ac           |   4 +-
+ extensions/Seed.js     | 174 -------------------------------------------------
+ extensions/Seed.js.in  | 174 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c  |   4 +-
+ libseed/seed-path.h.in |   2 +-
  5 files changed, 180 insertions(+), 178 deletions(-)
 
 commit 9aa7102b6accf366518b6d60f92d53bb08845263
@@ -7370,10 +8729,10 @@ Date:   Tue May 26 03:32:48 2009 -0400
 
     libseed: Fix include of Seed.js in non-standard prefix
 
- configure.ac           |    6 ++++++
- libseed/Makefile.am    |    3 ++-
- libseed/seed-engine.c  |   18 ++++++++----------
- libseed/seed-path.h.in |    1 +
+ configure.ac           |  6 ++++++
+ libseed/Makefile.am    |  3 ++-
+ libseed/seed-engine.c  | 18 ++++++++----------
+ libseed/seed-path.h.in |  1 +
  4 files changed, 17 insertions(+), 11 deletions(-)
 
 commit 9bddb620e5d2bcf9e14fb397ff3267aef510cac4
@@ -7382,9 +8741,9 @@ Date:   Tue May 26 02:37:17 2009 -0400
 
     Add a SEED_DEBUG_MODULE flag
 
- libseed/Makefile.am   |    2 +-
- libseed/seed-debug.h  |    3 ++-
- libseed/seed-engine.c |    3 ++-
+ libseed/Makefile.am   | 2 +-
+ libseed/seed-debug.h  | 3 ++-
+ libseed/seed-engine.c | 3 ++-
  3 files changed, 5 insertions(+), 3 deletions(-)
 
 commit 1a599fdb7e834e5b35a2e9fbb379c9976022086e
@@ -7393,9 +8752,9 @@ Date:   Mon May 25 16:42:00 2009 -0400
 
     tests: Add test of the self parameter to init, and of passing additional properties to GObject constructors
 
- tests/javascript/gtypes/Makefile.am        |    2 ++
- tests/javascript/gtypes/gtype-extraprop.js |   21 +++++++++++++++++++++
- tests/javascript/gtypes/gtype-self.js      |   21 +++++++++++++++++++++
+ tests/javascript/gtypes/Makefile.am        |  2 ++
+ tests/javascript/gtypes/gtype-extraprop.js | 21 +++++++++++++++++++++
+ tests/javascript/gtypes/gtype-self.js      | 21 +++++++++++++++++++++
  3 files changed, 44 insertions(+)
 
 commit 6606d44fd9751ed135307a4a5c095c5fe9abea08
@@ -7404,7 +8763,7 @@ Date:   Mon May 25 10:50:14 2009 -0400
 
     libseed: Allow setting of non gobject properties in constructor
 
- libseed/seed-engine.c |   41 +++++++++++++++++++++--------------------
+ libseed/seed-engine.c | 41 +++++++++++++++++++++--------------------
  1 file changed, 21 insertions(+), 20 deletions(-)
 
 commit 6b59e379e771dd71201a585ebf6e2114a2d29879
@@ -7413,7 +8772,7 @@ Date:   Mon May 25 08:27:43 2009 -0400
 
     tests: struct-functions test should use new imports system
 
- tests/javascript/structs/struct-functions.js |    2 +-
+ tests/javascript/structs/struct-functions.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0f74c3fbb0c872c5dec6d8c6d381bb49277ad8fc
@@ -7422,7 +8781,7 @@ Date:   Mon May 25 06:53:57 2009 -0400
 
     extensions: Clutter animation wrappers should save animate wrappers
 
- extensions/Clutter.js |   26 +++++++++++++++++++++-----
+ extensions/Clutter.js | 26 +++++++++++++++++++++-----
  1 file changed, 21 insertions(+), 5 deletions(-)
 
 commit 17f44df8aa7ab04986e6e60ccb21ca1a11003c0e
@@ -7431,8 +8790,8 @@ Date:   Mon May 25 05:06:26 2009 -0400
 
     libseed: Remove Seed.import_namespace. Use the new system.
 
- libseed/seed-engine.c |   52 -------------------------------------------------
- m4/libtool.m4         |    3 ---
+ libseed/seed-engine.c | 52 ---------------------------------------------------
+ m4/libtool.m4         |  3 ---
  2 files changed, 55 deletions(-)
 
 commit fdf5d14209b6112da5a8a6ae69bc2206ba026bd5
@@ -7441,14 +8800,14 @@ Date:   Sat May 23 21:27:46 2009 -0400
 
     Update examples and tests to import JSON now that it is a seperate module.
 
- ChangeLog                                   |    4 ++--
- examples/json-reddit.js                     |    2 ++
- examples/pango.js                           |    2 ++
- tests/javascript/everything.js              |    2 ++
- tests/javascript/introspect.js              |    2 ++
- tests/javascript/json.js                    |    1 +
- tests/javascript/signals/signal-userdata.js |    2 ++
- tests/javascript/sqlite.js                  |   13 +++++++------
+ ChangeLog                                   |  4 ++--
+ examples/json-reddit.js                     |  2 ++
+ examples/pango.js                           |  2 ++
+ tests/javascript/everything.js              |  2 ++
+ tests/javascript/introspect.js              |  2 ++
+ tests/javascript/json.js                    |  1 +
+ tests/javascript/signals/signal-userdata.js |  2 ++
+ tests/javascript/sqlite.js                  | 13 +++++++------
  8 files changed, 20 insertions(+), 8 deletions(-)
 
 commit fb4c9ead1caee9c363974ead3f98ee2216d3383c
@@ -7457,7 +8816,7 @@ Date:   Sat May 23 21:20:58 2009 -0400
 
     extensions: Move JSON bits to gnome-js-common
 
- extensions/Seed.js |  481 ----------------------------------------------------
+ extensions/Seed.js | 481 -----------------------------------------------------
  1 file changed, 481 deletions(-)
 
 commit cd1dd4f20e8fa7e76b5d1ae04237e64ed3e2312e
@@ -7466,8 +8825,8 @@ Date:   Sat May 23 21:11:55 2009 -0400
 
     libseed: seed_gobject_init_method_invoked should support non argv class arrays by copying
 
- ChangeLog             |    4 +++-
- libseed/seed-engine.c |   63 ++++++++++++++++++++++++++++++++++++++++++++-----
+ ChangeLog             |  4 +++-
+ libseed/seed-engine.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++-----
  2 files changed, 60 insertions(+), 7 deletions(-)
 
 commit e7e80ea703391d970230b210f6298b2f3989644e
@@ -7476,7 +8835,7 @@ Date:   Sat May 23 20:21:34 2009 -0400
 
     libseed: Pass this as an argument to constructors in addition to as this. Calling it self provides a quick solution to capturing this in closures.
 
- libseed/seed-gtype.c |    5 +++--
+ libseed/seed-gtype.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit aae8f33031ba528a5605fc2287090c868b08d496
@@ -7485,7 +8844,7 @@ Date:   Sat May 23 15:44:47 2009 -0400
 
     GTKDoc index.html should not be in GIT
 
- doc/reference/html/index.html |   66 -----------------------------------------
+ doc/reference/html/index.html | 66 -------------------------------------------
  1 file changed, 66 deletions(-)
 
 commit 6f7c3e69c60bdb80912f449b8af9775fd93704e6
@@ -7494,8 +8853,8 @@ Date:   Thu May 21 17:26:18 2009 -0400
 
     seed: Start working on ChangeLog for next release. Still one week left...this must be a record
 
- ChangeLog               |   19 +++++++++++++++++++
- libseed/seed-importer.c |    1 -
+ ChangeLog               | 19 +++++++++++++++++++
+ libseed/seed-importer.c |  1 -
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 commit 4206f9afcd26b59e72f8d822c208e9a9e39ccfd7
@@ -7504,7 +8863,7 @@ Date:   Thu May 21 17:07:47 2009 -0400
 
     libseed: Implement property enumeration for importer_dir class
 
- libseed/seed-importer.c |  147 ++++++++++++++++++++++++++++-------------------
+ libseed/seed-importer.c | 147 +++++++++++++++++++++++++++++-------------------
  1 file changed, 89 insertions(+), 58 deletions(-)
 
 commit 569bd67da4b3de3f219730659629d53be38fc31e
@@ -7513,7 +8872,7 @@ Date:   Thu May 21 16:55:51 2009 -0400
 
     libseed: Implement imports.Directory constructor.
 
- libseed/seed-importer.c |   34 ++++++++++++++++++++++++++++++++++
+ libseed/seed-importer.c | 34 ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
 commit 07f62155d4ad00a43409f80934c130cf9345500f
@@ -7522,7 +8881,7 @@ Date:   Thu May 21 16:40:19 2009 -0400
 
     Document seed_make_function
 
- libseed/seed-api.c |    8 ++++++++
+ libseed/seed-api.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 943aab02e185cf1e4caa72bad8b4178425aa0d41
@@ -7531,9 +8890,9 @@ Date:   Thu May 21 13:22:48 2009 -0400
 
     libseed: Construct new JSObjectRefs for GObject wrappers in seed_gobject_constructor_invoked, so that it will be possible to append additional properties
 
- libseed/seed-engine.c |    6 ++++++
- libseed/seed-engine.h |    2 ++
- libseed/seed-types.c  |    8 +++++++-
+ libseed/seed-engine.c | 6 ++++++
+ libseed/seed-engine.h | 2 ++
+ libseed/seed-types.c  | 8 +++++++-
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 commit fd7178be8030892cffeb1fc257de47e6de3d5c51
@@ -7542,8 +8901,8 @@ Date:   Thu May 21 13:18:49 2009 -0400
 
     libseed: Separate the logic to make a wrapper for a given GObject type, out from the logic to make a wrapper for a specific object. This is necessary to be able to make the wrapper, before the call to g_object_newv, which will be required to see custom properties in init ha ndlers
 
- libseed/seed-types.c |   41 ++++++++++++++++++++++++-----------------
- libseed/seed-types.h |    2 ++
+ libseed/seed-types.c | 41 ++++++++++++++++++++++++-----------------
+ libseed/seed-types.h |  2 ++
  2 files changed, 26 insertions(+), 17 deletions(-)
 
 commit 52e69504ae186aae9ed63a1d925bfeb46186e116
@@ -7552,8 +8911,8 @@ Date:   Thu May 21 13:12:36 2009 -0400
 
     libseed: Drop the seed_gobject_initialize handler, and instead add signals in seed_wrap_object.
 
- libseed/seed-engine.c |   26 +-------------------------
- libseed/seed-types.c  |    4 +++-
+ libseed/seed-engine.c | 26 +-------------------------
+ libseed/seed-types.c  |  4 +++-
  2 files changed, 4 insertions(+), 26 deletions(-)
 
 commit 5074387826cdc18935e74d6242f16f6651fec3dc
@@ -7562,9 +8921,9 @@ Date:   Fri May 22 19:26:23 2009 -0400
 
     Update imports in sqlite example.
 
- doc/reference/html/index.html |    6 +++---
- m4/libtool.m4                 |    3 +++
- modules/sqlite/example.js     |    4 +++-
+ doc/reference/html/index.html | 6 +++---
+ m4/libtool.m4                 | 3 +++
+ modules/sqlite/example.js     | 4 +++-
  3 files changed, 9 insertions(+), 4 deletions(-)
 
 commit dbccc6990cc823a4c5cd6e85d15d09c97a2832e4
@@ -7573,8 +8932,8 @@ Date:   Thu May 21 10:38:50 2009 -0400
 
     Load default extension script in all global contexts, even in imports.
 
- libseed/seed-engine.c |    5 ++---
- libseed/seed-engine.h |    2 ++
+ libseed/seed-engine.c | 5 ++---
+ libseed/seed-engine.h | 2 ++
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit cde1d0798f8eb0c9e3ecbbcc51fb3846bebb3a5e
@@ -7583,7 +8942,7 @@ Date:   Wed May 20 23:21:20 2009 -0400
 
     gtkbuilder: If connect_object is passed to the connect func, use g_object_watch_closure to ensure lifetime
 
- modules/gtkbuilder/gtkbuilder.c |    3 ++-
+ modules/gtkbuilder/gtkbuilder.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 4d55413de8db6f20f78af5e92730065e45893d19
@@ -7592,7 +8951,7 @@ Date:   Wed May 20 22:57:28 2009 -0400
 
     docs: Update docs index to point at new docbook docs
 
- doc/index.html |   15 ++-------------
+ doc/index.html | 15 ++-------------
  1 file changed, 2 insertions(+), 13 deletions(-)
 
 commit efe10ed158b941bce7f14717637c60056cb9db68
@@ -7601,13 +8960,13 @@ Date:   Wed May 20 22:51:44 2009 -0400
 
     docs: Docbookify sandbox module documentation.
 
- configure.ac                        |    1 -
- doc/modules/Makefile.am             |    2 +-
- doc/modules/book.xml                |    1 +
- doc/modules/sandbox/Makefile.am     |   15 +++++---
- doc/modules/sandbox/sandbox.html.in |   66 -----------------------------------
- doc/modules/sandbox/sandbox.js      |   19 ++++++++++
- doc/modules/sandbox/sandbox.xml     |   44 +++++++++++++++++++++++
+ configure.ac                        |  1 -
+ doc/modules/Makefile.am             |  2 +-
+ doc/modules/book.xml                |  1 +
+ doc/modules/sandbox/Makefile.am     | 15 ++++++---
+ doc/modules/sandbox/sandbox.html.in | 66 -------------------------------------
+ doc/modules/sandbox/sandbox.js      | 19 +++++++++++
+ doc/modules/sandbox/sandbox.xml     | 44 +++++++++++++++++++++++++
  7 files changed, 76 insertions(+), 72 deletions(-)
 
 commit 432a7af563f91abd55585aff85e727afdddb235a
@@ -7616,11 +8975,11 @@ Date:   Wed May 20 22:36:17 2009 -0400
 
     docs: Document the one function in the gtkbuilder module, and also provide an example
 
- doc/modules/gtkbuilder/Makefile.am    |    6 ++++--
- doc/modules/gtkbuilder/example.js     |   24 ++++++++++++++++++++++++
- doc/modules/gtkbuilder/example.ui     |   24 ++++++++++++++++++++++++
- doc/modules/gtkbuilder/gtkbuilder.js  |    7 ++++++-
- doc/modules/gtkbuilder/gtkbuilder.xml |    8 +++-----
+ doc/modules/gtkbuilder/Makefile.am    |  6 ++++--
+ doc/modules/gtkbuilder/example.js     | 24 ++++++++++++++++++++++++
+ doc/modules/gtkbuilder/example.ui     | 24 ++++++++++++++++++++++++
+ doc/modules/gtkbuilder/gtkbuilder.js  |  7 ++++++-
+ doc/modules/gtkbuilder/gtkbuilder.xml |  8 +++-----
  5 files changed, 61 insertions(+), 8 deletions(-)
 
 commit 06c57d03d383283026ca00353b2b648d1cd8f3f4
@@ -7629,12 +8988,12 @@ Date:   Wed May 20 22:22:18 2009 -0400
 
     Add docbook for gtkbuilder module. Pretty sparse...
 
- configure.ac                          |    1 +
- doc/modules/Makefile.am               |    4 ++--
- doc/modules/book.xml                  |    1 +
- doc/modules/gtkbuilder/Makefile.am    |   12 +++++++++++
- doc/modules/gtkbuilder/gtkbuilder.js  |    5 +++++
- doc/modules/gtkbuilder/gtkbuilder.xml |   38 +++++++++++++++++++++++++++++++++
+ configure.ac                          |  1 +
+ doc/modules/Makefile.am               |  4 ++--
+ doc/modules/book.xml                  |  1 +
+ doc/modules/gtkbuilder/Makefile.am    | 12 +++++++++++
+ doc/modules/gtkbuilder/gtkbuilder.js  |  5 +++++
+ doc/modules/gtkbuilder/gtkbuilder.xml | 38 +++++++++++++++++++++++++++++++++++
  6 files changed, 59 insertions(+), 2 deletions(-)
 
 commit 0aab273bdb295febb68e76d07433ddd4283f9ef6
@@ -7643,11 +9002,11 @@ Date:   Wed May 20 22:11:34 2009 -0400
 
     modules: Add GtkBuilder module for handling gtkbuilder signal connection
 
- configure.ac                    |   38 ++++++++++++++++++
- libseed/seed.h                  |    7 +++-
- modules/Makefile.am             |    2 +-
- modules/gtkbuilder/Makefile.am  |   27 +++++++++++++
- modules/gtkbuilder/gtkbuilder.c |   81 +++++++++++++++++++++++++++++++++++++++
+ configure.ac                    | 38 +++++++++++++++++++
+ libseed/seed.h                  |  7 +++-
+ modules/Makefile.am             |  2 +-
+ modules/gtkbuilder/Makefile.am  | 27 ++++++++++++++
+ modules/gtkbuilder/gtkbuilder.c | 81 +++++++++++++++++++++++++++++++++++++++++
  5 files changed, 152 insertions(+), 3 deletions(-)
 
 commit c3cc2cb4a0cc924c13db59194b94c7b3999d7bde
@@ -7656,11 +9015,11 @@ Date:   Wed May 20 17:31:07 2009 -0400
 
     cairo: Implement Cairo PDF surfaces
 
- modules/cairo/Makefile.am              |    1 +
- modules/cairo/seed-cairo-pdf-surface.c |  120 ++++++++++++++++++++++++++++++++
- modules/cairo/seed-cairo-pdf-surface.h |    9 +++
- modules/cairo/seed-cairo-surface.c     |    2 +
- modules/cairo/seed-cairo.c             |    6 +-
+ modules/cairo/Makefile.am              |   1 +
+ modules/cairo/seed-cairo-pdf-surface.c | 120 +++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-pdf-surface.h |   9 +++
+ modules/cairo/seed-cairo-surface.c     |   2 +
+ modules/cairo/seed-cairo.c             |   6 +-
  5 files changed, 135 insertions(+), 3 deletions(-)
 
 commit 6c75cebb7d3892a4a22373d7fde0a4b61513f543
@@ -7673,7 +9032,7 @@ Date:   Wed May 20 17:14:31 2009 -0400
     Overload cairo_set_source and cairo_set_source_surface
     Overload cairo_mask and cairo_mask_surface.
 
- modules/cairo/seed-cairo.c |   67 +++++++++++++++++++++++++++++++++++---------
+ modules/cairo/seed-cairo.c | 67 ++++++++++++++++++++++++++++++++++++----------
  1 file changed, 53 insertions(+), 14 deletions(-)
 
 commit 31b783239a3f4145f6d1061e2f6ff4711455921c
@@ -7682,7 +9041,7 @@ Date:   Wed May 20 02:48:17 2009 -0400
 
     libseed: Constructor sometimes steals a ref to non INITIALLY_UNOWNED objects
 
- libseed/seed-engine.c |   10 ++++++----
+ libseed/seed-engine.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit b2b61f4683cd5f5b9d2422c04192ad15485a121b
@@ -7691,9 +9050,9 @@ Date:   Tue May 19 19:17:01 2009 -0400
 
     doc: Module docs will now build without seed installed
 
- doc/modules/Makefile.am          |    2 +-
- doc/modules/readline/Makefile.am |    4 ++--
- doc/modules/sqlite/Makefile.am   |    4 ++--
+ doc/modules/Makefile.am          | 2 +-
+ doc/modules/readline/Makefile.am | 4 ++--
+ doc/modules/sqlite/Makefile.am   | 4 ++--
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 commit d9d77aab4bfaaa29fd090339cf32f3454adfa493
@@ -7702,7 +9061,7 @@ Date:   Tue May 19 23:01:17 2009 +0100
 
     Fix dbus-banshee example.
 
- examples/dbus/dbus-banshee.js |    2 +-
+ examples/dbus/dbus-banshee.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b092fd611998340bced17be49f19544f9031d097
@@ -7711,16 +9070,16 @@ Date:   Tue May 19 11:27:28 2009 -0400
 
     Use env to find seed, not absolute path.
 
- doc/modules/make-functions.js              |    2 +-
- examples/cairo.js                          |    2 +-
- examples/dbus/dbus-banshee.js              |    2 +-
- examples/dbus/dbus-consolekit.js           |    2 +-
- examples/dbus/dbus-networkmanager.js       |    2 +-
- examples/gtktextview.js                    |    2 +-
- examples/xml/xml-dom.js                    |    2 +-
- examples/xml/xml-tree.js                   |    2 +-
- examples/xml/xml-xpath.js                  |    2 +-
- tests/javascript/signals/signal-invalid.js |    2 +-
+ doc/modules/make-functions.js              | 2 +-
+ examples/cairo.js                          | 2 +-
+ examples/dbus/dbus-banshee.js              | 2 +-
+ examples/dbus/dbus-consolekit.js           | 2 +-
+ examples/dbus/dbus-networkmanager.js       | 2 +-
+ examples/gtktextview.js                    | 2 +-
+ examples/xml/xml-dom.js                    | 2 +-
+ examples/xml/xml-tree.js                   | 2 +-
+ examples/xml/xml-xpath.js                  | 2 +-
+ tests/javascript/signals/signal-invalid.js | 2 +-
  10 files changed, 10 insertions(+), 10 deletions(-)
 
 commit eacea92416403210cec9552338b579bf945728b2
@@ -7729,15 +9088,15 @@ Date:   Mon May 18 22:30:23 2009 -0400
 
     docs: Docbookify sqlite documentation
 
- configure.ac                      |    1 -
- doc/modules/Makefile.am           |    5 ++-
- doc/modules/book.xml              |    3 +-
- doc/modules/readline/Makefile.am  |    1 +
- doc/modules/readline/readline.xml |    2 +-
- doc/modules/sqlite/Makefile.am    |   19 ++++++++---
- doc/modules/sqlite/sqlite.html.in |   68 -------------------------------------
- doc/modules/sqlite/sqlite.js      |   21 ++++++++++++
- doc/modules/sqlite/sqlite.xml     |   58 +++++++++++++++++++++++++++++++
+ configure.ac                      |  1 -
+ doc/modules/Makefile.am           |  5 ++-
+ doc/modules/book.xml              |  3 +-
+ doc/modules/readline/Makefile.am  |  1 +
+ doc/modules/readline/readline.xml |  2 +-
+ doc/modules/sqlite/Makefile.am    | 19 ++++++++---
+ doc/modules/sqlite/sqlite.html.in | 68 ---------------------------------------
+ doc/modules/sqlite/sqlite.js      | 21 ++++++++++++
+ doc/modules/sqlite/sqlite.xml     | 58 +++++++++++++++++++++++++++++++++
  9 files changed, 102 insertions(+), 76 deletions(-)
 
 commit 7499bb49e8180293d71f28b180d52eddd9dc34bc
@@ -7746,7 +9105,7 @@ Date:   Mon May 18 19:42:55 2009 -0400
 
     Fix generation of readline docs
 
- doc/modules/readline/Makefile.am |    3 ++-
+ doc/modules/readline/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 4c0167b52c7b41176b8089b0b9a119c3a4385417
@@ -7755,13 +9114,13 @@ Date:   Mon May 18 19:21:34 2009 -0400
 
     docs: Add docbook rewrite of readline docs
 
- configure.ac                          |    1 -
- doc/modules/Makefile.am               |   14 ++++++++++
- doc/modules/book.xml                  |   15 +++++++++++
- doc/modules/readline/Makefile.am      |   17 +++++++++---
- doc/modules/readline/readline.html.in |   41 -----------------------------
- doc/modules/readline/readline.js      |   27 +++++++++++++++++++
- doc/modules/readline/readline.xml     |   46 +++++++++++++++++++++++++++++++++
+ configure.ac                          |  1 -
+ doc/modules/Makefile.am               | 14 +++++++++++
+ doc/modules/book.xml                  | 15 ++++++++++++
+ doc/modules/readline/Makefile.am      | 17 ++++++++++---
+ doc/modules/readline/readline.html.in | 41 -------------------------------
+ doc/modules/readline/readline.js      | 27 ++++++++++++++++++++
+ doc/modules/readline/readline.xml     | 46 +++++++++++++++++++++++++++++++++++
  7 files changed, 115 insertions(+), 46 deletions(-)
 
 commit 687c5318e76c9f39eeb55f04604e0e751ab7aaa9
@@ -7770,7 +9129,7 @@ Date:   Mon May 18 18:41:27 2009 -0400
 
     docs: Add make functions helper script for generating module documentation
 
- doc/modules/make-functions.js |   40 ++++++++++++++++++++++++++++++++++++++++
+ doc/modules/make-functions.js | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit d91f397f852b089013df60113e264251c79a3053
@@ -7779,23 +9138,23 @@ Date:   Mon May 18 18:36:42 2009 -0400
 
     docs: Reorganize module docs to prepare for docbook rewrite
 
- configure.ac                                       |   17 +++--
- doc/modules/Makefile.am                            |    6 +-
- doc/modules/canvas.html.in                         |   34 ----------
- doc/modules/canvas/Makefile.am                     |    5 ++
- doc/modules/canvas/canvas.html.in                  |   34 ++++++++++
- doc/modules/multiprocessing.html.in                |   23 -------
- doc/modules/multiprocessing/Makefile.am            |    5 ++
- .../multiprocessing/multiprocessing.html.in        |   23 +++++++
- doc/modules/readline.html.in                       |   41 ------------
- doc/modules/readline/Makefile.am                   |    5 ++
- doc/modules/readline/readline.html.in              |   41 ++++++++++++
- doc/modules/sandbox.html.in                        |   66 -------------------
- doc/modules/sandbox/Makefile.am                    |    5 ++
- doc/modules/sandbox/sandbox.html.in                |   66 +++++++++++++++++++
- doc/modules/sqlite.html.in                         |   68 --------------------
- doc/modules/sqlite/Makefile.am                     |    5 ++
- doc/modules/sqlite/sqlite.html.in                  |   68 ++++++++++++++++++++
+ configure.ac                                       | 17 ++++--
+ doc/modules/Makefile.am                            |  6 +-
+ doc/modules/canvas.html.in                         | 34 -----------
+ doc/modules/canvas/Makefile.am                     |  5 ++
+ doc/modules/canvas/canvas.html.in                  | 34 +++++++++++
+ doc/modules/multiprocessing.html.in                | 23 --------
+ doc/modules/multiprocessing/Makefile.am            |  5 ++
+ .../multiprocessing/multiprocessing.html.in        | 23 ++++++++
+ doc/modules/readline.html.in                       | 41 -------------
+ doc/modules/readline/Makefile.am                   |  5 ++
+ doc/modules/readline/readline.html.in              | 41 +++++++++++++
+ doc/modules/sandbox.html.in                        | 66 ---------------------
+ doc/modules/sandbox/Makefile.am                    |  5 ++
+ doc/modules/sandbox/sandbox.html.in                | 66 +++++++++++++++++++++
+ doc/modules/sqlite.html.in                         | 68 ----------------------
+ doc/modules/sqlite/Makefile.am                     |  5 ++
+ doc/modules/sqlite/sqlite.html.in                  | 68 ++++++++++++++++++++++
  17 files changed, 270 insertions(+), 242 deletions(-)
 
 commit 47ecad360e0999ae1fad0869d65b04c30a1df1e8
@@ -7804,7 +9163,7 @@ Date:   Mon May 18 05:11:57 2009 -0400
 
     clutterpad: springs example motion frequency @ 60Hz doesn't break things anymore
 
- examples/clutter-pad/examples/spring.js |    2 +-
+ examples/clutter-pad/examples/spring.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e26b52162b72df5a0240d8c4d67b6fef3e1557d4
@@ -7813,7 +9172,7 @@ Date:   Mon May 18 05:11:24 2009 -0400
 
     gtkplug: example doesn't require gio import
 
- examples/gtkplug.js |    2 --
+ examples/gtkplug.js | 2 --
  1 file changed, 2 deletions(-)
 
 commit c8631fcad452cd6ec35e940018c088d500c1b886
@@ -7822,16 +9181,16 @@ Date:   Mon May 18 04:57:35 2009 -0400
 
     Build: install modules into libdir instead of exec_prefix/lib, more appropriate on 64 bit systems (fixes bug 583024)
 
- modules/Multiprocessing/Makefile.am |    2 +-
- modules/cairo/Makefile.am           |    2 +-
- modules/canvas/Makefile.am          |    2 +-
- modules/dbus/Makefile.am            |    2 +-
- modules/example/Makefile.am         |    2 +-
- modules/libxml/Makefile.am          |    2 +-
- modules/os/Makefile.am              |    2 +-
- modules/readline/Makefile.am        |    2 +-
- modules/sandbox/Makefile.am         |    2 +-
- modules/sqlite/Makefile.am          |    2 +-
+ modules/Multiprocessing/Makefile.am | 2 +-
+ modules/cairo/Makefile.am           | 2 +-
+ modules/canvas/Makefile.am          | 2 +-
+ modules/dbus/Makefile.am            | 2 +-
+ modules/example/Makefile.am         | 2 +-
+ modules/libxml/Makefile.am          | 2 +-
+ modules/os/Makefile.am              | 2 +-
+ modules/readline/Makefile.am        | 2 +-
+ modules/sandbox/Makefile.am         | 2 +-
+ modules/sqlite/Makefile.am          | 2 +-
  10 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 97f9fa23d020eab42a0a9eecab2decba106caeae
@@ -7840,8 +9199,8 @@ Date:   Sun May 17 22:36:01 2009 -0400
 
     Make the documentation a bit more...hierarchal
 
- doc/reference/html/index.html |   10 +++++++++-
- doc/reference/seed-docs.sgml  |   42 +++++++++++++++++++++++++++--------------
+ doc/reference/html/index.html | 10 +++++++++-
+ doc/reference/seed-docs.sgml  | 42 ++++++++++++++++++++++++++++--------------
  2 files changed, 37 insertions(+), 15 deletions(-)
 
 commit 4e97202b9c9d0955fcfb51e799671d2cde798e81
@@ -7850,7 +9209,7 @@ Date:   Sun May 17 21:46:29 2009 -0400
 
     Build: Use gnome-autogen.
 
- autogen.sh |   40 +++++++++-------------------------------
+ autogen.sh | 40 +++++++++-------------------------------
  1 file changed, 9 insertions(+), 31 deletions(-)
 
 commit 6818afd36a0f290467c3c75c052cdb0730333850
@@ -7859,12 +9218,12 @@ Date:   Sun May 17 20:02:49 2009 -0400
 
     Dbus: implement service side DBus stuff, still needs some work...
 
- libseed/seed-api.c          |   17 +++
- libseed/seed.h              |    1 +
- modules/dbus/dbus-exports.c |  343 ++++++++++++++++++++++++++++++++++++++++++-
- modules/dbus/dbus-values.h  |    2 +
- modules/dbus/module.c       |    5 +-
- modules/dbus/util/dbus.c    |    8 +-
+ libseed/seed-api.c          |  17 +++
+ libseed/seed.h              |   1 +
+ modules/dbus/dbus-exports.c | 343 +++++++++++++++++++++++++++++++++++++++++++-
+ modules/dbus/dbus-values.h  |   2 +
+ modules/dbus/module.c       |   5 +-
+ modules/dbus/util/dbus.c    |   8 +-
  6 files changed, 371 insertions(+), 5 deletions(-)
 
 commit 40c1d749e344ea84ac937652d0ac986b662471f1
@@ -7873,9 +9232,9 @@ Date:   Sun May 17 00:58:08 2009 -0400
 
     DBus: Start implementing DBus exports
 
- modules/dbus/Makefile.am    |    3 +-
- modules/dbus/dbus-exports.c |  403 +++++++++++++++++++++++++++++++++++++++++++
- modules/dbus/dbus-exports.h |   17 ++
+ modules/dbus/Makefile.am    |   3 +-
+ modules/dbus/dbus-exports.c | 403 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/dbus-exports.h |  17 ++
  3 files changed, 422 insertions(+), 1 deletion(-)
 
 commit e414914c20d5f1895157799236ec4a4288e625c4
@@ -7884,7 +9243,7 @@ Date:   Sun May 17 18:57:11 2009 -0400
 
     Turtle: Don't install seed_turtle to bindir.
 
- examples/turtle/Makefile.am |    3 ++-
+ examples/turtle/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 64ae0b84dcd36e072a5d33f9281f7abe6625b17a
@@ -7893,7 +9252,7 @@ Date:   Sat May 16 19:37:24 2009 -0400
 
     clutter-pad: add new cairo example to Makefile.
 
- examples/clutter-pad/examples/Makefile.am |    6 ++++--
+ examples/clutter-pad/examples/Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 11c460eb0a0b59e6b551dc8f33e01242dac788ac
@@ -7902,7 +9261,7 @@ Date:   Sat May 16 15:41:12 2009 +0000
 
     clutter-pad: add clutter-cairo example
 
- examples/clutter-pad/examples/cairo.js |   52 ++++++++++++++++++++++++++++++++
+ examples/clutter-pad/examples/cairo.js | 52 ++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
 commit e9ed8a25213bd8ababff6deaa4f9d321bb8d2a37
@@ -7911,7 +9270,7 @@ Date:   Sat May 16 15:38:50 2009 +0000
 
     fix seed_cairo_rotate argument count
 
- modules/cairo/seed-cairo.c |    2 +-
+ modules/cairo/seed-cairo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3e41323cefd25ae67128ee0a020ede421499583b
@@ -7920,7 +9279,7 @@ Date:   Sat May 16 15:40:36 2009 +0000
 
     add cairo.Context.steal and cairo.Context.destroy to seed_cairo
 
- modules/cairo/seed-cairo.c |   38 ++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 38 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 38 insertions(+)
 
 commit ce1548b990e4e86949a30d027292f8cf61233a44
@@ -7929,7 +9288,7 @@ Date:   Sat May 16 12:38:14 2009 +0000
 
     update clutter-cairo.js sample to clutter 0.9
 
- examples/clutter-cairo.js |    7 +++----
+ examples/clutter-cairo.js | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit f7849cb5dd0c00ee8248ce78771cbe6628a1a07a
@@ -7938,8 +9297,8 @@ Date:   Sat May 16 07:15:41 2009 -0400
 
     examples: Add simple cairo example
 
- examples/Makefile.am |    2 ++
- examples/cairo.js    |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ examples/Makefile.am |  2 ++
+ examples/cairo.js    | 44 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 46 insertions(+)
 
 commit f722432b0e799fc129a7d8520b8552d50054f8ad
@@ -7948,7 +9307,7 @@ Date:   Thu May 14 23:07:18 2009 -0400
 
     Patches: update Clutter patch to match head
 
- patches/clutter-animatev-annotation.patch |    6 +++---
+ patches/clutter-animatev-annotation.patch | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 4515ec61c20c6613f298bb81c0b4d7aeff0516cc
@@ -7957,9 +9316,9 @@ Date:   Thu May 14 22:57:01 2009 -0400
 
     Cairo stuff
 
- configure.ac               |    3 +++
- modules/cairo/Makefile.am  |    2 ++
- modules/cairo/seed-cairo.c |   29 +++++++++++++++++++++++++++++
+ configure.ac               |  3 +++
+ modules/cairo/Makefile.am  |  2 ++
+ modules/cairo/seed-cairo.c | 29 +++++++++++++++++++++++++++++
  3 files changed, 34 insertions(+)
 
 commit d9e0a9bc75dd44a6d42ed2f3a708ab797f9ec535
@@ -7968,9 +9327,9 @@ Date:   Thu May 14 16:47:37 2009 -0400
 
     cairo: Implement cairo.get_source and cairo.set_source
 
- modules/cairo/seed-cairo-pattern.c |    5 +++-
- modules/cairo/seed-cairo-surface.c |    5 +++-
- modules/cairo/seed-cairo.c         |   54 ++++++++++++++++++++++++++++++++++--
+ modules/cairo/seed-cairo-pattern.c |  5 +++-
+ modules/cairo/seed-cairo-surface.c |  5 +++-
+ modules/cairo/seed-cairo.c         | 54 +++++++++++++++++++++++++++++++++++---
  3 files changed, 59 insertions(+), 5 deletions(-)
 
 commit 43fd471210f7dd79673e897d553fa91df1deec70
@@ -7979,7 +9338,7 @@ Date:   Thu May 14 16:35:03 2009 -0400
 
     cairo: Implement pattern.add_color_stop_rgb and rgba
 
- modules/cairo/seed-cairo-pattern.c |   62 ++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-pattern.c | 62 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 62 insertions(+)
 
 commit 59786cd0d8606d9d8ec2a2da4a893f653ccc128f
@@ -7988,8 +9347,8 @@ Date:   Thu May 14 16:19:05 2009 -0400
 
     cairo: Implement cairo.LinearGradient and cairo.RadialGradient
 
- modules/cairo/seed-cairo-pattern.c |   62 +++++++++++++++++++++++++++++++++---
- modules/cairo/seed-cairo-pattern.h |    2 +-
+ modules/cairo/seed-cairo-pattern.c | 62 +++++++++++++++++++++++++++++++++++---
+ modules/cairo/seed-cairo-pattern.h |  2 +-
  2 files changed, 59 insertions(+), 5 deletions(-)
 
 commit 7222a322b2300cb8272c1ff31dd09c194845fd8a
@@ -7998,9 +9357,9 @@ Date:   Thu May 14 16:11:12 2009 -0400
 
     cairo: Standardize the class naming to be just 'Class' and not 'CairoClass'
 
- modules/cairo/seed-cairo-image-surface.c |    2 +-
- modules/cairo/seed-cairo-surface.c       |    2 +-
- modules/cairo/seed-cairo.c               |    2 +-
+ modules/cairo/seed-cairo-image-surface.c | 2 +-
+ modules/cairo/seed-cairo-surface.c       | 2 +-
+ modules/cairo/seed-cairo.c               | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 4c53e9cd0bace34580c045fb33372262431e2dcd
@@ -8009,10 +9368,10 @@ Date:   Thu May 14 16:10:02 2009 -0400
 
     cairo: Add Pattern class
 
- modules/cairo/Makefile.am          |    1 +
- modules/cairo/seed-cairo-pattern.c |   77 ++++++++++++++++++++++++++++++++++++
- modules/cairo/seed-cairo-pattern.h |   21 ++++++++++
- modules/cairo/seed-cairo.c         |    4 +-
+ modules/cairo/Makefile.am          |  1 +
+ modules/cairo/seed-cairo-pattern.c | 77 ++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-pattern.h | 21 +++++++++++
+ modules/cairo/seed-cairo.c         |  4 +-
  4 files changed, 102 insertions(+), 1 deletion(-)
 
 commit 1cee72cc9696148fad12d0491682ef6d4284ee67
@@ -8021,8 +9380,8 @@ Date:   Thu May 14 15:29:22 2009 -0400
 
     cairo: Add CAIRO_STATUS enum, and cairo_status_to_string
 
- libseed/seed.h                   |   12 ++++----
- modules/cairo/seed-cairo-enums.c |   60 ++++++++++++++++++++++++++++++++++++--
+ libseed/seed.h                   | 12 ++++----
+ modules/cairo/seed-cairo-enums.c | 60 ++++++++++++++++++++++++++++++++++++++--
  2 files changed, 63 insertions(+), 9 deletions(-)
 
 commit f8cca80b2e939e5bdac4d863894b8c3e7e0e37cb
@@ -8031,9 +9390,9 @@ Date:   Thu May 14 14:29:54 2009 -0400
 
     cairo: More cairo_t properties
 
- modules/cairo/seed-cairo-image-surface.c |    4 ++++
- modules/cairo/seed-cairo-surface.c       |    4 ++--
- modules/cairo/seed-cairo.c               |   24 +++++++++++-------------
+ modules/cairo/seed-cairo-image-surface.c |  4 ++++
+ modules/cairo/seed-cairo-surface.c       |  4 ++--
+ modules/cairo/seed-cairo.c               | 24 +++++++++++-------------
  3 files changed, 17 insertions(+), 15 deletions(-)
 
 commit 513df488c82a9af46d4c3e57bf00ff035250e830
@@ -8042,7 +9401,7 @@ Date:   Thu May 14 14:20:05 2009 -0400
 
     cairo: Implement surface.write_to_png
 
- modules/cairo/seed-cairo-surface.c |   28 ++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-surface.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 commit 59989f03c6fed38987d5f9029553386ea92d8e00
@@ -8051,7 +9410,7 @@ Date:   Thu May 14 14:15:59 2009 -0400
 
     cairo: Implement the remaining matrix functions (transform_point/transform_distance)
 
- modules/cairo/seed-cairo-matrix.c |   67 +++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-matrix.c | 67 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 67 insertions(+)
 
 commit e4d6c703fffb0388ff2b8aaacc57e4ef2c157ce7
@@ -8060,7 +9419,7 @@ Date:   Thu May 14 14:13:11 2009 -0400
 
     cairo: Implement matrix init/translate/scale/rotate funcs
 
- modules/cairo/seed-cairo-matrix.c |  183 ++++++++++++++++++++++++++++++++++++-
+ modules/cairo/seed-cairo-matrix.c | 183 +++++++++++++++++++++++++++++++++++++-
  1 file changed, 179 insertions(+), 4 deletions(-)
 
 commit c1562d31209d1ef5c88aecefd1b8240ddd163ced
@@ -8069,10 +9428,10 @@ Date:   Thu May 14 13:59:26 2009 -0400
 
     cairo: Move matrix code in to seed-cairo-matrix.c so additional functions can be added, and it can be used by the soon to be seed-cairo-pattern.c
 
- modules/cairo/Makefile.am         |    1 +
- modules/cairo/seed-cairo-matrix.c |   58 +++++++++++++++++++++++++++++++++++++
- modules/cairo/seed-cairo-matrix.h |   14 +++++++++
- modules/cairo/seed-cairo.c        |   37 ++---------------------
+ modules/cairo/Makefile.am         |  1 +
+ modules/cairo/seed-cairo-matrix.c | 58 +++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-matrix.h | 14 ++++++++++
+ modules/cairo/seed-cairo.c        | 37 ++-----------------------
  4 files changed, 76 insertions(+), 34 deletions(-)
 
 commit 97e22a0a5ee3184da20f74cf0eb6321aaf83af11
@@ -8081,7 +9440,7 @@ Date:   Thu May 14 13:49:01 2009 -0400
 
     cairo: Implement the matrix getter/setters, and the additional transformation methods
 
- modules/cairo/seed-cairo.c |  132 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 132 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 132 insertions(+)
 
 commit 9a38e5c73f5d8b9048c135b324b6757cba8aaf4a
@@ -8090,7 +9449,7 @@ Date:   Thu May 14 13:41:28 2009 -0400
 
     Implement matrix getters/setters
 
- modules/cairo/seed-cairo.c |  103 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 103 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 103 insertions(+)
 
 commit 53649c818c8a4d7d7ab92b015c17463a141f84db
@@ -8099,7 +9458,7 @@ Date:   Thu May 14 13:27:02 2009 -0400
 
     cairo: Move some context setters/getters in to properties
 
- modules/cairo/seed-cairo.c |  213 ++++++++++++++++----------------------------
+ modules/cairo/seed-cairo.c | 213 ++++++++++++++++-----------------------------
  1 file changed, 75 insertions(+), 138 deletions(-)
 
 commit b0bc6e5f5b1d3d9246b292ca8b3a6a4eb0eec808
@@ -8108,8 +9467,8 @@ Date:   Thu May 14 13:12:06 2009 -0400
 
     cairo: seed-cairo-surface should use properties where possible
 
- modules/cairo/seed-cairo-image-surface.c |    3 +-
- modules/cairo/seed-cairo-surface.c       |  185 +++++++++++++++---------------
+ modules/cairo/seed-cairo-image-surface.c |   3 +-
+ modules/cairo/seed-cairo-surface.c       | 185 ++++++++++++++++---------------
  2 files changed, 95 insertions(+), 93 deletions(-)
 
 commit d3977ded138a67ead8f70bd53a51671b9b378090
@@ -8118,7 +9477,7 @@ Date:   Thu May 14 12:51:38 2009 -0400
 
     canvas: Switch to property getter/setters for CairoImageSurface
 
- modules/cairo/seed-cairo-image-surface.c |   82 ++++++++++++++----------------
+ modules/cairo/seed-cairo-image-surface.c | 82 +++++++++++++++-----------------
  1 file changed, 38 insertions(+), 44 deletions(-)
 
 commit a2131bce03cee34ce198fd85932aa7cdaf446f02
@@ -8127,9 +9486,11 @@ Date:   Thu May 14 18:00:41 2009 -0400
 
     Build: fix install permissions for some scripts (repl.js wants to be +x) so that OpenSUSE package doesn't complain, fixes bug #582584
 
- examples/Makefile.am |    2 +-
- extensions/Seed.js   |    2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
+ examples/Makefile.am | 2 +-
+ extensions/Gio.js    | 0
+ extensions/Gtk.js    | 0
+ extensions/Seed.js   | 2 --
+ 4 files changed, 1 insertion(+), 3 deletions(-)
 
 commit 948a69d7b600e71b527f7ae9e1664b31b8d00e3b
 Author: Tim Horton <hortont@svn.gnome.org>
@@ -8137,7 +9498,7 @@ Date:   Thu May 14 17:42:01 2009 -0400
 
     ClutterPad: remove random whitespace
 
- examples/clutter-pad/examples/box2d.js |    3 ---
+ examples/clutter-pad/examples/box2d.js | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 9af1a888692f65ba110638ec60b859db6cf3cfba
@@ -8146,8 +9507,8 @@ Date:   Thu May 14 14:19:31 2009 +0000
 
     clutter-pad: test and fix duplicate context creation on execute
 
- examples/clutter-pad/main.js |    9 ++++-----
- examples/clutter-pad/test.js |   27 +++++++++++++++++++++++++++
+ examples/clutter-pad/main.js |  9 ++++-----
+ examples/clutter-pad/test.js | 27 +++++++++++++++++++++++++++
  2 files changed, 31 insertions(+), 5 deletions(-)
 
 commit e616fac4f939d96d204081314a70b3d922f01816
@@ -8156,10 +9517,10 @@ Date:   Thu May 14 10:02:34 2009 -0400
 
     clutter-pad: Add ClutterBox2D example
 
- examples/clutter-pad/Makefile.am          |    6 ++-
- examples/clutter-pad/examples/Makefile.am |    6 ++-
- examples/clutter-pad/examples/box2d.js    |   64 +++++++++++++++++++++++++++++
- examples/clutter-pad/redhand.png          |  Bin 0 -> 3605 bytes
+ examples/clutter-pad/Makefile.am          |   6 ++-
+ examples/clutter-pad/examples/Makefile.am |   6 ++-
+ examples/clutter-pad/examples/box2d.js    |  64 ++++++++++++++++++++++++++++++
+ examples/clutter-pad/redhand.png          | Bin 0 -> 3605 bytes
  4 files changed, 72 insertions(+), 4 deletions(-)
 
 commit 4b5fcd31be2a67943209557b237e0e523f58003f
@@ -8168,10 +9529,10 @@ Date:   Thu May 14 08:45:20 2009 -0400
 
     examples: Some clutter-pad cleanups
 
- .../clutter-pad/examples/animated-rectangle.js     |    1 -
- examples/clutter-pad/examples/spring.js            |    2 -
- examples/clutter-pad/main.js                       |    5 +-
- modules/cairo/seed-cairo.c                         |  202 +++++++++++++-------
+ .../clutter-pad/examples/animated-rectangle.js     |   1 -
+ examples/clutter-pad/examples/spring.js            |   2 -
+ examples/clutter-pad/main.js                       |   5 +-
+ modules/cairo/seed-cairo.c                         | 202 ++++++++++++++-------
  4 files changed, 138 insertions(+), 72 deletions(-)
 
 commit 4e136e050605a9966f1b5198594cfbd76ff1c9e3
@@ -8180,7 +9541,7 @@ Date:   Thu May 14 08:13:19 2009 -0400
 
     cairo: Bind the cairo path functions
 
- modules/cairo/seed-cairo.c |  370 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 370 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 370 insertions(+)
 
 commit 2c4779090b9a26cbe642847db50da57d019a0a46
@@ -8189,7 +9550,7 @@ Date:   Thu May 14 07:53:16 2009 -0400
 
     cairo: Implement the rest of the cairo_t methods (not including the path ones)
 
- modules/cairo/seed-cairo.c |  460 ++++++++++++++++++++++++++++++++++++--------
+ modules/cairo/seed-cairo.c | 460 +++++++++++++++++++++++++++++++++++++--------
  1 file changed, 383 insertions(+), 77 deletions(-)
 
 commit f01c875c8ad6fe4234aac41e4bc4425519611bf7
@@ -8198,7 +9559,7 @@ Date:   Thu May 14 07:10:40 2009 -0400
 
     cairo: get/set line_width/miter_limit/operator/tolerance. clip_preserve. reset_clip
 
- modules/cairo/seed-cairo.c |  207 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 207 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 207 insertions(+)
 
 commit c2a49f5d9b799e550da0ebb23034023aa72e3ff2
@@ -8207,7 +9568,7 @@ Date:   Thu May 14 07:01:18 2009 -0400
 
     cairo: get/set fill_rule/line_cap/line_join
 
- modules/cairo/seed-cairo.c |  118 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 118 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 118 insertions(+)
 
 commit bdfba213a6cb4529fe30de772aeb7980240c3acf
@@ -8216,8 +9577,8 @@ Date:   Thu May 14 06:55:00 2009 -0400
 
     cairo: More cairo.context, more enums, more breakfast
 
- modules/cairo/seed-cairo-enums.c |   41 ++++++++++++++++-
- modules/cairo/seed-cairo.c       |   90 ++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-enums.c | 41 +++++++++++++++++-
+ modules/cairo/seed-cairo.c       | 90 ++++++++++++++++++++++++++++++++++++++++
  2 files changed, 130 insertions(+), 1 deletion(-)
 
 commit fc8594290b523771315bd00f4f30ec7844671843
@@ -8226,8 +9587,8 @@ Date:   Thu May 14 06:08:29 2009 -0400
 
     cairo: Implement more of cairo context
 
- modules/cairo/seed-cairo-enums.c |    9 ++-
- modules/cairo/seed-cairo.c       |  151 ++++++++++++++++++++++++++++++++++----
+ modules/cairo/seed-cairo-enums.c |   9 ++-
+ modules/cairo/seed-cairo.c       | 151 +++++++++++++++++++++++++++++++++++----
  2 files changed, 144 insertions(+), 16 deletions(-)
 
 commit 81c1d2a1016dacb2b894ff96f4470ef05d9231fd
@@ -8236,7 +9597,7 @@ Date:   Thu May 14 05:08:32 2009 -0400
 
     cairo: Start implementing some cairo context methods
 
- modules/cairo/seed-cairo.c |  123 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.c | 123 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 123 insertions(+)
 
 commit 9179689cfc4eedbe08c8b74c6e29eca3ce267d98
@@ -8245,7 +9606,7 @@ Date:   Thu May 14 05:05:06 2009 -0400
 
     Pango: Persist (in ~/.pangojsrc, needs to find a better home) your pango.js layout EXCEPT FOR COLORS (struct bug?)
 
- examples/pango.js |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ examples/pango.js | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 54 insertions(+), 2 deletions(-)
 
 commit 7448c43afb6f340d533c5966eac2d2281935143b
@@ -8254,7 +9615,7 @@ Date:   Thu May 14 04:55:07 2009 -0400
 
     cairo: Hack around WebKit GC bug for now
 
- modules/cairo/seed-cairo.c |   22 ++++++++++++++++------
+ modules/cairo/seed-cairo.c | 22 ++++++++++++++++------
  1 file changed, 16 insertions(+), 6 deletions(-)
 
 commit 0e8bd80beecd858ac35d5a64c4fe7a536d1a8e62
@@ -8263,7 +9624,7 @@ Date:   Thu May 14 04:46:53 2009 -0400
 
     libseed: No need for G_MODULE_BIND_LAZY when importing modules
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f3061db7b8d4d454d96ff2fb0709959d575fee1f
@@ -8272,9 +9633,9 @@ Date:   Thu May 14 04:44:06 2009 -0400
 
     cairo: Some code reorg
 
- modules/cairo/seed-cairo-image-surface.c |    1 +
- modules/cairo/seed-cairo-image-surface.h |    1 -
- modules/cairo/seed-cairo.c               |    9 ++++-----
+ modules/cairo/seed-cairo-image-surface.c | 1 +
+ modules/cairo/seed-cairo-image-surface.h | 1 -
+ modules/cairo/seed-cairo.c               | 9 ++++-----
  3 files changed, 5 insertions(+), 6 deletions(-)
 
 commit 9e7766ce51dfb098abd534bb0d153cc801e2af1b
@@ -8283,12 +9644,12 @@ Date:   Thu May 14 04:33:53 2009 -0400
 
     cairo: Fix some warnings while I wait for WebKit to build
 
- modules/cairo/Makefile.am                |    1 +
- modules/cairo/seed-cairo-image-surface.c |    6 +++---
- modules/cairo/seed-cairo-image-surface.h |    1 +
- modules/cairo/seed-cairo-surface.c       |    3 ++-
- modules/cairo/seed-cairo.c               |   12 ++++++++----
- modules/os/os.c                          |    4 ++--
+ modules/cairo/Makefile.am                |  1 +
+ modules/cairo/seed-cairo-image-surface.c |  6 +++---
+ modules/cairo/seed-cairo-image-surface.h |  1 +
+ modules/cairo/seed-cairo-surface.c       |  3 ++-
+ modules/cairo/seed-cairo.c               | 12 ++++++++----
+ modules/os/os.c                          |  4 ++--
  6 files changed, 17 insertions(+), 10 deletions(-)
 
 commit b373123acfc732473d631f886b4712aa35f1b7ed
@@ -8297,10 +9658,10 @@ Date:   Thu May 14 04:17:07 2009 -0400
 
     cairo: Implement skeleton cairo.Context class + constructor
 
- modules/cairo/seed-cairo-image-surface.c |    2 +-
- modules/cairo/seed-cairo-surface.c       |   17 ++++---
- modules/cairo/seed-cairo.c               |   80 ++++++++++++++++++++++++++++++
- modules/cairo/seed-cairo.h               |    4 +-
+ modules/cairo/seed-cairo-image-surface.c |  2 +-
+ modules/cairo/seed-cairo-surface.c       | 17 ++++---
+ modules/cairo/seed-cairo.c               | 80 ++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo.h               |  4 +-
  4 files changed, 93 insertions(+), 10 deletions(-)
 
 commit d9ccd897c4e225385b1d410be7883430b5ffbf5e
@@ -8309,8 +9670,8 @@ Date:   Thu May 14 04:10:08 2009 -0400
 
     ClutterPad: Spring example, similar to Processing.
 
- examples/clutter-pad/examples/Makefile.am |    6 +-
- examples/clutter-pad/examples/spring.js   |   92 +++++++++++++++++++++++++++++
+ examples/clutter-pad/examples/Makefile.am |  6 +-
+ examples/clutter-pad/examples/spring.js   | 92 +++++++++++++++++++++++++++++++
  2 files changed, 96 insertions(+), 2 deletions(-)
 
 commit 59c1a36e47aeab872f5ae290f6165b2fe050e922
@@ -8319,7 +9680,7 @@ Date:   Thu May 14 04:00:33 2009 -0400
 
     cairo: Define cairo_format_t enum
 
- modules/cairo/seed-cairo-enums.c |    9 ++++++++-
+ modules/cairo/seed-cairo-enums.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 9fd6990d7dc2f7c611c7e8873ab462ec7d0c5aaf
@@ -8328,10 +9689,10 @@ Date:   Thu May 14 03:58:46 2009 -0400
 
     cairo: Start defining cairo enums
 
- modules/cairo/Makefile.am        |    3 ++-
- modules/cairo/seed-cairo-enums.c |   18 ++++++++++++++++++
- modules/cairo/seed-cairo-enums.h |    5 +++++
- modules/cairo/seed-cairo.c       |    1 +
+ modules/cairo/Makefile.am        |  3 ++-
+ modules/cairo/seed-cairo-enums.c | 18 ++++++++++++++++++
+ modules/cairo/seed-cairo-enums.h |  5 +++++
+ modules/cairo/seed-cairo.c       |  1 +
  4 files changed, 26 insertions(+), 1 deletion(-)
 
 commit bb4e7c57704f6ee75bfa2ee9ef7a5eb6d47c9893
@@ -8340,9 +9701,9 @@ Date:   Thu May 14 03:52:21 2009 -0400
 
     cairo: seed_object_to_cairo_surface should take an exception
 
- modules/cairo/seed-cairo-image-surface.c |    8 ++++----
- modules/cairo/seed-cairo-surface.c       |   33 +++++++++++++++---------------
- modules/cairo/seed-cairo-surface.h       |    2 +-
+ modules/cairo/seed-cairo-image-surface.c |  8 ++++----
+ modules/cairo/seed-cairo-surface.c       | 33 ++++++++++++++++----------------
+ modules/cairo/seed-cairo-surface.h       |  2 +-
  3 files changed, 22 insertions(+), 21 deletions(-)
 
 commit e2601bc01ac76fca4813f6d029f594156b21da48
@@ -8351,11 +9712,11 @@ Date:   Thu May 14 03:47:47 2009 -0400
 
     cairo: Implement cairo_image_surface_t bindings
 
- modules/cairo/Makefile.am                |    3 +-
- modules/cairo/seed-cairo-image-surface.c |  134 ++++++++++++++++++++++++++++++
- modules/cairo/seed-cairo-image-surface.h |    9 ++
- modules/cairo/seed-cairo-surface.c       |   12 ++-
- modules/cairo/seed-cairo-surface.h       |    4 +-
+ modules/cairo/Makefile.am                |   3 +-
+ modules/cairo/seed-cairo-image-surface.c | 134 +++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-image-surface.h |   9 +++
+ modules/cairo/seed-cairo-surface.c       |  12 ++-
+ modules/cairo/seed-cairo-surface.h       |   4 +-
  5 files changed, 158 insertions(+), 4 deletions(-)
 
 commit b8ecabf1e86efd372ba48e2462f2e4385d33553d
@@ -8364,16 +9725,16 @@ Date:   Thu May 14 03:27:19 2009 -0400
 
     Implement cairo_surface_t bindings
 
- configure.ac                       |   20 +++
- libseed/seed-api.c                 |    6 +
- libseed/seed.h                     |    3 +
- modules/Makefile.am                |    2 +-
- modules/cairo/Makefile.am          |   26 +++
- modules/cairo/seed-cairo-surface.c |  350 ++++++++++++++++++++++++++++++++++++
- modules/cairo/seed-cairo-surface.h |    9 +
- modules/cairo/seed-cairo.c         |   33 ++++
- modules/cairo/seed-cairo.h         |   13 ++
- modules/os/os.c                    |    4 +-
+ configure.ac                       |  20 +++
+ libseed/seed-api.c                 |   6 +
+ libseed/seed.h                     |   3 +
+ modules/Makefile.am                |   2 +-
+ modules/cairo/Makefile.am          |  26 +++
+ modules/cairo/seed-cairo-surface.c | 350 +++++++++++++++++++++++++++++++++++++
+ modules/cairo/seed-cairo-surface.h |   9 +
+ modules/cairo/seed-cairo.c         |  33 ++++
+ modules/cairo/seed-cairo.h         |  13 ++
+ modules/os/os.c                    |   4 +-
  10 files changed, 463 insertions(+), 3 deletions(-)
 
 commit eca8717930fa4ec409ed3503b1453fd5a45ecd2d
@@ -8382,9 +9743,9 @@ Date:   Thu May 14 03:22:03 2009 -0400
 
     ClutterPad: editor should use fixed-width font.
 
- examples/clutter-pad/clutter-pad.ui                 |    5 ++++-
- examples/clutter-pad/examples/animated-rectangle.js |    6 +++---
- examples/clutter-pad/main.js                        |    2 ++
+ examples/clutter-pad/clutter-pad.ui                 | 5 ++++-
+ examples/clutter-pad/examples/animated-rectangle.js | 6 +++---
+ examples/clutter-pad/main.js                        | 2 ++
  3 files changed, 9 insertions(+), 4 deletions(-)
 
 commit 005cb0afd0a4d02b5bcb864bb9cbcc26266dc4a5
@@ -8393,7 +9754,7 @@ Date:   Thu May 14 03:11:50 2009 -0400
 
     ClutterPad: fix indentation of animated-rectangle example.
 
- .../clutter-pad/examples/animated-rectangle.js     |   35 ++++++++++----------
+ .../clutter-pad/examples/animated-rectangle.js     | 35 +++++++++++-----------
  1 file changed, 18 insertions(+), 17 deletions(-)
 
 commit 1760f33ec3f5ccd572ca2a8f66e2dbc813cebf82
@@ -8402,7 +9763,7 @@ Date:   Thu May 14 01:21:00 2009 -0400
 
     libseed: Update Seed.js to include gnome-js-common module directory in default search path
 
- extensions/Seed.js |    2 +-
+ extensions/Seed.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a1750f5a1551fc5561cf4b3a61712b578ef298b5
@@ -8411,10 +9772,10 @@ Date:   Wed May 13 23:55:27 2009 -0400
 
     examples: Update clutter using examples to not require [GOject.TYPE_*...in animatev calls
 
- examples/clutter-0.9.js     |   28 +++---
- examples/same-seed/light.js |  212 +++++++++++++++++++++----------------------
- examples/same-seed/score.js |   10 +-
- extensions/Clutter.js       |   32 +++----
+ examples/clutter-0.9.js     |  28 +++---
+ examples/same-seed/light.js | 212 ++++++++++++++++++++++----------------------
+ examples/same-seed/score.js |  10 +--
+ extensions/Clutter.js       |  32 +++----
  4 files changed, 142 insertions(+), 140 deletions(-)
 
 commit ff83d4a17766d0402ed6810f9572e1cb0f7d74eb
@@ -8423,9 +9784,9 @@ Date:   Wed May 13 23:33:19 2009 -0400
 
     libseed: Add GObject.__property_type, for looking up pproperty types, and use this in Clutter.Actor.animatev, so you no longer have to pass [GObject.TYPE_BLA, bla]
 
- .../clutter-pad/examples/animated-rectangle.js     |   10 +++---
- extensions/Clutter.js                              |    4 +--
- libseed/seed-engine.c                              |   36 +++++++++++++++++---
+ .../clutter-pad/examples/animated-rectangle.js     | 10 +++---
+ extensions/Clutter.js                              |  4 +--
+ libseed/seed-engine.c                              | 36 +++++++++++++++++++---
  3 files changed, 39 insertions(+), 11 deletions(-)
 
 commit 092057ed8d939f2f682f9b63aa9b0329e75f5344
@@ -8434,9 +9795,9 @@ Date:   Wed May 13 22:59:35 2009 -0400
 
     Add 'Gst.js' with Gst.Element.prototype.link_many
 
- examples/n-oscillator.js |  139 +++++++++++++++++++++++-----------------------
- extensions/Gst.js        |    8 +++
- extensions/Makefile.am   |    2 +-
+ examples/n-oscillator.js | 139 +++++++++++++++++++++++------------------------
+ extensions/Gst.js        |   8 +++
+ extensions/Makefile.am   |   2 +-
  3 files changed, 78 insertions(+), 71 deletions(-)
 
 commit 7ba47f1f7a09b87f3261bfa4259e7875d2ec0f1c
@@ -8445,7 +9806,7 @@ Date:   Wed May 13 22:04:01 2009 -0400
 
     doc: Add weather example to example index
 
- doc/index.html |    2 ++
+ doc/index.html | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 994aa22f2e5442d905ae5081999c52a7193143a5
@@ -8454,7 +9815,7 @@ Date:   Wed May 13 22:01:27 2009 -0400
 
     seed: Add cluttter-pad.ui to POTFILES.skip
 
- po/POTFILES.skip |    1 +
+ po/POTFILES.skip | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8b3e98da75bc75b374ce7e7551c33bb0bed4b875
@@ -8463,8 +9824,8 @@ Date:   Wed May 13 21:58:09 2009 -0400
 
     tests: Remove obsolete namespace-exception test
 
- tests/javascript/Makefile.am                 |    1 -
- tests/javascript/namespace-exception-test.js |   23 -----------------------
+ tests/javascript/Makefile.am                 |  1 -
+ tests/javascript/namespace-exception-test.js | 23 -----------------------
  2 files changed, 24 deletions(-)
 
 commit f32547d61ae91e35ccab233c1d080d1e9e9c7089
@@ -8473,7 +9834,7 @@ Date:   Wed May 13 21:52:30 2009 -0400
 
     xml: sample.xml is now in the XML examples folder
 
- modules/libxml/Makefile.am |    2 +-
+ modules/libxml/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 02d648416472f92be870b7784ff2e8d82107c353
@@ -8482,7 +9843,7 @@ Date:   Wed May 13 21:45:29 2009 -0400
 
     Weather: Can pass zipcode on command line
 
- examples/xml/weather.js |   23 +++++++++++++++++++++--
+ examples/xml/weather.js | 23 +++++++++++++++++++++--
  1 file changed, 21 insertions(+), 2 deletions(-)
 
 commit 9be1bcfc284968ff890b94da82744880404809fc
@@ -8491,8 +9852,9 @@ Date:   Wed May 13 21:30:41 2009 -0400
 
     Weather: add to Makefile.am
 
- examples/xml/Makefile.am |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ examples/xml/Makefile.am | 6 ++++--
+ examples/xml/weather.js  | 0
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 20124e709deb8f68404e4eb073e6b2d1c50596e5
 Author: Tim Horton <hortont@svn.gnome.org>
@@ -8500,8 +9862,8 @@ Date:   Wed May 13 21:30:09 2009 -0400
 
     Weather: should be in xml folder.
 
- examples/libxml-weather.js |   22 ----------------------
- examples/xml/weather.js    |   22 ++++++++++++++++++++++
+ examples/libxml-weather.js | 22 ----------------------
+ examples/xml/weather.js    | 22 ++++++++++++++++++++++
  2 files changed, 22 insertions(+), 22 deletions(-)
 
 commit 731c01e9645e1174adce147317f2d65f92356fd2
@@ -8510,7 +9872,7 @@ Date:   Wed May 13 21:29:41 2009 -0400
 
     Weather: Now works, prints temperature in Colchester. More soon.
 
- examples/libxml-weather.js |    4 ++--
+ examples/libxml-weather.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 0c0f8aea5aabdc7d4823a9bb8e1172468d1f6efd
@@ -8519,8 +9881,8 @@ Date:   Wed May 13 21:40:43 2009 -0400
 
     clutter-pad: Make the clutter-pad example a little shinier
 
- doc/reference/html/index.html                      |    3 --
- .../clutter-pad/examples/animated-rectangle.js     |   33 +++++++++++++-------
+ doc/reference/html/index.html                      |  3 --
+ .../clutter-pad/examples/animated-rectangle.js     | 33 ++++++++++++++--------
  2 files changed, 21 insertions(+), 15 deletions(-)
 
 commit a42e5988e522fc586e6630ddec404744c90f51e0
@@ -8529,7 +9891,7 @@ Date:   Wed May 13 21:16:09 2009 -0400
 
     xml: Fix crash in seed_xml_xpath_register_ns
 
- modules/libxml/libxml.c |    2 +-
+ modules/libxml/libxml.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ffdb8dbd2f41eea274b1da6c5fe00ad41d748e31
@@ -8538,7 +9900,7 @@ Date:   Wed May 13 21:09:11 2009 -0400
 
     seed: Update ChangeLog
 
- ChangeLog |   22 +++++++++++++---------
+ ChangeLog | 22 +++++++++++++---------
  1 file changed, 13 insertions(+), 9 deletions(-)
 
 commit 12f847ffbcdad02979a12ba0cc71b915100df14b
@@ -8547,7 +9909,7 @@ Date:   Wed May 13 21:05:15 2009 -0400
 
     Weather: initial import of Yahoo Weather XML example.
 
- examples/libxml-weather.js |   22 ++++++++++++++++++++++
+ examples/libxml-weather.js | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 commit ab31a816b2327a83cb6d3afcd983c96b06efbd70
@@ -8556,7 +9918,7 @@ Date:   Wed May 13 21:01:50 2009 -0400
 
     libxml: Someone forgot a Makefile.am
 
- examples/xml/Makefile.am |   15 +++++++++++++++
+ examples/xml/Makefile.am | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 30bc28df9e9807970861a6ee913554519739d37b
@@ -8565,7 +9927,7 @@ Date:   Wed May 13 20:55:57 2009 -0400
 
     seed: Bump version number
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8b8630cfa6501d1d689b6921779725805a4dbdd9
@@ -8574,7 +9936,7 @@ Date:   Wed May 13 20:09:03 2009 -0400
 
     xml: Bind xpath.rxpathRegisterNs
 
- modules/libxml/libxml.c |   34 ++++++++++++++++++++++++++++++++--
+ modules/libxml/libxml.c | 34 ++++++++++++++++++++++++++++++++--
  1 file changed, 32 insertions(+), 2 deletions(-)
 
 commit a63bd90e8422c6608f75ad1eccfd990f405873fc
@@ -8583,7 +9945,7 @@ Date:   Wed May 13 18:29:19 2009 -0400
 
     ClutterPad: Keyboard accelerators. Should be able to do these from GtkBuilder?
 
- examples/clutter-pad/main.js |   18 ++++++++++++++++--
+ examples/clutter-pad/main.js | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
 commit ba6d8c235222ffe37f5472283d19c93ed9687017
@@ -8592,7 +9954,7 @@ Date:   Wed May 13 18:16:14 2009 -0400
 
     ClutterPad: Reset sandboxed context each time the stage is reset
 
- examples/clutter-pad/main.js |    7 +++++--
+ examples/clutter-pad/main.js | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit f2adcd4207a7de64ca9e2064fb2911592bb3ccb2
@@ -8601,7 +9963,7 @@ Date:   Wed May 13 18:03:53 2009 -0400
 
     Pango: Don't fail to clear actor selection if it's clicked twice
 
- examples/pango.js |    6 ++++++
+ examples/pango.js | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 04826575a22199a8199dd68582e47eb1d9c2a723
@@ -8610,8 +9972,8 @@ Date:   Wed May 13 17:35:10 2009 -0400
 
     ClutterPad: Use actions in preparation for keybindings.
 
- examples/clutter-pad/clutter-pad.ui |   28 ++++++++++++++++++++++------
- examples/clutter-pad/main.js        |    8 ++++----
+ examples/clutter-pad/clutter-pad.ui | 28 ++++++++++++++++++++++------
+ examples/clutter-pad/main.js        |  8 ++++----
  2 files changed, 26 insertions(+), 10 deletions(-)
 
 commit 90285092de9e5ecd00fe9f7ebf41224c03abf243
@@ -8620,7 +9982,7 @@ Date:   Wed May 13 17:22:09 2009 -0400
 
     Examples: Update HACKING to include xml examples and the fact that clutter-pad is in its own folder
 
- examples/HACKING |    8 +++++++-
+ examples/HACKING | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit c0a34285933bb02785a1afea49ba3df805d2270d
@@ -8629,7 +9991,7 @@ Date:   Wed May 13 17:15:52 2009 -0400
 
     ClutterPad: Stage default bg color is black
 
- examples/clutter-pad/examples/animated-rectangle.js |    1 -
+ examples/clutter-pad/examples/animated-rectangle.js | 1 -
  1 file changed, 1 deletion(-)
 
 commit adc90184677655fea4ffbd7affba34d870d1b62e
@@ -8638,7 +10000,7 @@ Date:   Wed May 13 17:10:24 2009 -0400
 
     ClutterPad: Fix ability to close file chooser dialogs without a crash
 
- examples/clutter-pad/main.js |   11 +++++++----
+ examples/clutter-pad/main.js | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit f26a9e601812e626f6928a4afee47e659ce54d52
@@ -8647,7 +10009,7 @@ Date:   Wed May 13 16:58:13 2009 -0400
 
     ClutterPad: Expand stage reset to include cursor state
 
- examples/clutter-pad/main.js |    4 +++-
+ examples/clutter-pad/main.js | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit dbfc53636a899bd6843df1b2fb26ced1625db2e1
@@ -8656,7 +10018,7 @@ Date:   Wed May 13 16:53:52 2009 -0400
 
     ClutterPad: Don't destroy GtkBuilt-file dialogs, because they don't come back.
 
- examples/clutter-pad/main.js |    8 ++++----
+ examples/clutter-pad/main.js | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 4e181ce4cf99f3f71a37dcc8513d4db4c0d80c88
@@ -8665,7 +10027,7 @@ Date:   Wed May 13 16:50:18 2009 -0400
 
     ClutterPad: Reset stage background color, default to black
 
- examples/clutter-pad/main.js |   19 +++++++++++++++----
+ examples/clutter-pad/main.js | 19 +++++++++++++++----
  1 file changed, 15 insertions(+), 4 deletions(-)
 
 commit fb6a17eb2b95df6c7b6091ca971e92394d783bbb
@@ -8674,7 +10036,7 @@ Date:   Wed May 13 16:31:13 2009 -0400
 
     Documentation: sort example list
 
- doc/index.html |   58 ++++++++++++++++++++++++++++----------------------------
+ doc/index.html | 58 +++++++++++++++++++++++++++++-----------------------------
  1 file changed, 29 insertions(+), 29 deletions(-)
 
 commit 38b0d3c606d22e1cd7c8e569f818933adc51fbf7
@@ -8683,7 +10045,7 @@ Date:   Wed May 13 16:26:11 2009 -0400
 
     Documentation: ClutterPad is in its own folder; also of note, it shows off GtkBuilder significantly
 
- doc/index.html |    2 +-
+ doc/index.html | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1cc7555614faeb5d886a7fd25e5838e3109aace7
@@ -8692,14 +10054,14 @@ Date:   Wed May 13 15:52:59 2009 -0400
 
     examples: Add three xml module examples. xml-dom, xml-tree, and xml-xpath.
 
- configure.ac              |    1 +
- doc/index.html            |   10 +++++++---
- examples/Makefile.am      |    1 +
- examples/xml/sample.xml   |   12 ++++++++++++
- examples/xml/xml-dom.js   |   16 ++++++++++++++++
- examples/xml/xml-tree.js  |   17 +++++++++++++++++
- examples/xml/xml-xpath.js |    7 +++++++
- modules/libxml/sample.xml |   12 ------------
+ configure.ac              |  1 +
+ doc/index.html            | 10 +++++++---
+ examples/Makefile.am      |  1 +
+ examples/xml/sample.xml   | 12 ++++++++++++
+ examples/xml/xml-dom.js   | 16 ++++++++++++++++
+ examples/xml/xml-tree.js  | 17 +++++++++++++++++
+ examples/xml/xml-xpath.js |  7 +++++++
+ modules/libxml/sample.xml | 12 ------------
  8 files changed, 61 insertions(+), 15 deletions(-)
 
 commit 04ed48bd6c83540bec53a79f0aa0f41547a0768b
@@ -8708,7 +10070,7 @@ Date:   Wed May 13 15:20:42 2009 -0400
 
     dbus: Add support for Synchronous property reading/writing
 
- modules/dbus/dbus.js |   30 ++++++++++++++++++++++++++++++
+ modules/dbus/dbus.js | 30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
 
 commit 53e407002086b58c8319c11e3278007b1b17d1e7
@@ -8717,7 +10079,7 @@ Date:   Wed May 13 11:06:44 2009 -0400
 
     Beginnings of 0.7 changelog.
 
- ChangeLog |   36 ++++++++++++++++++++++++++++++++++--
+ ChangeLog | 36 ++++++++++++++++++++++++++++++++++--
  1 file changed, 34 insertions(+), 2 deletions(-)
 
 commit 38524c70a13a736617db2380ef1d9399f895ba5b
@@ -8726,7 +10088,7 @@ Date:   Wed May 13 10:37:59 2009 -0400
 
     ClutterPad: Extraneous imports.
 
- examples/clutter-pad/main.js |    2 --
+ examples/clutter-pad/main.js | 2 --
  1 file changed, 2 deletions(-)
 
 commit 86644a18a6de71ed1120be29979aff94b8892f8c
@@ -8735,8 +10097,8 @@ Date:   Wed May 13 10:36:39 2009 -0400
 
     ClutterPad: Use GtkBuilder for open/save dialogs.
 
- examples/clutter-pad/clutter-pad.ui |  112 +++++++++++++++++++++++++++++++++++
- examples/clutter-pad/main.js        |   30 ++++------
+ examples/clutter-pad/clutter-pad.ui | 112 ++++++++++++++++++++++++++++++++++++
+ examples/clutter-pad/main.js        |  30 ++++------
  2 files changed, 123 insertions(+), 19 deletions(-)
 
 commit 92e63f6f30d1568f0915aa5a3ee156c38d120c25
@@ -8745,7 +10107,7 @@ Date:   Wed May 13 10:20:37 2009 -0400
 
     ClutterPad: update Makefile to add GtkBuilder file
 
- examples/clutter-pad/Makefile.am |    6 ++++--
+ examples/clutter-pad/Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit e892ca33c18d1a5da431f6c96857031f7c6eb1e8
@@ -8754,8 +10116,8 @@ Date:   Wed May 13 10:18:54 2009 -0400
 
     ClutterPad: Mostly fully functional under GtkBuilder UI.
 
- examples/clutter-pad/clutter-pad.ui |    9 +-
- examples/clutter-pad/main.js        |  258 +++++++++++------------------------
+ examples/clutter-pad/clutter-pad.ui |   9 +-
+ examples/clutter-pad/main.js        | 258 ++++++++++++------------------------
  2 files changed, 91 insertions(+), 176 deletions(-)
 
 commit 714fc1826211453b084b8ffc62aa834899beb4d9
@@ -8764,7 +10126,7 @@ Date:   Wed May 13 09:46:47 2009 -0400
 
     ClutterPad: Apparently we get a consistent segfault just trying to connect signals
 
- examples/clutter-pad/main.js |    2 +-
+ examples/clutter-pad/main.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3a70e185fd9d254ccdc8610b6a000510752b8d71
@@ -8773,8 +10135,8 @@ Date:   Wed May 13 09:46:27 2009 -0400
 
     ClutterPad: Beginnings of GtkBuilder signal connection.
 
- examples/clutter-pad/clutter-pad.ui |    6 +++---
- examples/clutter-pad/main.js        |   18 ++++++++++++++++++
+ examples/clutter-pad/clutter-pad.ui |  6 +++---
+ examples/clutter-pad/main.js        | 18 ++++++++++++++++++
  2 files changed, 21 insertions(+), 3 deletions(-)
 
 commit f470468c9a9bdbaef75eed578b7c0143edfb4dc9
@@ -8783,8 +10145,8 @@ Date:   Wed May 13 09:39:51 2009 -0400
 
     ClutterPad: Scrolled windows
 
- examples/clutter-pad/clutter-pad.ui |   24 ++++++++++++++++++------
- examples/clutter-pad/main.js        |   10 +++++-----
+ examples/clutter-pad/clutter-pad.ui | 24 ++++++++++++++++++------
+ examples/clutter-pad/main.js        | 10 +++++-----
  2 files changed, 23 insertions(+), 11 deletions(-)
 
 commit 9c5458ace64feff04165c46da012464d07c9f9e1
@@ -8793,10 +10155,10 @@ Date:   Wed May 13 09:33:43 2009 -0400
 
     ClutterPad: Beginnings of GtkBuilder port.
 
- examples/clutter-pad/Makefile.am    |   11 ++
- examples/clutter-pad/clutter-pad.js |  239 ---------------------------------
- examples/clutter-pad/clutter-pad.ui |  121 +++++++++++++++++
- examples/clutter-pad/main.js        |  253 +++++++++++++++++++++++++++++++++++
+ examples/clutter-pad/Makefile.am    |  11 ++
+ examples/clutter-pad/clutter-pad.js | 239 ----------------------------------
+ examples/clutter-pad/clutter-pad.ui | 121 +++++++++++++++++
+ examples/clutter-pad/main.js        | 253 ++++++++++++++++++++++++++++++++++++
  4 files changed, 385 insertions(+), 239 deletions(-)
 
 commit e308ba7e301b39cc1948dc917b5dfe337c20d9d0
@@ -8805,17 +10167,17 @@ Date:   Wed May 13 08:54:36 2009 -0400
 
     ClutterPad: Move into separate subdir, in preparation for splitting into multiple files
 
- configure.ac                                       |    3 +-
- examples/COPYING                                   |    1 +
- examples/Makefile.am                               |    4 +-
- examples/clutter-pad-examples/Makefile.am          |   11 -
- .../clutter-pad-examples/animated-rectangle.js     |   18 --
- examples/clutter-pad-examples/pink-stage.js        |    7 -
- examples/clutter-pad.js                            |  239 --------------------
- examples/clutter-pad/clutter-pad.js                |  239 ++++++++++++++++++++
- examples/clutter-pad/examples/Makefile.am          |   11 +
- .../clutter-pad/examples/animated-rectangle.js     |   18 ++
- examples/clutter-pad/examples/pink-stage.js        |    7 +
+ configure.ac                                       |   3 +-
+ examples/COPYING                                   |   1 +
+ examples/Makefile.am                               |   4 +-
+ examples/clutter-pad-examples/Makefile.am          |  11 -
+ .../clutter-pad-examples/animated-rectangle.js     |  18 --
+ examples/clutter-pad-examples/pink-stage.js        |   7 -
+ examples/clutter-pad.js                            | 239 ---------------------
+ examples/clutter-pad/clutter-pad.js                | 239 +++++++++++++++++++++
+ examples/clutter-pad/examples/Makefile.am          |  11 +
+ .../clutter-pad/examples/animated-rectangle.js     |  18 ++
+ examples/clutter-pad/examples/pink-stage.js        |   7 +
  11 files changed, 279 insertions(+), 279 deletions(-)
 
 commit d69a2d775f7093a36b181a605c8eab86fff12513
@@ -8824,9 +10186,9 @@ Date:   Wed May 13 08:48:03 2009 -0400
 
     ClutterPad: Animated rectangle example
 
- examples/clutter-pad-examples/Makefile.am           |    4 ++--
- examples/clutter-pad-examples/animated-rectangle.js |   18 ++++++++++++++++++
- examples/clutter-pad-examples/blue-stage.js         |    7 -------
+ examples/clutter-pad-examples/Makefile.am           |  4 ++--
+ examples/clutter-pad-examples/animated-rectangle.js | 18 ++++++++++++++++++
+ examples/clutter-pad-examples/blue-stage.js         |  7 -------
  3 files changed, 20 insertions(+), 9 deletions(-)
 
 commit 653779521ce91faab979da1141f933739448b2ac
@@ -8835,7 +10197,7 @@ Date:   Wed May 13 08:46:57 2009 -0400
 
     ClutterPad: Update template to include GObject, so animations work
 
- examples/clutter-pad.js |   13 +++++++------
+ examples/clutter-pad.js | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 commit 5daa027c275ae0db93530b5036d0281200976cb7
@@ -8844,7 +10206,7 @@ Date:   Wed May 13 08:42:02 2009 -0400
 
     ClutterPad: Remove actors from stage each evaluation.
 
- examples/clutter-pad.js |    5 +++++
+ examples/clutter-pad.js | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit af0e191b11562e09621c9bd38d19e8618f183329
@@ -8853,7 +10215,7 @@ Date:   Wed May 13 08:38:59 2009 -0400
 
     ClutterPad: Give default "template" on New file.
 
- examples/clutter-pad.js |    2 ++
+ examples/clutter-pad.js | 2 ++
  1 file changed, 2 insertions(+)
 
 commit e3d674dc7e77e5026a5fae56c14fb06d962f95ae
@@ -8862,7 +10224,7 @@ Date:   Wed May 13 08:37:05 2009 -0400
 
     ClutterPad: Only show javascript files in examples dropdown.
 
- examples/clutter-pad.js |    6 +++++-
+ examples/clutter-pad.js | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 9b32bbf8ceaa5213bae8c051b633de23beddc320
@@ -8871,12 +10233,12 @@ Date:   Wed May 13 08:29:57 2009 -0400
 
     ClutterPad: Implement new/open/save file, redo UI, start examples collection.
 
- configure.ac                                |    1 +
- examples/Makefile.am                        |    1 +
- examples/clutter-pad-examples/Makefile.am   |   11 ++
- examples/clutter-pad-examples/blue-stage.js |    7 +
- examples/clutter-pad-examples/pink-stage.js |    7 +
- examples/clutter-pad.js                     |  213 ++++++++++++++++++++++-----
+ configure.ac                                |   1 +
+ examples/Makefile.am                        |   1 +
+ examples/clutter-pad-examples/Makefile.am   |  11 ++
+ examples/clutter-pad-examples/blue-stage.js |   7 +
+ examples/clutter-pad-examples/pink-stage.js |   7 +
+ examples/clutter-pad.js                     | 213 +++++++++++++++++++++++-----
  6 files changed, 201 insertions(+), 39 deletions(-)
 
 commit bb793acb6307d0365edd94b5a004ef8a184eaa5d
@@ -8885,7 +10247,7 @@ Date:   Wed May 13 07:36:43 2009 -0400
 
     Clutter-Shaders: Shaders are a C, not a JavaScript
 
- examples/clutter-shader/ShaderEditor.js |    2 +-
+ examples/clutter-shader/ShaderEditor.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit af95683ecfe2c86aa24b572ea25acd2fcf8476e0
@@ -8894,11 +10256,11 @@ Date:   Wed May 13 06:15:04 2009 -0400
 
     Build: Update build system to match test reorganization.
 
- configure.ac                         |    3 +++
- tests/javascript/Makefile.am         |   26 +++-----------------------
- tests/javascript/gtypes/Makefile.am  |    9 +++++++++
- tests/javascript/signals/Makefile.am |    9 +++++++++
- tests/javascript/structs/Makefile.am |    9 +++++++++
+ configure.ac                         |  3 +++
+ tests/javascript/Makefile.am         | 26 +++-----------------------
+ tests/javascript/gtypes/Makefile.am  |  9 +++++++++
+ tests/javascript/signals/Makefile.am |  9 +++++++++
+ tests/javascript/structs/Makefile.am |  9 +++++++++
  5 files changed, 33 insertions(+), 23 deletions(-)
 
 commit d48f73c4f9692ed0cde61af36d0648e9651b574e
@@ -8907,7 +10269,7 @@ Date:   Wed May 13 06:05:51 2009 -0400
 
     Tests: run-tests script should only output filename, not full path
 
- tests/run-tests.py |   12 ++++++------
+ tests/run-tests.py | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 538606ce3bcd86a33d0b30b84ccecafee257b34d
@@ -8916,50 +10278,50 @@ Date:   Wed May 13 06:05:33 2009 -0400
 
     Tests: Move three obvious sets of related tests into subdirectories
 
- tests/javascript/gtype-class-init-exception.js     |   23 --------------
- tests/javascript/gtype-property-construct.js       |   30 ------------------
- tests/javascript/gtype-property.js                 |   31 ------------------
- tests/javascript/gtype-signal-args.js              |   29 -----------------
- tests/javascript/gtype-signal.js                   |   24 --------------
- tests/javascript/gtype-typerror.js                 |   17 ----------
- tests/javascript/gtype.js                          |   33 --------------------
- .../gtypes/gtype-class-init-exception.js           |   23 ++++++++++++++
- .../javascript/gtypes/gtype-property-construct.js  |   30 ++++++++++++++++++
- tests/javascript/gtypes/gtype-property.js          |   31 ++++++++++++++++++
- tests/javascript/gtypes/gtype-signal-args.js       |   29 +++++++++++++++++
- tests/javascript/gtypes/gtype-signal.js            |   24 ++++++++++++++
- tests/javascript/gtypes/gtype-typerror.js          |   17 ++++++++++
- tests/javascript/gtypes/gtype.js                   |   33 ++++++++++++++++++++
- tests/javascript/signal-connect.js                 |   21 -------------
- tests/javascript/signal-disconnect.js              |   18 -----------
- tests/javascript/signal-exception.js               |   13 --------
- tests/javascript/signal-expects.js                 |   17 ----------
- tests/javascript/signal-invalid.js                 |   10 ------
- tests/javascript/signal-nofunc.js                  |   15 ---------
- tests/javascript/signal-userdata.js                |   17 ----------
- tests/javascript/signal.js                         |   18 -----------
- tests/javascript/signals/signal-connect.js         |   21 +++++++++++++
- tests/javascript/signals/signal-disconnect.js      |   18 +++++++++++
- tests/javascript/signals/signal-exception.js       |   13 ++++++++
- tests/javascript/signals/signal-expects.js         |   17 ++++++++++
- tests/javascript/signals/signal-invalid.js         |   10 ++++++
- tests/javascript/signals/signal-nofunc.js          |   15 +++++++++
- tests/javascript/signals/signal-userdata.js        |   17 ++++++++++
- tests/javascript/signals/signal.js                 |   18 +++++++++++
- tests/javascript/struct-constructor.js             |   13 --------
- tests/javascript/struct-enumerate.js               |   13 --------
- tests/javascript/struct-functions.js               |   11 -------
- tests/javascript/struct-nested-set.js              |   18 -----------
- tests/javascript/struct-offsets.js                 |   13 --------
- tests/javascript/struct-set-member.js              |   12 -------
- tests/javascript/struct-union-enumerate.js         |   22 -------------
- tests/javascript/structs/struct-constructor.js     |   13 ++++++++
- tests/javascript/structs/struct-enumerate.js       |   13 ++++++++
- tests/javascript/structs/struct-functions.js       |   11 +++++++
- tests/javascript/structs/struct-nested-set.js      |   18 +++++++++++
- tests/javascript/structs/struct-offsets.js         |   13 ++++++++
- tests/javascript/structs/struct-set-member.js      |   12 +++++++
- tests/javascript/structs/struct-union-enumerate.js |   22 +++++++++++++
+ tests/javascript/gtype-class-init-exception.js     | 23 ---------------
+ tests/javascript/gtype-property-construct.js       | 30 --------------------
+ tests/javascript/gtype-property.js                 | 31 --------------------
+ tests/javascript/gtype-signal-args.js              | 29 -------------------
+ tests/javascript/gtype-signal.js                   | 24 ----------------
+ tests/javascript/gtype-typerror.js                 | 17 -----------
+ tests/javascript/gtype.js                          | 33 ----------------------
+ .../gtypes/gtype-class-init-exception.js           | 23 +++++++++++++++
+ .../javascript/gtypes/gtype-property-construct.js  | 30 ++++++++++++++++++++
+ tests/javascript/gtypes/gtype-property.js          | 31 ++++++++++++++++++++
+ tests/javascript/gtypes/gtype-signal-args.js       | 29 +++++++++++++++++++
+ tests/javascript/gtypes/gtype-signal.js            | 24 ++++++++++++++++
+ tests/javascript/gtypes/gtype-typerror.js          | 17 +++++++++++
+ tests/javascript/gtypes/gtype.js                   | 33 ++++++++++++++++++++++
+ tests/javascript/signal-connect.js                 | 21 --------------
+ tests/javascript/signal-disconnect.js              | 18 ------------
+ tests/javascript/signal-exception.js               | 13 ---------
+ tests/javascript/signal-expects.js                 | 17 -----------
+ tests/javascript/signal-invalid.js                 | 10 -------
+ tests/javascript/signal-nofunc.js                  | 15 ----------
+ tests/javascript/signal-userdata.js                | 17 -----------
+ tests/javascript/signal.js                         | 18 ------------
+ tests/javascript/signals/signal-connect.js         | 21 ++++++++++++++
+ tests/javascript/signals/signal-disconnect.js      | 18 ++++++++++++
+ tests/javascript/signals/signal-exception.js       | 13 +++++++++
+ tests/javascript/signals/signal-expects.js         | 17 +++++++++++
+ tests/javascript/signals/signal-invalid.js         | 10 +++++++
+ tests/javascript/signals/signal-nofunc.js          | 15 ++++++++++
+ tests/javascript/signals/signal-userdata.js        | 17 +++++++++++
+ tests/javascript/signals/signal.js                 | 18 ++++++++++++
+ tests/javascript/struct-constructor.js             | 13 ---------
+ tests/javascript/struct-enumerate.js               | 13 ---------
+ tests/javascript/struct-functions.js               | 11 --------
+ tests/javascript/struct-nested-set.js              | 18 ------------
+ tests/javascript/struct-offsets.js                 | 13 ---------
+ tests/javascript/struct-set-member.js              | 12 --------
+ tests/javascript/struct-union-enumerate.js         | 22 ---------------
+ tests/javascript/structs/struct-constructor.js     | 13 +++++++++
+ tests/javascript/structs/struct-enumerate.js       | 13 +++++++++
+ tests/javascript/structs/struct-functions.js       | 11 ++++++++
+ tests/javascript/structs/struct-nested-set.js      | 18 ++++++++++++
+ tests/javascript/structs/struct-offsets.js         | 13 +++++++++
+ tests/javascript/structs/struct-set-member.js      | 12 ++++++++
+ tests/javascript/structs/struct-union-enumerate.js | 22 +++++++++++++++
  44 files changed, 418 insertions(+), 418 deletions(-)
 
 commit 251445e616332d8afbe8d5fc148cb14e64c62a28
@@ -8968,7 +10330,7 @@ Date:   Wed May 13 05:57:26 2009 -0400
 
     Tests: Run tests multiple times if strange Popen error happens.
 
- tests/run-tests.py |   67 ++++++++++++++++++++++++++++------------------------
+ tests/run-tests.py | 67 +++++++++++++++++++++++++++++-------------------------
  1 file changed, 36 insertions(+), 31 deletions(-)
 
 commit 36f67c22dfc97aeb92cc44dd85ce77bb64fdb79f
@@ -8977,9 +10339,9 @@ Date:   Wed May 13 05:49:41 2009 -0400
 
     Clean up some C-side warnings.
 
- libseed/seed-signals.c   |    2 +-
- modules/dbus/util/dbus.c |    5 +++--
- modules/libxml/libxml.c  |    6 +++---
+ libseed/seed-signals.c   | 2 +-
+ modules/dbus/util/dbus.c | 5 +++--
+ modules/libxml/libxml.c  | 6 +++---
  3 files changed, 7 insertions(+), 6 deletions(-)
 
 commit 3016e8aeeb239d9e1dec0f7f666ff07ea7c8f20f
@@ -8988,7 +10350,7 @@ Date:   Wed May 13 05:44:54 2009 -0400
 
     Build: Distribute release notes.
 
- Makefile.am |    1 +
+ Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 145ec11a38576b9711f81e03a1b1e599c330459e
@@ -8997,7 +10359,7 @@ Date:   Wed May 13 05:43:39 2009 -0400
 
     Build: Distribute the overall documentation index.
 
- doc/Makefile.am |    3 ++-
+ doc/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 421cdce4d14493ac7fa66a73309409517b096a13
@@ -9006,7 +10368,7 @@ Date:   Wed May 13 05:41:01 2009 -0400
 
     Build: Release checker should use current version number, not 0.5
 
- tools/check-release.sh |    2 +-
+ tools/check-release.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6b1db2daa7965f825eeb61ad7408735f35f0a9bd
@@ -9015,7 +10377,7 @@ Date:   Wed May 13 05:39:04 2009 -0400
 
     Build: Add dbus/utils to configure.ac
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit 370f16deac6b1caef5bf7723bdb92aa3c6f0739d
@@ -9024,8 +10386,8 @@ Date:   Wed May 13 05:36:08 2009 -0400
 
     Build: Make sure to distribute the headers in modules/dbus/util
 
- modules/dbus/Makefile.am      |    2 ++
- modules/dbus/util/Makefile.am |    5 +++++
+ modules/dbus/Makefile.am      | 2 ++
+ modules/dbus/util/Makefile.am | 5 +++++
  2 files changed, 7 insertions(+)
 
 commit e77314e8b2e9cc7c2b35477f30503f450682b98e
@@ -9034,10 +10396,10 @@ Date:   Wed May 13 05:33:10 2009 -0400
 
     Build: Add various missing files to EXTRA_DIST.
 
- doc/modules/Makefile.am             |    2 +-
- examples/clutter-shader/Makefile.am |    2 ++
- modules/dbus/Makefile.am            |    5 ++++-
- modules/libxml/Makefile.am          |    3 ++-
+ doc/modules/Makefile.am             | 2 +-
+ examples/clutter-shader/Makefile.am | 2 ++
+ modules/dbus/Makefile.am            | 5 ++++-
+ modules/libxml/Makefile.am          | 3 ++-
  4 files changed, 9 insertions(+), 3 deletions(-)
 
 commit 0ae8a0f07e23de6bc7682beeb3bfeed6014e73c2
@@ -9046,7 +10408,7 @@ Date:   Wed May 13 05:26:20 2009 -0400
 
     Examples: DBUS examples are no longer toplevel
 
- examples/Makefile.am |    2 --
+ examples/Makefile.am | 2 --
  1 file changed, 2 deletions(-)
 
 commit c152a46536eccaf765f55be61c8f03df325e2742
@@ -9055,7 +10417,7 @@ Date:   Wed May 13 05:24:42 2009 -0400
 
     Documentation: Don't distribute the nonexistent seed.types file
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bbe9aefa9f45bb4f7aee19fb53d3ab7b93ab5eb5
@@ -9064,7 +10426,7 @@ Date:   Wed May 13 04:53:28 2009 -0400
 
     Pango: Steal keyboard focus
 
- examples/pango.js |    3 +++
+ examples/pango.js | 3 +++
  1 file changed, 3 insertions(+)
 
 commit bc7191fd2e65fbe7019830752efeb736c033c2b3
@@ -9073,7 +10435,7 @@ Date:   Wed May 13 04:49:58 2009 -0400
 
     Pango: Much cleanup, commenting, etc.
 
- examples/pango.js |  143 ++++++++++++++++++++++++++---------------------------
+ examples/pango.js | 143 +++++++++++++++++++++++++++---------------------------
  1 file changed, 71 insertions(+), 72 deletions(-)
 
 commit 785b2e6b8041185a6a17c4a11338cb5ec2e0d013
@@ -9082,7 +10444,7 @@ Date:   Wed May 13 04:26:24 2009 -0400
 
     Pango: Consistency in naming; these are actors, not widgets.
 
- examples/pango.js |   46 +++++++++++++++++++++++-----------------------
+ examples/pango.js | 46 +++++++++++++++++++++++-----------------------
  1 file changed, 23 insertions(+), 23 deletions(-)
 
 commit a791678aff95950ede97889189f691781be22aed
@@ -9091,7 +10453,7 @@ Date:   Wed May 13 04:25:10 2009 -0400
 
     Pango: New button should be last; raise selected actor.
 
- examples/pango.js |   12 ++++++++----
+ examples/pango.js | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit 6d98aeafe963831c50e8afde07f52527ae5be363
@@ -9100,7 +10462,7 @@ Date:   Wed May 13 04:21:55 2009 -0400
 
     Pango: Implement delete and clear all; default intro text
 
- examples/pango.js |   57 +++++++++++++++++++++++++++++++++++++++++++++++------
+ examples/pango.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 51 insertions(+), 6 deletions(-)
 
 commit 3fbd5f233f9c75ac28f7b055e4f5a90fbde287b3
@@ -9109,7 +10471,7 @@ Date:   Wed May 13 04:07:16 2009 -0400
 
     Pango: Implement in-place editing and color selection.
 
- examples/pango.js |   45 ++++++++++++++++++++++++++++++++++++++-------
+ examples/pango.js | 45 ++++++++++++++++++++++++++++++++++++++-------
  1 file changed, 38 insertions(+), 7 deletions(-)
 
 commit 424b97dde4e04ebf68ac2f6078adb8ed6754158b
@@ -9118,7 +10480,7 @@ Date:   Wed May 13 03:01:24 2009 -0400
 
     Pango: Fix save/load with float font sizes.
 
- examples/pango.js |   14 ++++++++------
+ examples/pango.js | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit f256b49720591ca0333c2e55f7752988f3d11402
@@ -9127,7 +10489,7 @@ Date:   Wed May 13 02:54:06 2009 -0400
 
     Pango: Use a slider for font size.
 
- examples/pango.js |   26 ++++++++++++++++----------
+ examples/pango.js | 26 ++++++++++++++++----------
  1 file changed, 16 insertions(+), 10 deletions(-)
 
 commit e2caec7e71191c8bec5d06f6391774c31c7d212a
@@ -9136,7 +10498,7 @@ Date:   Wed May 13 02:43:40 2009 -0400
 
     Pango: Remove old, dead code from the first revision.
 
- examples/pango.js |   79 -----------------------------------------------------
+ examples/pango.js | 79 -------------------------------------------------------
  1 file changed, 79 deletions(-)
 
 commit b82623c80d7354985d82693a1f0c3b43beebab98
@@ -9145,7 +10507,7 @@ Date:   Wed May 13 02:43:03 2009 -0400
 
     Pango: Implement committing font face + size properties.
 
- examples/pango.js |   18 ++++++++++++++++++
+ examples/pango.js | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 21da2baa7401ff6b34409c76c7e0fd982edf29e9
@@ -9154,7 +10516,7 @@ Date:   Wed May 13 02:36:25 2009 -0400
 
     Pango: Implement font selector and loading of font face + size.
 
- examples/pango.js |   81 +++++++++++++++++++++++++----------------------------
+ examples/pango.js | 81 ++++++++++++++++++++++++++-----------------------------
  1 file changed, 38 insertions(+), 43 deletions(-)
 
 commit 210a41fa9729d4b141be52c47fed4e62433148da
@@ -9163,7 +10525,7 @@ Date:   Wed May 13 02:27:59 2009 -0400
 
     Pango: Implement loading/saving text property.
 
- examples/pango.js |   20 +++++++++++++++++---
+ examples/pango.js | 20 +++++++++++++++++---
  1 file changed, 17 insertions(+), 3 deletions(-)
 
 commit 24c4f6e52ed021b0bccba8be0dc9072c6a3aa342
@@ -9172,7 +10534,7 @@ Date:   Wed May 13 02:23:05 2009 -0400
 
     Pango: Implement draggable actors.
 
- examples/pango.js |   81 ++++++++++++++++++++++++++++++++++++++++++++---------
+ examples/pango.js | 81 ++++++++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 68 insertions(+), 13 deletions(-)
 
 commit 5836610f6409e7560f65106b6f73c7e642558144
@@ -9181,9 +10543,9 @@ Date:   Wed May 13 02:18:54 2009 -0400
 
     examples: Some cleanup to the DBus examples, shorten the code of the NetworkManager one a good bit
 
- examples/dbus/dbus-banshee.js        |   23 +++++++++++------------
- examples/dbus/dbus-consolekit.js     |   11 ++++++-----
- examples/dbus/dbus-networkmanager.js |   29 ++++++++++++-----------------
+ examples/dbus/dbus-banshee.js        | 23 +++++++++++------------
+ examples/dbus/dbus-consolekit.js     | 11 ++++++-----
+ examples/dbus/dbus-networkmanager.js | 29 ++++++++++++-----------------
  3 files changed, 29 insertions(+), 34 deletions(-)
 
 commit 21d8a683f3c3f333e997091dc382f1d1927b8df0
@@ -9192,7 +10554,7 @@ Date:   Wed May 13 02:10:17 2009 -0400
 
     examples: Install dbus examples
 
- examples/dbus/Makefile.am |   18 ++++++++++++++++++
+ examples/dbus/Makefile.am | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 9779c339d3d0943c43746f1a030de00eb737a218
@@ -9212,7 +10574,7 @@ Date:   Wed May 13 02:03:27 2009 -0400
 
     dbus: Need to set length property on 'array' return values, or make them real arrays, but that is a task for later
 
- modules/dbus/dbus-values.c |    5 +++++
+ modules/dbus/dbus-values.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 0c11fe066d54727da1b174ee537fe2f9e909f7c3
@@ -9221,12 +10583,12 @@ Date:   Wed May 13 01:13:19 2009 -0400
 
     examples: Move dbus examples in to folder
 
- configure.ac                     |    1 +
- examples/Makefile.am             |    3 +-
- examples/dbus-banshee.js         |   56 -------------------------------------
- examples/dbus-consolekit.js      |   57 --------------------------------------
- examples/dbus/dbus-banshee.js    |   56 +++++++++++++++++++++++++++++++++++++
- examples/dbus/dbus-consolekit.js |   57 ++++++++++++++++++++++++++++++++++++++
+ configure.ac                     |  1 +
+ examples/Makefile.am             |  3 +--
+ examples/dbus-banshee.js         | 56 ---------------------------------------
+ examples/dbus-consolekit.js      | 57 ----------------------------------------
+ examples/dbus/dbus-banshee.js    | 56 +++++++++++++++++++++++++++++++++++++++
+ examples/dbus/dbus-consolekit.js | 57 ++++++++++++++++++++++++++++++++++++++++
  6 files changed, 115 insertions(+), 115 deletions(-)
 
 commit 2d22388e318c7bb5ecd0df4f2b2d85d07bcc62a8
@@ -9235,7 +10597,7 @@ Date:   Wed May 13 01:32:42 2009 -0400
 
     Testing: More os.path.join in run-tests.py, so tests should work on Windows
 
- tests/run-tests.py |    4 ++--
+ tests/run-tests.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c8ad62896c6729d63cd29777a50917a8d0f66a70
@@ -9244,7 +10606,7 @@ Date:   Wed May 13 01:28:06 2009 -0400
 
     Testing: Test script should recursively scan javascript subdir for tests, for organizational purposes.
 
- tests/run-tests.py |   96 +++++++++++++++++++++++++++-------------------------
+ tests/run-tests.py | 96 ++++++++++++++++++++++++++++--------------------------
  1 file changed, 49 insertions(+), 47 deletions(-)
 
 commit 52f85a828777e932191cc0f70d325e15da9c27c2
@@ -9253,8 +10615,8 @@ Date:   Wed May 13 01:09:27 2009 -0400
 
     xml: Bind xmlParseMemory as xml.parseString
 
- doc/index.html          |    2 +-
- modules/libxml/libxml.c |   36 ++++++++++++++++++++++++++++++++++++
+ doc/index.html          |  2 +-
+ modules/libxml/libxml.c | 36 ++++++++++++++++++++++++++++++++++++
  2 files changed, 37 insertions(+), 1 deletion(-)
 
 commit e808359befd5c20292822fe5f3752bfd342faa40
@@ -9263,8 +10625,8 @@ Date:   Wed May 13 01:03:16 2009 -0400
 
     doc: Add libxml module to the documentation index
 
- doc/index.html                |    4 ++++
- doc/reference/html/index.html |    2 +-
+ doc/index.html                | 4 ++++
+ doc/reference/html/index.html | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit ea5486539f4db8646cc8cfeca08bf89e4ab38558
@@ -9273,7 +10635,7 @@ Date:   Wed May 13 00:59:28 2009 -0400
 
     Add URL to Seed documentation on gnome.org to docs
 
- doc/reference/seed-docs.sgml |    2 +-
+ doc/reference/seed-docs.sgml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f397068d94b69da227fad96530ffb8f98a1ce0f4
@@ -9282,10 +10644,10 @@ Date:   Wed May 13 00:57:34 2009 -0400
 
     libseed: Add tests for getting invalid signals, and for disconnecting signals
 
- libseed/seed-signals.c                |    5 +----
- tests/javascript/Makefile.am          |    2 ++
- tests/javascript/signal-disconnect.js |   18 ++++++++++++++++++
- tests/javascript/signal-invalid.js    |   10 ++++++++++
+ libseed/seed-signals.c                |  5 +----
+ tests/javascript/Makefile.am          |  2 ++
+ tests/javascript/signal-disconnect.js | 18 ++++++++++++++++++
+ tests/javascript/signal-invalid.js    | 10 ++++++++++
  4 files changed, 31 insertions(+), 4 deletions(-)
 
 commit 2eb16d32ebdbdcbafbe3dfd8c4c37668af6b364c
@@ -9294,8 +10656,8 @@ Date:   Wed May 13 00:50:27 2009 -0400
 
     tests: Add test for connecting non functions to signals
 
- tests/javascript/Makefile.am      |    1 +
- tests/javascript/signal-nofunc.js |   15 +++++++++++++++
+ tests/javascript/Makefile.am      |  1 +
+ tests/javascript/signal-nofunc.js | 15 +++++++++++++++
  2 files changed, 16 insertions(+)
 
 commit 00a5865da3bdcbb3d7288fed9c97ee8d82c33216
@@ -9304,7 +10666,7 @@ Date:   Wed May 13 00:47:45 2009 -0400
 
     libseed: seed_signal_holder_get_property should return NULL if signal_name is not a signal, which will forward the get propert request to JSC
 
- libseed/seed-signals.c |   15 +++++++++++++--
+ libseed/seed-signals.c | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 commit 52165b4fb62009e6d5835823eee6c662e26f36cb
@@ -9313,7 +10675,7 @@ Date:   Wed May 13 00:41:33 2009 -0400
 
     libseed: Signal holder class should use prototypes and static functions to save memory and construction time
 
- libseed/seed-signals.c |   30 +++++++++---------------------
+ libseed/seed-signals.c | 30 +++++++++---------------------
  1 file changed, 9 insertions(+), 21 deletions(-)
 
 commit aaadfeab5191f9b70bf93d093e9eaa77917f4a24
@@ -9322,8 +10684,8 @@ Date:   Wed May 13 00:38:50 2009 -0400
 
     libseed: Implement signal disconnection
 
- libseed/seed-signals.c |   76 +++++++++++++++++++++++++++++++++++-------------
- libseed/seed-signals.h |   12 ++++----
+ libseed/seed-signals.c | 76 +++++++++++++++++++++++++++++++++++++-------------
+ libseed/seed-signals.h | 12 ++++----
  2 files changed, 62 insertions(+), 26 deletions(-)
 
 commit 774cc2f5e705a2333cc12d8d3a550ced6c8251e3
@@ -9332,7 +10694,7 @@ Date:   Wed May 13 00:27:14 2009 -0400
 
     libseed: Attempting to connect a signal to something which is not a function should throw a signal at CONNECTION time
 
- libseed/seed-signals.c |   21 +++++++++++++++++++++
+ libseed/seed-signals.c | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
 
 commit 417207799fddecc82a3206d0956fac66b5f93ad3
@@ -9341,11 +10703,11 @@ Date:   Wed May 13 00:19:42 2009 -0400
 
     Reorganize documentation some more, add a new section for SeedContext, add some more functions, etc...
 
- doc/reference/html/index.html       |    3 ++
- doc/reference/seed-docs.sgml        |    1 +
- doc/reference/seed-sections.txt     |   36 +++++++++-----
- doc/reference/tmpl/seed-unused.sgml |   48 +++++++++++++++++++
- doc/reference/tmpl/seed.sgml        |   90 -----------------------------------
+ doc/reference/html/index.html       |  3 ++
+ doc/reference/seed-docs.sgml        |  1 +
+ doc/reference/seed-sections.txt     | 36 +++++++++------
+ doc/reference/tmpl/seed-unused.sgml | 48 ++++++++++++++++++++
+ doc/reference/tmpl/seed.sgml        | 90 -------------------------------------
  5 files changed, 75 insertions(+), 103 deletions(-)
 
 commit b5091d847bd043d0f8fd9991865413d55e212e0c
@@ -9356,11 +10718,11 @@ Date:   Wed May 13 00:12:29 2009 -0400
     
     Now with more GObject, a picture of Bob of the correct size (smaller tarball, too), much cleaner overall. No more unused tab view, etc.
 
- examples/clutter-shader/ShaderEditor.js |   48 ++++++++++++++++++
- examples/clutter-shader/ShaderView.js   |   81 +++++++++++++++++--------------
- examples/clutter-shader/bob.jpg         |  Bin 59229 -> 26580 bytes
- examples/clutter-shader/default.glsl    |    2 +-
- examples/clutter-shader/main.js         |   51 +++++++------------
+ examples/clutter-shader/ShaderEditor.js |  48 +++++++++++++++++++
+ examples/clutter-shader/ShaderView.js   |  81 +++++++++++++++++---------------
+ examples/clutter-shader/bob.jpg         | Bin 59229 -> 26580 bytes
+ examples/clutter-shader/default.glsl    |   2 +-
+ examples/clutter-shader/main.js         |  51 +++++++-------------
  5 files changed, 110 insertions(+), 72 deletions(-)
 
 commit 0b632e6a2252658aa7e64e1518856c606b1b2a2b
@@ -9369,10 +10731,10 @@ Date:   Tue May 12 22:15:22 2009 -0400
 
     doc: Clean up the GTK-doc a lot, split things in to chapters, etc...
 
- doc/reference/html/index.html   |   20 ++-
- doc/reference/seed-docs.sgml    |   11 +-
- doc/reference/seed-sections.txt |   73 +++++----
- doc/reference/tmpl/seed.sgml    |  311 ---------------------------------------
+ doc/reference/html/index.html   |  20 ++-
+ doc/reference/seed-docs.sgml    |  11 +-
+ doc/reference/seed-sections.txt |  73 +++++-----
+ doc/reference/tmpl/seed.sgml    | 311 ----------------------------------------
  4 files changed, 64 insertions(+), 351 deletions(-)
 
 commit 693b6d3f7ce2703ad36a743c0c8d5c67d6402ce2
@@ -9381,9 +10743,9 @@ Date:   Tue May 12 21:57:53 2009 -0400
 
     doc: Some reorganization of seed-sections.txt
 
- doc/reference/seed-sections.txt |   12 +++++
- doc/reference/tmpl/seed.sgml    |   94 +++++++++++++++++++++++++++++++++++++++
- libseed/seed-api.c              |    2 +-
+ doc/reference/seed-sections.txt | 12 ++++++
+ doc/reference/tmpl/seed.sgml    | 94 +++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-api.c              |  2 +-
  3 files changed, 107 insertions(+), 1 deletion(-)
 
 commit 93abfdf3ce803bc04d0ad92d6a86706546f606c3
@@ -9392,8 +10754,8 @@ Date:   Tue May 12 21:47:06 2009 -0400
 
     docs: Fix GTK-doc build by not passing --rebuild-types to gtkdoc-scan
 
- doc/reference/Makefile.am    |    6 +++---
- doc/reference/tmpl/seed.sgml |    1 +
+ doc/reference/Makefile.am    | 6 +++---
+ doc/reference/tmpl/seed.sgml | 1 +
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit 4d24a1b844bbcd887f0366e971b450528bc869c8
@@ -9402,7 +10764,7 @@ Date:   Tue May 12 21:36:04 2009 -0400
 
     libseed: Document the API additions since last release
 
- libseed/seed-api.c |   47 +++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-api.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 47 insertions(+)
 
 commit d72d301298c0b2e74fea7dcb25bf55efbc1c966c
@@ -9411,7 +10773,7 @@ Date:   Tue May 12 15:15:00 2009 -0400
 
     xml: Implement node.getAttribute
 
- modules/libxml/xml.js |    9 +++++++++
+ modules/libxml/xml.js | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 8185b18125b663a67ec7b345c5c7de2de27144d1
@@ -9420,7 +10782,7 @@ Date:   Tue May 12 15:12:15 2009 -0400
 
     xml: Implement node.getElementsByTagName
 
- modules/libxml/xml.js |   13 ++++++++++++-
+ modules/libxml/xml.js | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 commit bb30aa1ad3847b0254b01e18fa83660ef4bbc20d
@@ -9429,7 +10791,7 @@ Date:   Tue May 12 15:04:31 2009 -0400
 
     xml: Expose xml._nodeProto
 
- modules/libxml/libxml.c |   13 +++++++++++--
+ modules/libxml/libxml.c | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit 14d0cb1adb24c6115d6e49224002bb6552ed56ea
@@ -9438,8 +10800,8 @@ Date:   Tue May 12 14:55:30 2009 -0400
 
     libseed: Add seed_object_get_prototype to the public API
 
- libseed/seed-api.c |    6 ++++++
- libseed/seed.h     |    3 +++
+ libseed/seed-api.c | 6 ++++++
+ libseed/seed.h     | 3 +++
  2 files changed, 9 insertions(+)
 
 commit e5b873cc20187421bc2ccd6020c97ff5748e2960
@@ -9448,9 +10810,9 @@ Date:   Tue May 12 14:52:39 2009 -0400
 
     xml: Add an xml.js extension which will implement things like getElementsByTagName, etc...
 
- modules/libxml/Makefile.am |    3 +++
- modules/libxml/libxml.c    |    3 +++
- modules/libxml/xml.js      |    1 +
+ modules/libxml/Makefile.am | 3 +++
+ modules/libxml/libxml.c    | 3 +++
+ modules/libxml/xml.js      | 1 +
  3 files changed, 7 insertions(+)
 
 commit f74c53673542ebb8fdf0f803cfc3a241d2c28e63
@@ -9459,7 +10821,7 @@ Date:   Tue May 12 13:02:24 2009 -0400
 
     XPathContext objects should keep their respective XMLDocument object alive
 
- modules/libxml/libxml.c |    4 ++++
+ modules/libxml/libxml.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 4bf65a4d18a7b62a5112b41afe7f71cd8ef794a2
@@ -9468,7 +10830,7 @@ Date:   Tue May 12 04:24:57 2009 -0400
 
     Update examples' Makefile.am, sort it, etc.
 
- examples/Makefile.am |   86 ++++++++++++++++++++++++++------------------------
+ examples/Makefile.am | 86 +++++++++++++++++++++++++++-------------------------
  1 file changed, 45 insertions(+), 41 deletions(-)
 
 commit 7e294570b577b125eedd0385f69e067ea514d869
@@ -9477,7 +10839,7 @@ Date:   Tue May 12 04:19:56 2009 -0400
 
     Another %d->%zd size_t fix.
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5e4af4250c36c4505b0e3f14082b5918ae4b10a1
@@ -9488,9 +10850,9 @@ Date:   Tue May 12 04:16:38 2009 -0400
     
     Unfortunately, we don't seem to have cogl_set_source_color*, so it doesn't work yet.
 
- examples/clutter-cogl-0.8.js |  126 ++++++++++++++++++++++++++++++++++++++++++
- examples/clutter-cogl-0.9.js |  109 ++++++++++++++++++++++++++++++++++++
- examples/clutter-cogl.js     |  126 ------------------------------------------
+ examples/clutter-cogl-0.8.js | 126 +++++++++++++++++++++++++++++++++++++++++++
+ examples/clutter-cogl-0.9.js | 109 +++++++++++++++++++++++++++++++++++++
+ examples/clutter-cogl.js     | 126 -------------------------------------------
  3 files changed, 235 insertions(+), 126 deletions(-)
 
 commit 01299d7014a57296215c358b147bb91e0a78413f
@@ -9499,7 +10861,7 @@ Date:   Tue May 12 03:43:22 2009 -0400
 
     examples: DBus-consolekit example should still use async calls
 
- examples/dbus-consolekit.js |    8 +++++++-
+ examples/dbus-consolekit.js | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 8c8d7f54ee37f8bdfef49f6f8bf20b59e01d8057
@@ -9508,9 +10870,9 @@ Date:   Tue May 12 03:42:10 2009 -0400
 
     DBus: Add support for synchronous calls
 
- examples/dbus-consolekit.js |    8 +------
- modules/dbus/dbus.js        |   51 +++++++++++++++++++++++++++++++++++++++++++
- modules/dbus/module.c       |   10 +++++----
+ examples/dbus-consolekit.js |  8 +------
+ modules/dbus/dbus.js        | 51 +++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c       | 10 +++++----
  3 files changed, 58 insertions(+), 11 deletions(-)
 
 commit d87053c6267b6a61a7702a90fb0be15dc3542a49
@@ -9519,17 +10881,17 @@ Date:   Tue May 12 03:27:15 2009 -0400
 
     Examples: GObject subclass' init function no longer takes 'klass' argument
 
- examples/browser/BrowserStatusbar.js |    2 +-
- examples/browser/BrowserTab.js       |    2 +-
- examples/browser/BrowserToolbar.js   |    2 +-
- examples/browser/BrowserView.js      |    2 +-
- examples/browser/TabbedBrowser.js    |    2 +-
- examples/n-oscillator.js             |    2 +-
- examples/pango.js                    |    8 ++++----
- examples/pong/pong.js                |    6 +++---
- examples/same-seed/board.js          |    2 +-
- examples/same-seed/light.js          |    2 +-
- examples/same-seed/score.js          |    2 +-
+ examples/browser/BrowserStatusbar.js | 2 +-
+ examples/browser/BrowserTab.js       | 2 +-
+ examples/browser/BrowserToolbar.js   | 2 +-
+ examples/browser/BrowserView.js      | 2 +-
+ examples/browser/TabbedBrowser.js    | 2 +-
+ examples/n-oscillator.js             | 2 +-
+ examples/pango.js                    | 8 ++++----
+ examples/pong/pong.js                | 6 +++---
+ examples/same-seed/board.js          | 2 +-
+ examples/same-seed/light.js          | 2 +-
+ examples/same-seed/score.js          | 2 +-
  11 files changed, 16 insertions(+), 16 deletions(-)
 
 commit 483918bc6a63d150e1fc33cf4bc49bb436661e43
@@ -9538,7 +10900,7 @@ Date:   Tue May 12 03:20:16 2009 -0400
 
     xml: XPath works
 
- modules/libxml/libxml.c |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/libxml/libxml.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 46 insertions(+), 1 deletion(-)
 
 commit 7a8592c6f74d40e92b38ba9d6f0c18822bfea1d7
@@ -9547,8 +10909,8 @@ Date:   Tue May 12 03:15:42 2009 -0400
 
     Browser: It makes more sense to determine preferences in the preferences file.
 
- examples/browser/BrowserSettings.js |    9 +++++++++
- examples/browser/main.js            |    9 ---------
+ examples/browser/BrowserSettings.js | 9 +++++++++
+ examples/browser/main.js            | 9 ---------
  2 files changed, 9 insertions(+), 9 deletions(-)
 
 commit bc9747fdc9774e481814d48ed438640fa05c53f4
@@ -9557,7 +10919,7 @@ Date:   Tue May 12 03:09:56 2009 -0400
 
     N-Oscillator: Use float property, not int. Breaking our chord!
 
- examples/n-oscillator.js |   10 +++++-----
+ examples/n-oscillator.js | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit acc576b5e2568ad862b5b0483f8872b0349177e6
@@ -9566,7 +10928,7 @@ Date:   Tue May 12 03:04:25 2009 -0400
 
     Update copying file (LO doesn't live here anymore)
 
- examples/COPYING |    4 +++-
+ examples/COPYING | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit dfcf32149db007b75eb22aa49363243394a5c0c3
@@ -9575,7 +10937,7 @@ Date:   Tue May 12 03:03:21 2009 -0400
 
     Update HACKING file to be consistent with current state of examples
 
- examples/HACKING |   13 +++++++++++--
+ examples/HACKING | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit c22a796a09fb43b0fcab46c7997b40a4a8e68da3
@@ -9584,7 +10946,7 @@ Date:   Tue May 12 02:59:19 2009 -0400
 
     GtkTextView: Don't forget to quit when the window is closed.
 
- examples/gtktextview.js |    6 ++++--
+ examples/gtktextview.js | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 375666499901018c3ffd679626f9b36c591f97ac
@@ -9593,7 +10955,7 @@ Date:   Tue May 12 02:49:42 2009 -0400
 
     N-Oscillator: Rewrite, with just one global pipeline.
 
- examples/n-oscillator.js |  160 ++++++++++++++++++++++++++--------------------
+ examples/n-oscillator.js | 160 ++++++++++++++++++++++++++---------------------
  1 file changed, 89 insertions(+), 71 deletions(-)
 
 commit 4fffcc242989f088c599aefd20938f0c048a6421
@@ -9602,7 +10964,7 @@ Date:   Tue May 12 02:45:00 2009 -0400
 
     xml: Move xpathNewContext to XMLDocument class. Also add XMLXPathContext.eval
 
- modules/libxml/libxml.c |   56 ++++++++++++++++++++++++++++++++---------------
+ modules/libxml/libxml.c | 56 +++++++++++++++++++++++++++++++++----------------
  1 file changed, 38 insertions(+), 18 deletions(-)
 
 commit 2c4abd31f3820b07fdd3d6e79404b5254923bfe0
@@ -9611,7 +10973,7 @@ Date:   Tue May 12 02:35:33 2009 -0400
 
     xml: Add XMLXPathObj class
 
- modules/libxml/libxml.c |   15 +++++++++++++++
+ modules/libxml/libxml.c | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 74567373ddf0ea586d514e11ef924b4d5ad19ffd
@@ -9620,7 +10982,7 @@ Date:   Tue May 12 02:31:43 2009 -0400
 
     xml: Implement xml.xpathNewContext
 
- modules/libxml/libxml.c |   51 +++++++++++++++++++++++++++++++++++++++++++++--
+ modules/libxml/libxml.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 49 insertions(+), 2 deletions(-)
 
 commit 0d3c66d7dd64834620483d8f505e006d31e9e5e2
@@ -9629,8 +10991,8 @@ Date:   Tue May 12 02:02:18 2009 -0400
 
     Add some attributes to the test XML file
 
- modules/libxml/libxml.c   |    2 +-
- modules/libxml/sample.xml |    4 ++--
+ modules/libxml/libxml.c   | 2 +-
+ modules/libxml/sample.xml | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 573b53ac94907e010a0746269ac0a42018c68837
@@ -9639,7 +11001,7 @@ Date:   Tue May 12 01:57:05 2009 -0400
 
     xml: Implement XML attributes
 
- modules/libxml/libxml.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++
+ modules/libxml/libxml.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 55 insertions(+)
 
 commit 224a63b36fde6776aa49e62fe2aabd667aa9916a
@@ -9648,7 +11010,7 @@ Date:   Tue May 12 00:24:19 2009 -0400
 
     xml: Insure that an xmlDocPtr wrapper stays around as long as any of it's xmlNodePtr children
 
- modules/libxml/libxml.c |   12 ++++++++++++
+ modules/libxml/libxml.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit bc84a7badd50e460512a4f37d86bf1379d8fb88a
@@ -9657,7 +11019,7 @@ Date:   Tue May 12 00:18:35 2009 -0400
 
     xml: Fix a crash with not zeroing node privates. Implement the remaining accessors for simple xmlnode/docptr manipulation. and remove some code duplication between node/doc
 
- modules/libxml/libxml.c |   60 +++++++++++++++++++++++++++++++++++------------
+ modules/libxml/libxml.c | 60 ++++++++++++++++++++++++++++++++++++-------------
  1 file changed, 45 insertions(+), 15 deletions(-)
 
 commit 12eae07b7395df34ace9064befac1df0683e51dd
@@ -9666,7 +11028,7 @@ Date:   Tue May 12 00:06:25 2009 -0400
 
     xml: node.children should only be the first child, not an array
 
- modules/libxml/libxml.c |   35 +++++------------------------------
+ modules/libxml/libxml.c | 35 +++++------------------------------
  1 file changed, 5 insertions(+), 30 deletions(-)
 
 commit 306e4f489245fc016c87ce916dadff563bed5ecf
@@ -9675,8 +11037,8 @@ Date:   Mon May 11 23:58:30 2009 -0400
 
     XML module is pretty usable now for basic DOM navigation. Mirrors the python API to a large extent
 
- modules/libxml/libxml.c   |  210 +++++++++++++++++++++++++++++++++++++++++++--
- modules/libxml/sample.xml |   12 +++
+ modules/libxml/libxml.c   | 210 ++++++++++++++++++++++++++++++++++++++++++++--
+ modules/libxml/sample.xml |  12 +++
  2 files changed, 214 insertions(+), 8 deletions(-)
 
 commit 35574121acf7e15190004b78bc51ff78f8e75c94
@@ -9685,8 +11047,8 @@ Date:   Mon May 11 23:22:48 2009 -0400
 
     Implement a skeleton XMLDocument class and xml.parseFile
 
- modules/libxml/Makefile.am |    4 ++-
- modules/libxml/libxml.c    |   84 ++++++++++++++++++++++++++++++++++++++++++--
+ modules/libxml/Makefile.am |  4 ++-
+ modules/libxml/libxml.c    | 84 ++++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 84 insertions(+), 4 deletions(-)
 
 commit 21d38589febfa4d6007cf7ddf9978d0ee43df05a
@@ -9695,12 +11057,12 @@ Date:   Mon May 11 23:08:26 2009 -0400
 
     Initial commit of libxml module
 
- configure.ac                   |   18 ++++++++++++++++++
- libseed/seed-builtins.c        |    6 +++---
- modules/Makefile.am            |    2 +-
- modules/libxml/Makefile.am     |   25 +++++++++++++++++++++++++
- modules/libxml/libxml.c        |    8 ++++++++
- tests/javascript/printprint.js |    2 +-
+ configure.ac                   | 18 ++++++++++++++++++
+ libseed/seed-builtins.c        |  6 +++---
+ modules/Makefile.am            |  2 +-
+ modules/libxml/Makefile.am     | 25 +++++++++++++++++++++++++
+ modules/libxml/libxml.c        |  8 ++++++++
+ tests/javascript/printprint.js |  2 +-
  6 files changed, 56 insertions(+), 5 deletions(-)
 
 commit 8d93fc2dc3b546e15b4a7254bb75dd560e452abb
@@ -9709,8 +11071,8 @@ Date:   Mon May 11 21:21:18 2009 -0400
 
     Add dbus2js.py helper script (from hp) for generating JavaScript interface descriptions from introspection XML
 
- modules/dbus/Makefile.am |    2 +
- modules/dbus/dbus2js.py  |  218 ++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/Makefile.am |   2 +
+ modules/dbus/dbus2js.py  | 218 +++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 220 insertions(+)
 
 commit f0b3c86a4293162e33c3e645828acd88cb31254a
@@ -9719,29 +11081,29 @@ Date:   Mon May 11 20:13:33 2009 -0400
 
     Update init method calls in examples
 
- examples/accelgroup.js               |    2 +-
- examples/actions.js                  |    2 +-
- examples/browser/main.js             |    2 +-
- examples/calculator.js               |    2 +-
- examples/clutter-0.8.js              |    2 +-
- examples/clutter-cairo.js            |    2 +-
- examples/clutter-pad.js              |    4 ++--
- examples/clutter-shader/main.js      |    4 ++--
- examples/clutter-transitions/main.js |    2 +-
- examples/gconf.js                    |    2 +-
- examples/gtkplug.js                  |    4 ++--
- examples/gtktreeview.js              |    2 +-
- examples/json-packing.js             |    2 +-
- examples/n-oscillator.js             |    4 ++--
- examples/notify-test.js              |    2 +-
- examples/pango.js                    |    4 ++--
- examples/pong/pong.js                |    2 +-
- examples/poppler.js                  |    2 +-
- examples/same-seed/main.js           |    6 +++---
- examples/threaded-repl.js            |    2 +-
- examples/twitter/twitter.js          |    2 +-
- examples/video.js                    |    4 ++--
- examples/vte-test.js                 |    2 +-
+ examples/accelgroup.js               | 2 +-
+ examples/actions.js                  | 2 +-
+ examples/browser/main.js             | 2 +-
+ examples/calculator.js               | 2 +-
+ examples/clutter-0.8.js              | 2 +-
+ examples/clutter-cairo.js            | 2 +-
+ examples/clutter-pad.js              | 4 ++--
+ examples/clutter-shader/main.js      | 4 ++--
+ examples/clutter-transitions/main.js | 2 +-
+ examples/gconf.js                    | 2 +-
+ examples/gtkplug.js                  | 4 ++--
+ examples/gtktreeview.js              | 2 +-
+ examples/json-packing.js             | 2 +-
+ examples/n-oscillator.js             | 4 ++--
+ examples/notify-test.js              | 2 +-
+ examples/pango.js                    | 4 ++--
+ examples/pong/pong.js                | 2 +-
+ examples/poppler.js                  | 2 +-
+ examples/same-seed/main.js           | 6 +++---
+ examples/threaded-repl.js            | 2 +-
+ examples/twitter/twitter.js          | 2 +-
+ examples/video.js                    | 4 ++--
+ examples/vte-test.js                 | 2 +-
  23 files changed, 31 insertions(+), 31 deletions(-)
 
 commit 1e1d075988f281af3240c769e414a6b1c9a51b5d
@@ -9750,36 +11112,36 @@ Date:   Mon May 11 20:11:33 2009 -0400
 
     Replace .init(null, null) with .init(Seed.argv) in tests
 
- tests/javascript/array-gtype.js                |    2 +-
- tests/javascript/closure-finalization.js       |    2 +-
- tests/javascript/compare.js                    |    2 +-
- tests/javascript/constructor-args.js           |    2 +-
- tests/javascript/constructor-prototype.js      |    2 +-
- tests/javascript/enum.js                       |    2 +-
- tests/javascript/gdk-event.js                  |    2 +-
- tests/javascript/gobject-scope.js              |    2 +-
- tests/javascript/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtype-property-construct.js   |    2 +-
- tests/javascript/gtype-property.js             |    2 +-
- tests/javascript/gtype-signal-args.js          |    2 +-
- tests/javascript/gtype-signal.js               |    2 +-
- tests/javascript/gtype.js                      |    2 +-
- tests/javascript/gvalue-argument.js            |    2 +-
- tests/javascript/introspect.js                 |    2 +-
- tests/javascript/json-constructor.js           |    2 +-
- tests/javascript/list-test.js                  |    2 +-
- tests/javascript/native-closure-exception.js   |    2 +-
- tests/javascript/native-closure.js             |    2 +-
- tests/javascript/out-test.js                   |    2 +-
- tests/javascript/property-benchmark.js         |    2 +-
- tests/javascript/property-glib-exception.js    |    2 +-
- tests/javascript/signal-connect.js             |    2 +-
- tests/javascript/signal-exception.js           |    2 +-
- tests/javascript/signal-expects.js             |    2 +-
- tests/javascript/signal-userdata.js            |    2 +-
- tests/javascript/signal.js                     |    2 +-
- tests/javascript/struct-functions.js           |    2 +-
- tests/javascript/type-conversion.js            |    2 +-
+ tests/javascript/array-gtype.js                | 2 +-
+ tests/javascript/closure-finalization.js       | 2 +-
+ tests/javascript/compare.js                    | 2 +-
+ tests/javascript/constructor-args.js           | 2 +-
+ tests/javascript/constructor-prototype.js      | 2 +-
+ tests/javascript/enum.js                       | 2 +-
+ tests/javascript/gdk-event.js                  | 2 +-
+ tests/javascript/gobject-scope.js              | 2 +-
+ tests/javascript/gtype-class-init-exception.js | 2 +-
+ tests/javascript/gtype-property-construct.js   | 2 +-
+ tests/javascript/gtype-property.js             | 2 +-
+ tests/javascript/gtype-signal-args.js          | 2 +-
+ tests/javascript/gtype-signal.js               | 2 +-
+ tests/javascript/gtype.js                      | 2 +-
+ tests/javascript/gvalue-argument.js            | 2 +-
+ tests/javascript/introspect.js                 | 2 +-
+ tests/javascript/json-constructor.js           | 2 +-
+ tests/javascript/list-test.js                  | 2 +-
+ tests/javascript/native-closure-exception.js   | 2 +-
+ tests/javascript/native-closure.js             | 2 +-
+ tests/javascript/out-test.js                   | 2 +-
+ tests/javascript/property-benchmark.js         | 2 +-
+ tests/javascript/property-glib-exception.js    | 2 +-
+ tests/javascript/signal-connect.js             | 2 +-
+ tests/javascript/signal-exception.js           | 2 +-
+ tests/javascript/signal-expects.js             | 2 +-
+ tests/javascript/signal-userdata.js            | 2 +-
+ tests/javascript/signal.js                     | 2 +-
+ tests/javascript/struct-functions.js           | 2 +-
+ tests/javascript/type-conversion.js            | 2 +-
  30 files changed, 30 insertions(+), 30 deletions(-)
 
 commit 73c585297248c8254bce3c0417228f788960a166
@@ -9788,15 +11150,15 @@ Date:   Mon May 11 20:07:41 2009 -0400
 
     Implement the ability to pass Seed.argv to init methods
 
- examples/clutter-0.9.js  |    2 +-
- examples/clutter-cogl.js |    2 +-
- examples/repl.js         |    5 ++--
- libseed/seed-builtins.c  |    4 ---
- libseed/seed-builtins.h  |    7 +++++
- libseed/seed-engine.c    |   73 ++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.h    |    1 +
- libseed/seed-importer.c  |   14 +++++++--
- libseed/seed-types.c     |    1 +
+ examples/clutter-0.9.js  |  2 +-
+ examples/clutter-cogl.js |  2 +-
+ examples/repl.js         |  5 ++--
+ libseed/seed-builtins.c  |  4 ---
+ libseed/seed-builtins.h  |  7 +++++
+ libseed/seed-engine.c    | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.h    |  1 +
+ libseed/seed-importer.c  | 14 ++++++++--
+ libseed/seed-types.c     |  1 +
  9 files changed, 98 insertions(+), 11 deletions(-)
 
 commit 4d5fa622d9eb6c9dfd4296adff4c8018aae6a4f5
@@ -9805,9 +11167,9 @@ Date:   Mon May 11 18:29:14 2009 -0400
 
     Add ConsoleKit DBus example
 
- doc/index.html              |    3 ++-
- examples/Makefile.am        |    2 ++
- examples/dbus-consolekit.js |   57 +++++++++++++++++++++++++++++++++++++++++++
+ doc/index.html              |  3 ++-
+ examples/Makefile.am        |  2 ++
+ examples/dbus-consolekit.js | 57 +++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 61 insertions(+), 1 deletion(-)
 
 commit 1652795a8f07eb6551b47ae2fe4e486688159fdf
@@ -9816,8 +11178,8 @@ Date:   Mon May 11 18:11:13 2009 -0400
 
     libseed: Update signal marshaller to use the new machinery for warning about exceptions in closures. Also update test.
 
- libseed/seed-signals.c               |    7 ++-----
- tests/javascript/signal-exception.js |    2 +-
+ libseed/seed-signals.c               | 7 ++-----
+ tests/javascript/signal-exception.js | 2 +-
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 commit d48988b558f4bfe0e2eb700eac3dce2ec31653ae
@@ -9826,7 +11188,7 @@ Date:   Mon May 11 18:06:47 2009 -0400
 
     DBus: Implement conversion of DBus errors to JavaScript exceptions in async call replies
 
- modules/dbus/module.c |    1 +
+ modules/dbus/module.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit d920decdb335095cc9a5073df03f60c3253a8276
@@ -9835,8 +11197,8 @@ Date:   Mon May 11 18:02:54 2009 -0400
 
     Update closure exception warning to make use of description field
 
- libseed/seed-closure.c |    2 +-
- modules/dbus/module.c  |    3 +--
+ libseed/seed-closure.c | 2 +-
+ modules/dbus/module.c  | 3 +--
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 5d2b56fbe889bcb31b63a9ffce7a725ca432add3
@@ -9845,7 +11207,7 @@ Date:   Mon May 11 17:58:37 2009 -0400
 
     Change DBus module to use the new API
 
- modules/dbus/module.c |   12 ++++++------
+ modules/dbus/module.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 72c991b5f191b6d5ae1d75936a87217292012ca6
@@ -9854,11 +11216,11 @@ Date:   Mon May 11 17:55:26 2009 -0400
 
     Change seed_make_gclosure to seed_closure_new in the API and add a description parameter. Change calls in libseed to use the new function
 
- libseed/seed-closure.c |    7 ++++++-
- libseed/seed-closure.h |   10 +++++-----
- libseed/seed-signals.c |    2 +-
- libseed/seed-types.c   |    2 +-
- libseed/seed.h         |    7 ++++---
+ libseed/seed-closure.c |  7 ++++++-
+ libseed/seed-closure.h | 10 +++++-----
+ libseed/seed-signals.c |  2 +-
+ libseed/seed-types.c   |  2 +-
+ libseed/seed.h         |  7 ++++---
  5 files changed, 17 insertions(+), 11 deletions(-)
 
 commit 5158c61ab6ca40a06c765ca03fcd540708c0e709
@@ -9867,8 +11229,8 @@ Date:   Mon May 11 17:50:52 2009 -0400
 
     Warnings for async callbacks in DBus module
 
- modules/dbus/dbus.js  |    3 +--
- modules/dbus/module.c |    3 +++
+ modules/dbus/dbus.js  | 3 +--
+ modules/dbus/module.c | 3 +++
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit a2363a8f63ec5f6351cac5a420a2cab3c13d0190
@@ -9877,10 +11239,10 @@ Date:   Mon May 11 17:44:48 2009 -0400
 
     Implement seed_closure_warn_exception, for dealing with unhandled exceptions in closures.
 
- doc/reference/Makefile.am |    2 +-
- libseed/seed-closure.c    |   17 +++++++++++++++++
- libseed/seed-closure.h    |    5 +++++
- libseed/seed.h            |    3 +++
+ doc/reference/Makefile.am |  2 +-
+ libseed/seed-closure.c    | 17 +++++++++++++++++
+ libseed/seed-closure.h    |  5 +++++
+ libseed/seed.h            |  3 +++
  4 files changed, 26 insertions(+), 1 deletion(-)
 
 commit abc5094ea9a221b954e04e1051266f530c62c492
@@ -9889,7 +11251,7 @@ Date:   Mon May 11 17:24:44 2009 -0400
 
     Some style updates to documentation
 
- doc/index.html |    7 +++++--
+ doc/index.html | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 14e421156e46158f573fe3fe5be1226f847c5ce0
@@ -9898,7 +11260,7 @@ Date:   Mon May 11 17:22:09 2009 -0400
 
     Update documentation index
 
- doc/index.html |   12 ++++++++++--
+ doc/index.html | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit 7355d21231b6944369ecb28e45927a93c31774b4
@@ -9907,9 +11269,9 @@ Date:   Mon May 11 17:19:22 2009 -0400
 
     Add documentation for sandbox module
 
- configure.ac                |    1 +
- doc/modules/Makefile.am     |    4 +--
- doc/modules/sandbox.html.in |   66 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac                |  1 +
+ doc/modules/Makefile.am     |  4 +--
+ doc/modules/sandbox.html.in | 66 +++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 69 insertions(+), 2 deletions(-)
 
 commit 29c920f03a2c6e12afa8cea26bb685cbc72a8b26
@@ -9918,7 +11280,7 @@ Date:   Mon May 11 17:01:24 2009 -0400
 
     Update exmaple index in documentation
 
- doc/index.html |    3 +++
+ doc/index.html | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 0c1f7826e0c9e66b98adddbc1af8149d1fcff4c4
@@ -9927,8 +11289,8 @@ Date:   Mon May 11 16:56:08 2009 -0400
 
     Add clutter-pad example
 
- examples/Makefile.am    |    2 ++
- examples/clutter-pad.js |   92 +++++++++++++++++++++++++++++++++++++++++++++++
+ examples/Makefile.am    |  2 ++
+ examples/clutter-pad.js | 92 +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 94 insertions(+)
 
 commit 608572c7ceb778338d5ddca736a344636cbcc283
@@ -9937,7 +11299,7 @@ Date:   Mon May 11 16:49:32 2009 -0400
 
     Calling any JSCore method requiring a context from within an object finalization handler is invalid. As a result the sandbox module needs to be manually memory managed (with a destroy method). Closes BGO #582120
 
- modules/sandbox/sandbox.c |   41 +++++++++++++++++++++++++++++++----------
+ modules/sandbox/sandbox.c | 41 +++++++++++++++++++++++++++++++----------
  1 file changed, 31 insertions(+), 10 deletions(-)
 
 commit 76dcc30e895ae0472980d6fd147b9bd1c23ed548
@@ -9946,7 +11308,7 @@ Date:   Mon May 11 16:31:37 2009 -0400
 
     Implement conversion of GObject constructors to type as '[gobject_constructor TypeGoesHere]'
 
- libseed/seed-engine.c |   27 +++++++++++++++++++++++++--
+ libseed/seed-engine.c | 27 +++++++++++++++++++++++++--
  1 file changed, 25 insertions(+), 2 deletions(-)
 
 commit d4f30551d570153a9153cb9e14821d436a7e653b
@@ -9955,7 +11317,7 @@ Date:   Mon May 11 02:20:06 2009 -0400
 
     REPL: Assignment regex should not print assignments of the form a=('b')
 
- examples/repl.js |    2 +-
+ examples/repl.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a214dc2f75493f8beb9d28bcc8309c8d80113797
@@ -9964,7 +11326,7 @@ Date:   Mon May 11 02:18:15 2009 -0400
 
     Some simplifications to the REPL assignment regex
 
- examples/repl.js |    2 +-
+ examples/repl.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 45f6834e6b3d30ac6a64784f721f5d56f7880628
@@ -9973,7 +11335,7 @@ Date:   Mon May 11 02:06:33 2009 -0400
 
     REPL: Avoid printing out the results of simple assignments. Also do not print out things that return undefined
 
- examples/repl.js |    7 ++++++-
+ examples/repl.js | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit f62a02f9846886fafc13a1188b2d9e95f759ba68
@@ -9982,8 +11344,8 @@ Date:   Sun May 10 18:03:02 2009 -0400
 
     Pango Example: Begin a rewrite; this time, I'll actually finish it
 
- examples/broken/pango.js |  194 -----------------------------------
- examples/pango.js        |  252 ++++++++++++++++++++++++++++++++++++++++++++++
+ examples/broken/pango.js | 194 ------------------------------------
+ examples/pango.js        | 252 +++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 252 insertions(+), 194 deletions(-)
 
 commit a538ffbda75d12f8b049f4dab7e6dcf05a36e988
@@ -9992,7 +11354,7 @@ Date:   Sun May 10 03:23:13 2009 -0400
 
     Fix GLib warning in seed_value_from_gvalue
 
- libseed/seed-types.c |    2 ++
+ libseed/seed-types.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d2829e140beb0a29c2e5231369e31f6b05aa691a
@@ -10001,7 +11363,7 @@ Date:   Sun May 10 03:13:52 2009 -0400
 
     Same Seed: clutter-gtk seems to be broken; revert from GtkBuilder UI to pure Clutter for now
 
- examples/same-seed/main.js |   21 ++++-----------------
+ examples/same-seed/main.js | 21 ++++-----------------
  1 file changed, 4 insertions(+), 17 deletions(-)
 
 commit f3c2c72ff10b456681bc185bdb72b5259f64020f
@@ -10010,7 +11372,7 @@ Date:   Sun May 10 02:47:08 2009 -0400
 
     Port some of the serverside dbus.js stuff away to JSCore compatible JavaScript
 
- modules/dbus/dbus.js |   46 ++++++++++++++++++++++++----------------------
+ modules/dbus/dbus.js | 46 ++++++++++++++++++++++++----------------------
  1 file changed, 24 insertions(+), 22 deletions(-)
 
 commit 24556762de5e203dd4b7e268028e429bfeda8151
@@ -10019,7 +11381,7 @@ Date:   Sun May 10 02:24:25 2009 -0400
 
     Unprotecting functions in closure invalidation should use global context rather than creating a new context, because this can potentially happen at times where JSCore does not want us creating a new context (i.e. GC wrapper->remove toggle ref->invalidate closure)
 
- libseed/seed-closure.c |   11 ++++-------
+ libseed/seed-closure.c | 11 ++++-------
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 commit c5989fa40def2190d2e789e48a7e92cdf2398f1f
@@ -10028,7 +11390,7 @@ Date:   Sun May 10 00:55:21 2009 -0400
 
     Remove erroneous debugging statement from dbus.js
 
- modules/dbus/dbus.js |    1 -
+ modules/dbus/dbus.js | 1 -
  1 file changed, 1 deletion(-)
 
 commit eabccebae1021392f4b29a228f261906c5d1f5fc
@@ -10037,10 +11399,10 @@ Date:   Sun May 10 00:54:14 2009 -0400
 
     Add an example of dbus signal connection to dbus-banshee example
 
- examples/dbus-banshee.js |   31 ++++++++++++++++++++++++++++---
- libseed/seed-closure.c   |    6 +-----
- libseed/seed-closure.h   |    3 ---
- libseed/seed-signals.c   |    2 +-
+ examples/dbus-banshee.js | 31 ++++++++++++++++++++++++++++---
+ libseed/seed-closure.c   |  6 +-----
+ libseed/seed-closure.h   |  3 ---
+ libseed/seed-signals.c   |  2 +-
  4 files changed, 30 insertions(+), 12 deletions(-)
 
 commit be9e819c826e4030fa931acad305f712e28cc102
@@ -10049,7 +11411,7 @@ Date:   Sat May 9 23:56:10 2009 -0400
 
     Make dbus-banshee example take a file as an argument
 
- examples/dbus-banshee.js |    1 +
+ examples/dbus-banshee.js | 1 +
  1 file changed, 1 insertion(+)
 
 commit 70899251e4f82a7bf7db8c5fe691425823c8b94a
@@ -10058,7 +11420,7 @@ Date:   Sat May 9 23:55:01 2009 -0400
 
     Make dbus-banshee example take a file as an argument
 
- examples/dbus-banshee.js |    2 +-
+ examples/dbus-banshee.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a9ed1ce65a4887142a3926094147d04b2c5f6559
@@ -10067,12 +11429,12 @@ Date:   Sat May 9 23:52:42 2009 -0400
 
     Add dbus example
 
- examples/Makefile.am       |    2 ++
- examples/dbus-banshee.js   |   30 ++++++++++++++++++++++++++++++
- libseed/seed-closure.c     |    2 +-
- modules/dbus/dbus-values.c |    2 +-
- modules/dbus/dbus.js       |    1 +
- modules/dbus/module.c      |    9 ++++++---
+ examples/Makefile.am       |  2 ++
+ examples/dbus-banshee.js   | 30 ++++++++++++++++++++++++++++++
+ libseed/seed-closure.c     |  2 +-
+ modules/dbus/dbus-values.c |  2 +-
+ modules/dbus/dbus.js       |  1 +
+ modules/dbus/module.c      |  9 ++++++---
  6 files changed, 41 insertions(+), 5 deletions(-)
 
 commit a55824bdb0dbba65e4e2672daac470f4da79188e
@@ -10081,10 +11443,10 @@ Date:   Sat May 9 22:49:07 2009 -0400
 
     Fix  DBus module build
 
- configure.ac             |    3 +++
- modules/dbus/Makefile.am |    1 +
- modules/dbus/dbus.js     |    3 ++-
- modules/dbus/util/log.h  |    1 +
+ configure.ac             | 3 +++
+ modules/dbus/Makefile.am | 1 +
+ modules/dbus/dbus.js     | 3 ++-
+ modules/dbus/util/log.h  | 1 +
  4 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 7f49aa1d1cb32273f2e0a6c4287f4a033b000ee3
@@ -10093,10 +11455,10 @@ Date:   Sat May 9 22:26:10 2009 -0400
 
     Stop mangling this object when importer includes JS files
 
- libseed/seed-importer.c  |    6 +++---
- modules/dbus/Makefile.am |    2 +-
- modules/dbus/dbus.js     |   47 +++++++++++++++++++++++++++++++---------------
- modules/dbus/lang.js     |   33 ++++++++++----------------------
+ libseed/seed-importer.c  |  6 +++---
+ modules/dbus/Makefile.am |  2 +-
+ modules/dbus/dbus.js     | 47 ++++++++++++++++++++++++++++++++---------------
+ modules/dbus/lang.js     | 33 ++++++++++-----------------------
  4 files changed, 46 insertions(+), 42 deletions(-)
 
 commit 16309730541277e60af37dfa89576d65a2b89210
@@ -10105,7 +11467,7 @@ Date:   Sat May 9 21:29:20 2009 -0400
 
     Replace all the lets with vars in dbus.js...and cross fingers
 
- modules/dbus/dbus.js |  136 +++++++++++++++++++++++++-------------------------
+ modules/dbus/dbus.js | 136 +++++++++++++++++++++++++--------------------------
  1 file changed, 68 insertions(+), 68 deletions(-)
 
 commit 7db832dd1425dc2cab8124af945aca386c6fd086
@@ -10114,8 +11476,8 @@ Date:   Sat May 9 21:27:19 2009 -0400
 
     Add lang.js from GJS modules
 
- modules/dbus/Makefile.am |    2 +-
- modules/dbus/lang.js     |  112 ++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/Makefile.am |   2 +-
+ modules/dbus/lang.js     | 112 +++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 113 insertions(+), 1 deletion(-)
 
 commit de0d1f348d0a376c466abaca44bd89a60fd4554a
@@ -10124,8 +11486,8 @@ Date:   Sat May 9 21:26:20 2009 -0400
 
     Add dbus.js from GJS dbus bindings
 
- modules/dbus/Makefile.am |    3 +
- modules/dbus/dbus.js     |  584 ++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/Makefile.am |   3 +
+ modules/dbus/dbus.js     | 584 +++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 587 insertions(+)
 
 commit d0dcc4006346d40f909c6e735afe1f83a1b5ce27
@@ -10134,7 +11496,7 @@ Date:   Sat May 9 21:23:00 2009 -0400
 
     Implement the rest of the DBus Bus class
 
- modules/dbus/module.c |   46 ++++++++++++++++++++++++++++++++++++++++++++--
+ modules/dbus/module.c | 46 ++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 44 insertions(+), 2 deletions(-)
 
 commit 09a8e2da53b73e9bef52b95972ff72d93d4c2d45
@@ -10143,7 +11505,7 @@ Date:   Sat May 9 21:09:19 2009 -0400
 
     Implement unique_name_getter and seed_js_dbus_start_service
 
- modules/dbus/module.c |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 61 insertions(+)
 
 commit 292a0d7cc05a0041bc8bd4dfc4bdd9d904b14d1c
@@ -10152,7 +11514,7 @@ Date:   Sat May 9 21:01:43 2009 -0400
 
     Implement seed_js_dbus_watch_name
 
- modules/dbus/module.c |   84 +++++++++++++++++++++++++++++++++++++++++++++----
+ modules/dbus/module.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 78 insertions(+), 6 deletions(-)
 
 commit 7184e181b028be5d5bf0153a52a4ebe839b35cd5
@@ -10161,7 +11523,7 @@ Date:   Sat May 9 20:54:04 2009 -0400
 
     Implement on_name_appeared and on_name_vanished handlers
 
- modules/dbus/module.c |   97 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 97 insertions(+)
 
 commit 79789a3455630b630137df0ab09f7d107460adaa
@@ -10170,7 +11532,7 @@ Date:   Sat May 9 20:49:00 2009 -0400
 
     Implement seed_js_dbus_release_name_by_id
 
- modules/dbus/module.c |   27 +++++++++++++++++++++++++++
+ modules/dbus/module.c | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
 
 commit 83d58ca210fa691631e764153a2942b2c7c9321d
@@ -10179,7 +11541,7 @@ Date:   Sat May 9 19:53:44 2009 -0400
 
     Implement seed_js_dbus_acquire_name
 
- modules/dbus/module.c |  100 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 100 insertions(+)
 
 commit 7470ca852345ed81cbab68ceccc052972ddcbdde
@@ -10188,8 +11550,8 @@ Date:   Sat May 9 19:46:00 2009 -0400
 
     Implement on_name_acquire and on_name_lost handlers
 
- libseed/seed.h        |    2 +-
- modules/dbus/module.c |   72 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed.h        |  2 +-
+ modules/dbus/module.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 73 insertions(+), 1 deletion(-)
 
 commit 83a03a57db8bb1e37eeb13dcc64713c8676d5288
@@ -10198,7 +11560,7 @@ Date:   Sat May 9 19:38:25 2009 -0400
 
     Implement seed_js_dbus_call
 
- modules/dbus/module.c |   42 ++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 commit b09ea6d2c2ffe92dcf6e171d12c92fac7a0f5118
@@ -10207,7 +11569,7 @@ Date:   Sat May 9 19:33:58 2009 -0400
 
     Implement seed_js_dbus_emit_signal
 
- modules/dbus/module.c |   69 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 69 insertions(+)
 
 commit 5bb512ea42369fa44f84d06749425351dcae8856
@@ -10225,7 +11587,7 @@ Date:   Sat May 9 19:28:13 2009 -0400
 
     Implement seed_js_dbus_unwatch_signal
 
- modules/dbus/module.c |   62 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 62 insertions(+)
 
 commit e8561fb04393874b8c6a9d0d13fe09608efa5158
@@ -10234,7 +11596,7 @@ Date:   Sat May 9 19:23:35 2009 -0400
 
     Implement seeD_js_dbus_unwatch_signal_by_id
 
- modules/dbus/module.c |   26 ++++++++++++++++++++++++++
+ modules/dbus/module.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 commit c00ff342a790c39e4e9ac9d303f5b8d85224cf8f
@@ -10243,7 +11605,7 @@ Date:   Sat May 9 19:21:04 2009 -0400
 
     Implement seed_js_dbus_watch_signal
 
- modules/dbus/module.c |   56 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
 
 commit e8dcfc43bdc3d934ee228253149b4f2dc869ad6e
@@ -10252,11 +11614,11 @@ Date:   Sat May 9 19:10:46 2009 -0400
 
     Add some of the signal handler machinery to DBus module...also clean up a lot of warnings
 
- libseed/seed-api.c         |    6 ++
- libseed/seed.h             |    1 +
- modules/dbus/Makefile.am   |    1 +
- modules/dbus/dbus-values.c |    2 +-
- modules/dbus/module.c      |  225 +++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-api.c         |   6 ++
+ libseed/seed.h             |   1 +
+ modules/dbus/Makefile.am   |   1 +
+ modules/dbus/dbus-values.c |   2 +-
+ modules/dbus/module.c      | 225 ++++++++++++++++++++++++++++++++++++++++++++-
  5 files changed, 233 insertions(+), 2 deletions(-)
 
 commit 091fab2d419e78b349fb2884aedb5da8fb809a15
@@ -10267,8 +11629,8 @@ Date:   Sat May 9 18:59:41 2009 -0400
     
     Still need to get libgames-support working, but this is a start. Also, we get a segfault after clicking "new game" twice in what looks like a memory-related WebKit function (something for Robb to take a peek at, hopefully).
 
- examples/same-seed/board.js |   10 ++++------
- examples/same-seed/main.js  |   36 +++++++++++++++++-------------------
+ examples/same-seed/board.js | 10 ++++------
+ examples/same-seed/main.js  | 36 +++++++++++++++++-------------------
  2 files changed, 21 insertions(+), 25 deletions(-)
 
 commit 6c0f1a252b81f688c2aaa838182d2ab508f9cc74
@@ -10277,7 +11639,7 @@ Date:   Sat May 9 18:41:35 2009 -0400
 
     Implement the async call machinery in DBus module
 
- modules/dbus/module.c |   84 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/dbus/module.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 83 insertions(+), 1 deletion(-)
 
 commit 4caea71acf3741bf40ba54734b7e121586863dc5
@@ -10286,10 +11648,10 @@ Date:   Sat May 9 18:23:45 2009 -0400
 
     Add seed_closure_invoke_with_context to the PI
 
- libseed/seed-closure.c |   16 ++++++++++++++
- libseed/seed-closure.h |    2 ++
- libseed/seed.h         |    3 +++
- modules/dbus/module.c  |   57 ++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-closure.c | 16 ++++++++++++++
+ libseed/seed-closure.h |  2 ++
+ libseed/seed.h         |  3 +++
+ modules/dbus/module.c  | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 78 insertions(+)
 
 commit 646d18065bf3681ccc7b439689e76b45a73d70c7
@@ -10298,9 +11660,9 @@ Date:   Sat May 9 18:16:01 2009 -0400
 
     Add seed_make_gclosure, seed_closure_get_callable and seed_closure_invoke to the API
 
- libseed/seed-closure.c |   18 ++++++++++++++++++
- libseed/seed-closure.h |    8 +++++++-
- libseed/seed.h         |   10 ++++++++++
+ libseed/seed-closure.c | 18 ++++++++++++++++++
+ libseed/seed-closure.h |  8 +++++++-
+ libseed/seed.h         | 10 ++++++++++
  3 files changed, 35 insertions(+), 1 deletion(-)
 
 commit ffd8b44c7f65bf7f42694818608f29ac5403dbe6
@@ -10309,9 +11671,9 @@ Date:   Sat May 9 18:07:47 2009 -0400
 
     Rework some of the GClosure logic to remove some code duplication
 
- libseed/seed-closure.c |   40 ++++++++++++++++++++++++++++++++--------
- libseed/seed-closure.h |    9 +++++++--
- libseed/seed-signals.c |   41 ++---------------------------------------
+ libseed/seed-closure.c | 40 ++++++++++++++++++++++++++++++++--------
+ libseed/seed-closure.h |  9 +++++++--
+ libseed/seed-signals.c | 41 ++---------------------------------------
  3 files changed, 41 insertions(+), 49 deletions(-)
 
 commit d7f083d8f653f333501b58765ad1460db0aaff1b
@@ -10320,7 +11682,7 @@ Date:   Sat May 9 17:46:09 2009 -0400
 
     Start implementing the method call machinery for DBus module
 
- modules/dbus/module.c |  190 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/module.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 190 insertions(+)
 
 commit e151d404cd51a9971f40e7da6d9d33735ce97e75
@@ -10329,7 +11691,7 @@ Date:   Sat May 9 17:05:21 2009 -0400
 
     Add get_bus_type_from_object
 
- modules/dbus/module.c |   11 +++++++++++
+ modules/dbus/module.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit e84dd23d0281e48445edc3bef46d6b18edc75cd9
@@ -10338,7 +11700,7 @@ Date:   Sat May 9 16:59:22 2009 -0400
 
     Add missing file to DBus module
 
- modules/dbus/util/log.h |    1 +
+ modules/dbus/util/log.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit c175d9ae18f22eed2c147fecbdf1a6bf7be78651
@@ -10347,7 +11709,7 @@ Date:   Sat May 9 16:47:35 2009 -0400
 
     Update readme (add dbus as an optional dependency)
 
- README |    1 +
+ README | 1 +
  1 file changed, 1 insertion(+)
 
 commit 25b222d0a72e424d6a8b05cb99b379a8a1ca2332
@@ -10356,7 +11718,7 @@ Date:   Sat May 9 16:45:09 2009 -0400
 
     Update INSTALL.osx (the package name is pkgconfig, not pkg-config)
 
- INSTALL.osx |    9 ++++++---
+ INSTALL.osx | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit e1ec439910def2b4d9b1d3aaca540df0311d7e55
@@ -10365,8 +11727,8 @@ Date:   Sat May 9 16:31:13 2009 -0400
 
     More size_t printf fixes in dbus + readline modules.
 
- modules/dbus/module.c            |    2 +-
- modules/readline/seed-readline.c |    2 +-
+ modules/dbus/module.c            | 2 +-
+ modules/readline/seed-readline.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit d07f1d33914c0686a691de0d37279ddc8c8bda09
@@ -10375,11 +11737,11 @@ Date:   Sat May 9 01:18:40 2009 -0400
 
     Finish port of dbus-values.c...
 
- libseed/seed-api.c         |    9 ++
- libseed/seed.h             |    7 +-
- modules/dbus/Makefile.am   |    3 +-
- modules/dbus/dbus-values.c |  291 ++++++++++++++++++++------------------------
- modules/dbus/dbus-values.h |   40 ++++++
+ libseed/seed-api.c         |   9 ++
+ libseed/seed.h             |   7 +-
+ modules/dbus/Makefile.am   |   3 +-
+ modules/dbus/dbus-values.c | 291 ++++++++++++++++++++-------------------------
+ modules/dbus/dbus-values.h |  40 +++++++
  5 files changed, 189 insertions(+), 161 deletions(-)
 
 commit 2a99e51d6f69e5e302fb346eb3a81cb06aa50134
@@ -10388,7 +11750,7 @@ Date:   Sat May 9 00:31:55 2009 -0400
 
     Work on porting dbus-values.c from GJS dbus bindings
 
- modules/dbus/dbus-values.c |  977 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/dbus/dbus-values.c | 977 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 977 insertions(+)
 
 commit fa25ef382a87a5416527bc498f4061353dc1d87c
@@ -10397,9 +11759,9 @@ Date:   Fri May 8 22:27:44 2009 -0400
 
     More work on dbus branch
 
- libseed/seed-types.c |   18 ++++++++++++++++++
- libseed/seed-types.h |    6 ++++++
- libseed/seed.h       |    6 ++++++
+ libseed/seed-types.c | 18 ++++++++++++++++++
+ libseed/seed-types.h |  6 ++++++
+ libseed/seed.h       |  6 ++++++
  3 files changed, 30 insertions(+)
 
 commit a322be29b8dedb5cef0204f2f650a98643f3c64c
@@ -10408,8 +11770,8 @@ Date:   Thu May 7 23:53:29 2009 -0400
 
     A little more DBus module
 
- modules/dbus/Makefile.am |   15 ++++++++------
- modules/dbus/module.c    |   50 +++++++++++++++++++++++++++++++++++++++++++++-
+ modules/dbus/Makefile.am | 15 +++++++++------
+ modules/dbus/module.c    | 50 +++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 58 insertions(+), 7 deletions(-)
 
 commit 61d504d0d9bfe939a9f2d065d0c1fd1eced9dce8
@@ -10436,8 +11798,8 @@ Date:   Sat May 9 00:42:34 2009 -0400
 
     Add seed_value_get_type and seed_object_copy_property_names to the API
 
- libseed/seed-api.c |   36 ++++++++++++++++++++++++++++++++++++
- libseed/seed.h     |    4 ++++
+ libseed/seed-api.c | 36 ++++++++++++++++++++++++++++++++++++
+ libseed/seed.h     |  4 ++++
  2 files changed, 40 insertions(+)
 
 commit 8ef42078909b9b4e5f8b915992f597f9910eea3b
@@ -10446,7 +11808,7 @@ Date:   Fri May 8 23:53:56 2009 -0400
 
     Fix segfault introduced in the argv changes with NULL argv
 
- libseed/seed-builtins.c |    6 ++++--
+ libseed/seed-builtins.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit aadfff24c3dc2e36958e60d20ac336d527322937
@@ -10455,8 +11817,8 @@ Date:   Fri May 8 23:50:32 2009 -0400
 
     GI_TYPE_TAG_VOID functions should return undefined, not null
 
- libseed/seed-engine.c |    2 +-
- libseed/seed-types.c  |    2 +-
+ libseed/seed-engine.c | 2 +-
+ libseed/seed-types.c  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 7adb2a4e54da8347583218cc015eeede0e2550d3
@@ -10465,8 +11827,8 @@ Date:   Fri May 8 21:02:19 2009 -0400
 
     Add seed_make_undefined to the API
 
- libseed/seed-api.c |    6 ++++++
- libseed/seed.h     |    1 +
+ libseed/seed-api.c | 6 ++++++
+ libseed/seed.h     | 1 +
  2 files changed, 7 insertions(+)
 
 commit 35b5a81526f60979241c9dc07b5d97e83056cadc
@@ -10475,7 +11837,7 @@ Date:   Thu May 7 22:59:57 2009 -0400
 
     Same Seed: More single-timeline cleanup.
 
- examples/same-seed/board.js |   12 +++++-------
+ examples/same-seed/board.js | 12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 commit 30ebe185c571ac3669b0d0a16c5b0fbcc5d174e8
@@ -10484,8 +11846,8 @@ Date:   Thu May 7 22:57:06 2009 -0400
 
     Same Seed: More transitioning to single-timeline animation; this time, the main block animation
 
- examples/same-seed/board.js |   18 +++++-------------
- examples/same-seed/light.js |    6 +-----
+ examples/same-seed/board.js | 18 +++++-------------
+ examples/same-seed/light.js |  6 +-----
  2 files changed, 6 insertions(+), 18 deletions(-)
 
 commit ba1d103653fb1a3391b967f4211619e5a9ed6148
@@ -10494,8 +11856,8 @@ Date:   Thu May 7 22:52:20 2009 -0400
 
     Same Seed: Update closing animation to use a single timeline
 
- examples/same-seed/board.js |    6 +++++-
- examples/same-seed/light.js |   15 ++++++---------
+ examples/same-seed/board.js |  6 +++++-
+ examples/same-seed/light.js | 15 ++++++---------
  2 files changed, 11 insertions(+), 10 deletions(-)
 
 commit fee20fc2c75f67822582d5e4f2e316608e4c0db0
@@ -10504,8 +11866,8 @@ Date:   Thu May 7 22:39:03 2009 -0400
 
     Clutter added animate_with_timelinev, so we should have an extension for that as well.
 
- extensions/Clutter.js                     |   12 ++++++++++++
- patches/clutter-animatev-annotation.patch |   11 ++++++++++-
+ extensions/Clutter.js                     | 12 ++++++++++++
+ patches/clutter-animatev-annotation.patch | 11 ++++++++++-
  2 files changed, 22 insertions(+), 1 deletion(-)
 
 commit 5c00d2575024994bb904d988bc9b678f9879f0a5
@@ -10514,12 +11876,12 @@ Date:   Thu May 7 22:21:28 2009 -0400
 
     Fix many anonymous JS functions that just call *.main_quit to just connect to that function instead.
 
- doc/tutorial-standalone/tutorial.html.in |    4 ++--
- examples/clutter-0.8.js                  |    2 +-
- examples/clutter-0.9.js                  |    2 +-
- examples/clutter-transitions/main.js     |    2 +-
- examples/pong/pong.js                    |    2 +-
- examples/same-seed/board.js              |    2 +-
+ doc/tutorial-standalone/tutorial.html.in | 4 ++--
+ examples/clutter-0.8.js                  | 2 +-
+ examples/clutter-0.9.js                  | 2 +-
+ examples/clutter-transitions/main.js     | 2 +-
+ examples/pong/pong.js                    | 2 +-
+ examples/same-seed/board.js              | 2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)
 
 commit e031c6b23d0fdfd486bb892ce4eb97665fc90033
@@ -10528,7 +11890,7 @@ Date:   Thu May 7 22:11:33 2009 -0400
 
     Same Seed: Fix crazy Clutter signal warnings from getting thrown.
 
- examples/same-seed/board.js |    4 ++--
+ examples/same-seed/board.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 2b9c64b79ac697ee61de99620bf0010166a274a0
@@ -10537,8 +11899,8 @@ Date:   Thu May 7 22:09:21 2009 -0400
 
     Same Seed: Don't remove tiles until button_release_event, not button_press_event.
 
- examples/same-seed/board.js |    4 ++--
- examples/same-seed/light.js |    1 -
+ examples/same-seed/board.js | 4 ++--
+ examples/same-seed/light.js | 1 -
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 9f925b756e4407a0f2402b9848b628b8fe935d8c
@@ -10547,9 +11909,9 @@ Date:   Thu May 7 21:13:34 2009 -0400
 
     Pango fontset example isn't really broken, but need to use C allocator for Pango.FontDescription.
 
- examples/Makefile.am             |    2 ++
- examples/broken/pango-fontset.js |   18 ------------------
- examples/pango-fontset.js        |   16 ++++++++++++++++
+ examples/Makefile.am             |  2 ++
+ examples/broken/pango-fontset.js | 18 ------------------
+ examples/pango-fontset.js        | 16 ++++++++++++++++
  3 files changed, 18 insertions(+), 18 deletions(-)
 
 commit f2a8b60ba3341bb6db34704dbd7720428cadfd2d
@@ -10558,8 +11920,8 @@ Date:   Thu May 7 22:41:28 2009 +0200
 
     Added missing FFI CFLAGS and LDFLAGS. Fix AC_SUBST of FFI_LDFLAGS
 
- configure.ac                 |    2 +-
- modules/readline/Makefile.am |    2 ++
+ configure.ac                 | 2 +-
+ modules/readline/Makefile.am | 2 ++
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit f2cec5dacdd29ffaeb635d9f33a514782b5faf99
@@ -10568,8 +11930,8 @@ Date:   Thu May 7 04:19:51 2009 -0400
 
     Improve multiline support in REPL
 
- examples/repl.js                 |   20 ++++++++++----------
- modules/readline/seed-readline.c |   31 ++++++++++++++++++++++++++++++-
+ examples/repl.js                 | 20 ++++++++++----------
+ modules/readline/seed-readline.c | 31 ++++++++++++++++++++++++++++++-
  2 files changed, 40 insertions(+), 11 deletions(-)
 
 commit 2dc9413eff28100343395fc6bca18e8baea6ae1d
@@ -10578,11 +11940,11 @@ Date:   Thu May 7 04:19:19 2009 -0400
 
     Connecting signals to introspected functions by name works now; update some examples to use cleaner style for main_quit.
 
- examples/browser/main.js   |    2 +-
- examples/calculator.js     |    2 +-
- examples/gtkplug.js        |    2 +-
- examples/poppler.js        |    2 +-
- examples/same-seed/main.js |    6 +++---
+ examples/browser/main.js   | 2 +-
+ examples/calculator.js     | 2 +-
+ examples/gtkplug.js        | 2 +-
+ examples/poppler.js        | 2 +-
+ examples/same-seed/main.js | 6 +++---
  5 files changed, 7 insertions(+), 7 deletions(-)
 
 commit 04a23f6220ce350310eb99c6bdc326b81ed06e9f
@@ -10591,8 +11953,8 @@ Date:   Thu May 7 03:55:08 2009 -0400
 
     Update tests to API change (simple_evaluate has a exception property now).
 
- tests/c/api-closure.c          |    2 +-
- tests/c/api-js-signal-from-c.c |    4 ++--
+ tests/c/api-closure.c          | 2 +-
+ tests/c/api-js-signal-from-c.c | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit e8dc85aedf5d4d2eb39c93ff05340c6fc0ff1bcb
@@ -10601,7 +11963,7 @@ Date:   Thu May 7 03:52:52 2009 -0400
 
     Somewhere in the build system reorg, checking for the existence of readline.h was broken. Now fixed.
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 0d0b521bae92a58828635511a70a77e46ce0a82e
@@ -10610,7 +11972,7 @@ Date:   Thu May 7 03:43:55 2009 -0400
 
     Use %zd instead of %d for printf with size_t types
 
- libseed/seed-builtins.c |    2 +-
+ libseed/seed-builtins.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ee0207fad1efb26fbd1d48e9a2ac811fb761dbd5
@@ -10619,7 +11981,7 @@ Date:   Thu May 7 03:50:01 2009 -0400
 
     Make the repl use the sandbox module, so as to not expose the repl's globals inside the repl
 
- examples/repl.js |   11 ++++++++++-
+ examples/repl.js | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 38a11de0a90aabe236acf1d27f08bfd7ae5299c7
@@ -10628,9 +11990,9 @@ Date:   Wed May 6 21:20:16 2009 -0400
 
     Add sandbox module, allows creation of sandboxed JS contexts, with a global object which you can manipulate. It is also possible to fill the global object with the default seed globals
 
- libseed/seed-api.c        |    8 ++--
- libseed/seed.h            |    2 +-
- modules/sandbox/sandbox.c |   92 ++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-api.c        |  8 +++--
+ libseed/seed.h            |  2 +-
+ modules/sandbox/sandbox.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--
  3 files changed, 96 insertions(+), 6 deletions(-)
 
 commit 322b65617b1576d142d6c74e0cedbad4ccf7df99
@@ -10639,10 +12001,10 @@ Date:   Wed May 6 21:02:13 2009 -0400
 
     Add skeleton sandbox module
 
- configure.ac                |    1 +
- modules/Makefile.am         |    2 +-
- modules/sandbox/Makefile.am |   22 ++++++++++++++++++++++
- modules/sandbox/sandbox.c   |    8 ++++++++
+ configure.ac                |  1 +
+ modules/Makefile.am         |  2 +-
+ modules/sandbox/Makefile.am | 22 ++++++++++++++++++++++
+ modules/sandbox/sandbox.c   |  8 ++++++++
  4 files changed, 32 insertions(+), 1 deletion(-)
 
 commit c0ec7e6ca382506eaed3f5ea19c0aa5559111384
@@ -10651,8 +12013,8 @@ Date:   Wed May 6 20:57:49 2009 -0400
 
     Install the multiline repl to /seed and change the repl script in main.c to import this
 
- examples/Makefile.am |    3 +++
- src/main.c           |    5 +----
+ examples/Makefile.am | 3 +++
+ src/main.c           | 5 +----
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit ddffb0b0b8009d74ddb0e356d01fd26bf53c5893
@@ -10661,7 +12023,7 @@ Date:   Wed May 6 16:51:47 2009 -0400
 
     Fill in missing return values in a few Seed canvas functions
 
- modules/canvas/seed-canvas.c |    6 +++++-
+ modules/canvas/seed-canvas.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 5fb3cbaa7d87caecd86d96129d4edf699cb16572
@@ -10670,7 +12032,7 @@ Date:   Wed May 6 15:19:49 2009 -0400
 
     Newline twice should escape from multiline REPL
 
- examples/repl.js |   10 +++++++++-
+ examples/repl.js | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit 22409bd9473b099d63c7c250401f9d9df6721176
@@ -10679,8 +12041,8 @@ Date:   Wed May 6 15:06:49 2009 -0400
 
     Implement a more complete multiline repl using Seed.check_syntax
 
- examples/repl.js                 |   25 ++++---------------------
- modules/readline/seed-readline.c |   16 ++++++++++++++++
+ examples/repl.js                 | 25 ++++---------------------
+ modules/readline/seed-readline.c | 16 ++++++++++++++++
  2 files changed, 20 insertions(+), 21 deletions(-)
 
 commit a96c30066a2cc54d0e7d88cf2f9cd4e7d2254389
@@ -10689,8 +12051,8 @@ Date:   Wed May 6 14:26:59 2009 -0400
 
     Add beginnings of multiline editing support to REPL
 
- examples/repl.js                 |   30 ++++++++++++++++++++++++++++++
- modules/readline/seed-readline.c |   17 +++++++++++++++++
+ examples/repl.js                 | 30 ++++++++++++++++++++++++++++++
+ modules/readline/seed-readline.c | 17 +++++++++++++++++
  2 files changed, 47 insertions(+)
 
 commit d4a95144c71393f2d6b788658648ee7ce3715348
@@ -10699,7 +12061,7 @@ Date:   Tue May 5 18:20:54 2009 -0400
 
     Make a new JSCore class which wraps the argv array, so Seed.argv is always up to date
 
- libseed/seed-builtins.c |   85 ++++++++++++++++++++++++++++++++++-------------
+ libseed/seed-builtins.c | 85 +++++++++++++++++++++++++++++++++++--------------
  1 file changed, 61 insertions(+), 24 deletions(-)
 
 commit 9f89a9d5a063fef382e433d21089525544bac4e0
@@ -10708,9 +12070,9 @@ Date:   Mon May 4 18:39:24 2009 -0400
 
     Distinguish between [null] and undefined in seed_Value_to_string. Format numbers with "%.15g"
 
- libseed/seed-types.c             |    9 ++++++---
- tests/javascript/check-syntax.js |    2 +-
- tests/javascript/everything.js   |    3 ++-
+ libseed/seed-types.c             | 9 ++++++---
+ tests/javascript/check-syntax.js | 2 +-
+ tests/javascript/everything.js   | 3 ++-
  3 files changed, 9 insertions(+), 5 deletions(-)
 
 commit 1d3a678af7d02f917aa971e761d1a1ad4e2bbcce
@@ -10719,7 +12081,7 @@ Date:   Sat May 2 00:39:39 2009 -0400
 
     Don't install NEWS, as we don't use it, and thus it's empty.
 
- Makefile.am |    3 +--
+ Makefile.am | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 9bee035c69f92087d179cd45c489d014f6d977e7
@@ -10728,9 +12090,9 @@ Date:   Thu Apr 30 17:25:29 2009 -0400
 
     Add animatev annotation patch required for Same Seed to run
 
- patches/clutter-animatev-annotation.patch      |   13 +
- patches/clutter-animatev-with-annotation.patch |  325 ------------------------
- patches/clutter-color-out-annotation.patch     |   13 -
+ patches/clutter-animatev-annotation.patch      |  13 +
+ patches/clutter-animatev-with-annotation.patch | 325 -------------------------
+ patches/clutter-color-out-annotation.patch     |  13 -
  3 files changed, 13 insertions(+), 338 deletions(-)
 
 commit 81ce36acb2039b829d130cc4a11a54b89a60a722
@@ -10739,7 +12101,7 @@ Date:   Thu Apr 30 17:22:38 2009 -0400
 
     Same Seed doesn't actually require GtkClutter
 
- examples/same-seed/main.js |    6 +++---
+ examples/same-seed/main.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 62489037e8e09cc536f204dbc558f687c61618d0
@@ -10748,7 +12110,7 @@ Date:   Thu Apr 30 01:10:35 2009 -0400
 
     Style fixes in mapping documentation
 
- doc/mapping/mapping.html.in |    4 ++--
+ doc/mapping/mapping.html.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3cfd3234ce61ce746f9797618595a8395137c991
@@ -10757,8 +12119,8 @@ Date:   Thu Apr 30 01:04:06 2009 -0400
 
     Update mapping documentation to be twice as colorful, and by that I mean more consistently colorful
 
- doc/mapping/mapping.html.in |   52 +++++++++++++++++++++----------------------
- doc/style.css               |   15 +++++++++++++
+ doc/mapping/mapping.html.in | 52 ++++++++++++++++++++++-----------------------
+ doc/style.css               | 15 +++++++++++++
  2 files changed, 41 insertions(+), 26 deletions(-)
 
 commit f51bc57f17b4c8c578bacc948316574d40d5f551
@@ -10767,9 +12129,9 @@ Date:   Thu Apr 30 00:40:23 2009 -0400
 
     Some style and cleanup in tutorial code samples
 
- doc/tutorial-standalone/1.js |   17 ++++------
- doc/tutorial-standalone/2.js |   44 +++++++++-----------------
- doc/tutorial-standalone/3.js |   71 ++++++++++++++----------------------------
+ doc/tutorial-standalone/1.js | 17 ++++-------
+ doc/tutorial-standalone/2.js | 44 ++++++++++-----------------
+ doc/tutorial-standalone/3.js | 71 +++++++++++++++-----------------------------
  3 files changed, 45 insertions(+), 87 deletions(-)
 
 commit 370906b450db44cbe74e289b57dddcb61a17a6c4
@@ -10778,7 +12140,7 @@ Date:   Thu Apr 30 00:35:17 2009 -0400
 
     Update style in browser tutorial docs
 
- doc/tutorial-standalone/tutorial.html.in |   85 ++++++++++--------------------
+ doc/tutorial-standalone/tutorial.html.in | 85 +++++++++++---------------------
  1 file changed, 28 insertions(+), 57 deletions(-)
 
 commit c0bfbcc8e0d0ca49f73d90f5a268feb540645a5d
@@ -10787,7 +12149,7 @@ Date:   Thu Apr 30 00:31:12 2009 -0400
 
     Update style in runtime documentation. Also update to use new signal installation format
 
- doc/runtime.html.in |   67 +++++++++++++++++----------------------------------
+ doc/runtime.html.in | 67 ++++++++++++++++++-----------------------------------
  1 file changed, 22 insertions(+), 45 deletions(-)
 
 commit 862ea290ddb6c6ee8867dfe2cc8ad766b308a7ec
@@ -10796,11 +12158,11 @@ Date:   Thu Apr 30 00:14:34 2009 -0400
 
     Replace %Zd with %zd, and the %l in %lg is not necessary
 
- libseed/seed-builtins.c |   10 +++++-----
- libseed/seed-engine.c   |    4 ++--
- libseed/seed-gtype.c    |   10 +++++-----
- libseed/seed-signals.c  |    6 +++---
- libseed/seed-types.c    |    2 +-
+ libseed/seed-builtins.c | 10 +++++-----
+ libseed/seed-engine.c   |  4 ++--
+ libseed/seed-gtype.c    | 10 +++++-----
+ libseed/seed-signals.c  |  6 +++---
+ libseed/seed-types.c    |  2 +-
  5 files changed, 16 insertions(+), 16 deletions(-)
 
 commit b4ff50beb374ed4403b5cc8973580a34a8f416fd
@@ -10809,21 +12171,21 @@ Date:   Wed Apr 29 23:45:24 2009 -0400
 
     Change seed_value_to_string to use %lg, and update all the tests
 
- libseed/seed-types.c                         |    2 +-
- tests/javascript/builtin-argument-length.js  |    2 +-
- tests/javascript/compare.js                  |    2 +-
- tests/javascript/enum.js                     |    2 +-
- tests/javascript/everything.js               |    3 +--
- tests/javascript/gdk-event.js                |    2 +-
- tests/javascript/gtype-property-construct.js |    2 +-
- tests/javascript/gtype-property.js           |    2 +-
- tests/javascript/readline-bind.js            |    2 +-
- tests/javascript/readline.js                 |    2 +-
- tests/javascript/signal-connect.js           |    2 +-
- tests/javascript/struct-constructor.js       |    2 +-
- tests/javascript/struct-nested-set.js        |    2 +-
- tests/javascript/struct-offsets.js           |    2 +-
- tests/javascript/struct-set-member.js        |    2 +-
+ libseed/seed-types.c                         | 2 +-
+ tests/javascript/builtin-argument-length.js  | 2 +-
+ tests/javascript/compare.js                  | 2 +-
+ tests/javascript/enum.js                     | 2 +-
+ tests/javascript/everything.js               | 3 +--
+ tests/javascript/gdk-event.js                | 2 +-
+ tests/javascript/gtype-property-construct.js | 2 +-
+ tests/javascript/gtype-property.js           | 2 +-
+ tests/javascript/readline-bind.js            | 2 +-
+ tests/javascript/readline.js                 | 2 +-
+ tests/javascript/signal-connect.js           | 2 +-
+ tests/javascript/struct-constructor.js       | 2 +-
+ tests/javascript/struct-nested-set.js        | 2 +-
+ tests/javascript/struct-offsets.js           | 2 +-
+ tests/javascript/struct-set-member.js        | 2 +-
  15 files changed, 15 insertions(+), 16 deletions(-)
 
 commit ef96263eb5f2d75f665afe356ba2dcb6cbea3b08
@@ -10832,9 +12194,9 @@ Date:   Wed Apr 29 17:40:02 2009 -0400
 
     Fix some more seed_make_exception format strings
 
- libseed/seed-exceptions.c |    2 +-
- libseed/seed-signals.c    |   34 ++++++++++++++++------------------
- libseed/seed-types.c      |    7 ++-----
+ libseed/seed-exceptions.c |  2 +-
+ libseed/seed-signals.c    | 34 ++++++++++++++++------------------
+ libseed/seed-types.c      |  7 ++-----
  3 files changed, 19 insertions(+), 24 deletions(-)
 
 commit fde8b28afa4dd34d02498831eb8d203b7e1c6630
@@ -10843,10 +12205,10 @@ Date:   Wed Apr 29 17:33:50 2009 -0400
 
     Update modules to use pformat strings for exceptions
 
- libseed/seed.h                   |    2 +-
- modules/os/os.c                  |    4 +---
- modules/readline/seed-readline.c |   16 ++++++----------
- modules/sqlite/seed-sqlite.c     |    3 ++-
+ libseed/seed.h                   |  2 +-
+ modules/os/os.c                  |  4 +---
+ modules/readline/seed-readline.c | 16 ++++++----------
+ modules/sqlite/seed-sqlite.c     |  3 ++-
  4 files changed, 10 insertions(+), 15 deletions(-)
 
 commit 49f98b91c8ac7f92b5d872268e12249ef72fc67b
@@ -10855,15 +12217,15 @@ Date:   Wed Apr 29 17:28:40 2009 -0400
 
     Make seed_make_exception take a format string, and convert all the calls in libseed to use format strings rather than formatting them before calling
 
- configure.ac              |    2 +-
- libseed/seed-builtins.c   |   59 ++++++++++++++++++---------------------------
- libseed/seed-engine.c     |   40 ++++++++++++++----------------
- libseed/seed-exceptions.c |   16 +++++++++---
- libseed/seed-exceptions.h |    5 ++--
- libseed/seed-gtype.c      |   37 ++++++++++++----------------
- libseed/seed-importer.c   |    8 +++---
- libseed/seed-structs.c    |    8 +++---
- libseed/seed.h            |    2 +-
+ configure.ac              |  2 +-
+ libseed/seed-builtins.c   | 59 ++++++++++++++++++-----------------------------
+ libseed/seed-engine.c     | 40 +++++++++++++++-----------------
+ libseed/seed-exceptions.c | 16 ++++++++++---
+ libseed/seed-exceptions.h |  5 ++--
+ libseed/seed-gtype.c      | 37 ++++++++++++-----------------
+ libseed/seed-importer.c   |  8 +++----
+ libseed/seed-structs.c    |  8 +++----
+ libseed/seed.h            |  2 +-
  9 files changed, 80 insertions(+), 97 deletions(-)
 
 commit 6804bcab53a1d632f679f9ae9f4209848ec4fccb
@@ -10872,7 +12234,7 @@ Date:   Wed Apr 29 13:33:35 2009 -0400
 
     Add enum-mapping.png to Makefile
 
- doc/mapping/Makefile.am |    3 ++-
+ doc/mapping/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit c5dfbecd7b230206348cad0c5cbc32ac8fa2b120
@@ -10881,7 +12243,7 @@ Date:   Wed Apr 29 12:36:14 2009 -0400
 
     Add GtkTextView example to Makefile
 
- examples/Makefile.am |    2 ++
+ examples/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit a3b35270ccedb9d7bd53962480e5682afd2ff524
@@ -10890,7 +12252,7 @@ Date:   Wed Apr 29 11:10:40 2009 -0400
 
     Add readline-bind to tests Makefile.am
 
- tests/javascript/Makefile.am |    2 +-
+ tests/javascript/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1e3b997a15280da268c7d810127a27e25b213db0
@@ -10899,7 +12261,7 @@ Date:   Wed Apr 29 03:34:41 2009 -0400
 
     Removed introspect.js from Makefile, as it's been removed itself.
 
- examples/Makefile.am |    2 --
+ examples/Makefile.am | 2 --
  1 file changed, 2 deletions(-)
 
 commit 714b6f888c3d723bbe354a367deedb728318bc7c
@@ -10908,9 +12270,9 @@ Date:   Wed Apr 29 01:49:04 2009 -0400
 
     Update changelog
 
- ChangeLog                   |   20 +++++++
- examples/twitter/twitter.js |  130 +++++++++++++++++++++----------------------
- modules/os/os.c             |    3 +-
+ ChangeLog                   |  20 +++++++
+ examples/twitter/twitter.js | 130 +++++++++++++++++++++-----------------------
+ modules/os/os.c             |   3 +-
  3 files changed, 84 insertions(+), 69 deletions(-)
 
 commit db29d4b69fdad8ed4e7b89b8f941b72746b3f2c4
@@ -10919,7 +12281,7 @@ Date:   Tue Apr 28 19:49:06 2009 -0400
 
     Implement os.access and assosciated modes
 
- modules/os/os.c |   35 ++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 35 ++++++++++++++++++++++++++++++++++-
  1 file changed, 34 insertions(+), 1 deletion(-)
 
 commit 64a30d269dfc4eda04e91f12ded7ed6627f534e1
@@ -10928,7 +12290,7 @@ Date:   Tue Apr 28 17:47:50 2009 -0400
 
     Update timeout.js to include the priority argument now required for GLib.timeout_add
 
- examples/glib/timeout.js |    6 ++----
+ examples/glib/timeout.js | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit a73eb070cbd601a4f212ad5bc7bd90f7a1f823e6
@@ -10937,10 +12299,10 @@ Date:   Tue Apr 28 17:27:25 2009 -0400
 
     Update style and imports on the OpenGL example
 
- examples/opengl/glut-teapot.js    |   41 ++--
- examples/opengl/seed-gears.js     |  396 ++++++++++++++++++-------------------
- examples/opengl/triangle-actor.js |   34 ++--
- libseed/seed-importer.c           |    6 +-
+ examples/opengl/glut-teapot.js    |  41 ++--
+ examples/opengl/seed-gears.js     | 396 +++++++++++++++++++-------------------
+ examples/opengl/triangle-actor.js |  34 ++--
+ libseed/seed-importer.c           |   6 +-
  4 files changed, 233 insertions(+), 244 deletions(-)
 
 commit 33236526dca506b8e75d838682b59df3b8a7a76a
@@ -10949,8 +12311,8 @@ Date:   Tue Apr 28 16:07:53 2009 -0400
 
     Update vte-test example style, and remove old Gtk.main_quit hack
 
- examples/soup.js     |    2 +-
- examples/vte-test.js |   42 +++++++++++++++++++-----------------------
+ examples/soup.js     |  2 +-
+ examples/vte-test.js | 42 +++++++++++++++++++-----------------------
  2 files changed, 20 insertions(+), 24 deletions(-)
 
 commit 8ba45bc2f599e6c877345fb710f3fef3545e758b
@@ -10959,7 +12321,7 @@ Date:   Tue Apr 28 16:04:58 2009 -0400
 
     Update repl example style
 
- examples/repl.js |    9 +++------
+ examples/repl.js | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
 commit 37eaa4036ca2faba6ff0eac4b103155ebb3306fb
@@ -10968,7 +12330,7 @@ Date:   Tue Apr 28 16:04:36 2009 -0400
 
     Update notify-test example style
 
- examples/notify-test.js |    3 +--
+ examples/notify-test.js | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 368bb59cc540a07d827da9678990e77486c4c219
@@ -10977,7 +12339,7 @@ Date:   Tue Apr 28 16:04:08 2009 -0400
 
     Update style in n-oscillator example
 
- examples/n-oscillator.js |  131 ++++++++++++++++++++++------------------------
+ examples/n-oscillator.js | 131 ++++++++++++++++++++++-------------------------
  1 file changed, 62 insertions(+), 69 deletions(-)
 
 commit 77f8791aeb4e81cd7a2c11616827cc79702514eb
@@ -10986,7 +12348,7 @@ Date:   Tue Apr 28 16:02:56 2009 -0400
 
     Update style in ls example
 
- examples/ls.js |    3 +--
+ examples/ls.js | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 183d310c2ca8f784ec93ef3d3d700c12aebe3a0f
@@ -10995,7 +12357,7 @@ Date:   Tue Apr 28 16:02:41 2009 -0400
 
     Update style in json-reddit example
 
- examples/json-reddit.js |   17 ++++++++---------
+ examples/json-reddit.js | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
 
 commit fadefee25906b2097849416c295a8bdebdf83eb5
@@ -11004,7 +12366,7 @@ Date:   Tue Apr 28 16:02:21 2009 -0400
 
     Fix no longer useful Gtk.main_quit hack in json-packing.js
 
- examples/json-packing.js |    2 +-
+ examples/json-packing.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d9bde09433516365d77ecaa8996e3d9150572012
@@ -11013,7 +12375,7 @@ Date:   Tue Apr 28 16:01:48 2009 -0400
 
     Remove introspect.js example, it is silly because we now have GIRs for GIRepository
 
- examples/introspect.js |   11 -----------
+ examples/introspect.js | 11 -----------
  1 file changed, 11 deletions(-)
 
 commit 6094f8ebd549d8100d1290ada625a7ac78aa05f6
@@ -11022,7 +12384,7 @@ Date:   Tue Apr 28 16:01:18 2009 -0400
 
     Fix the GLib warnings in gtktreeview example
 
- examples/gtktreeview.js |    4 ++--
+ examples/gtktreeview.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5d4f430aaad49a76ae15d0c472be6cdd78cea9c1
@@ -11031,7 +12393,7 @@ Date:   Tue Apr 28 15:59:59 2009 -0400
 
     Update style on gtkplug example
 
- examples/gtkplug.js |    3 +--
+ examples/gtkplug.js | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 7833b171a4d73b863e158df8378bf2c327119c73
@@ -11040,7 +12402,7 @@ Date:   Tue Apr 28 15:59:39 2009 -0400
 
     Gnio server example should use new imports system
 
- examples/Gnio-server.js |   10 ++++------
+ examples/Gnio-server.js | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 commit 8cae0b1c47bf3edf47734cda44d1a949af47b946
@@ -11049,7 +12411,7 @@ Date:   Tue Apr 28 15:59:09 2009 -0400
 
     Gnio example should use new imports system
 
- examples/Gnio.js |    4 ++--
+ examples/Gnio.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a1d0d2b62e1da482773bdafc316e1bd251b27b51
@@ -11058,7 +12420,7 @@ Date:   Tue Apr 28 15:58:46 2009 -0400
 
     Update gdkpixbufloader example style
 
- examples/gdkpixbufloader.js |   34 +++++++++++++++-------------------
+ examples/gdkpixbufloader.js | 34 +++++++++++++++-------------------
  1 file changed, 15 insertions(+), 19 deletions(-)
 
 commit b4b3440322287b6c3a9d13ae40b317b6f1840439
@@ -11067,7 +12429,7 @@ Date:   Tue Apr 28 15:57:53 2009 -0400
 
     GConf example should use new imports system
 
- examples/gconf.js |    2 +-
+ examples/gconf.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 99c1054062554e1a6cc66f3facff6699ff130e2a
@@ -11079,7 +12441,7 @@ Date:   Tue Apr 28 15:56:34 2009 -0400
     Required updating the timeout_add call, which now is timeout_add_full in the gir, so requires a priority argument.
     Also requires changing Clutter.cogl_double_to_fixed to Clutter.double_to_fixed
 
- examples/clutter-cogl.js |    4 ++--
+ examples/clutter-cogl.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 65db152f10c6312384cb3d702d63e249f3c5ff3f
@@ -11088,7 +12450,7 @@ Date:   Tue Apr 28 15:52:18 2009 -0400
 
     Update clutter-cogl example to new style...it still doesn't work
 
- examples/clutter-cogl.js |   31 ++++++++++++-------------------
+ examples/clutter-cogl.js | 31 ++++++++++++-------------------
  1 file changed, 12 insertions(+), 19 deletions(-)
 
 commit 98b45af1c72da26f36a53d50d7ac60528f07c72d
@@ -11097,7 +12459,7 @@ Date:   Tue Apr 28 15:49:48 2009 -0400
 
     Update clutter-cairo example to use the new imports system, and update style
 
- examples/clutter-cairo.js |   11 +++++++----
+ examples/clutter-cairo.js | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit 47ab7d271682b3e550e2723e71a5d1ddc4e428c3
@@ -11106,7 +12468,7 @@ Date:   Tue Apr 28 15:48:18 2009 -0400
 
     Update style in clutter-0.9 example
 
- examples/clutter-0.9.js |   36 ++++++++++++++----------------------
+ examples/clutter-0.9.js | 36 ++++++++++++++----------------------
  1 file changed, 14 insertions(+), 22 deletions(-)
 
 commit 9c87fd821c647496931a05d8a470d99936fcd76e
@@ -11115,7 +12477,7 @@ Date:   Tue Apr 28 15:46:37 2009 -0400
 
     Update style in clutter-0.8 example
 
- examples/clutter-0.8.js |   18 ++++++------------
+ examples/clutter-0.8.js | 18 ++++++------------
  1 file changed, 6 insertions(+), 12 deletions(-)
 
 commit 6578ba567184c60ac2d1852e2df602cb88ccf05a
@@ -11124,7 +12486,7 @@ Date:   Tue Apr 28 15:45:17 2009 -0400
 
     Update style in calculator example, and remove Gtk.main_quit hack
 
- examples/calculator.js |   43 +++++++++++++++----------------------------
+ examples/calculator.js | 43 +++++++++++++++----------------------------
  1 file changed, 15 insertions(+), 28 deletions(-)
 
 commit 2ff2b1b858e6736093682ed01ecbb5272b7854d0
@@ -11133,7 +12495,7 @@ Date:   Tue Apr 28 15:42:18 2009 -0400
 
     Update style in async-quine example
 
- examples/async-quine.js |    6 +++---
+ examples/async-quine.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 79a7a7476bb5902f85ebee05fcd2c401d206218c
@@ -11142,7 +12504,7 @@ Date:   Tue Apr 28 15:41:41 2009 -0400
 
     Update actions example to use more reasonable indentation, drop use of with, drop the Gtk.main_quit hack that is not necessary
 
- examples/actions.js |   98 ++++++++++++++++++++++++++++-----------------------
+ examples/actions.js | 98 +++++++++++++++++++++++++++++------------------------
  1 file changed, 53 insertions(+), 45 deletions(-)
 
 commit ee922caef45a1055f187253bb00c1613ec4b8d7b
@@ -11151,7 +12513,7 @@ Date:   Tue Apr 28 15:31:59 2009 -0400
 
     Update accelgroup example to use more...modern seed
 
- examples/accelgroup.js |   30 +++++++++++-------------------
+ examples/accelgroup.js | 30 +++++++++++-------------------
  1 file changed, 11 insertions(+), 19 deletions(-)
 
 commit 8f6084c7f2eea8db6ec3982459ffa3140bc3b7f0
@@ -11160,21 +12522,21 @@ Date:   Tue Apr 28 13:41:51 2009 -0400
 
     Clean up formatting for a lot of the examples
 
- examples/Gnio-server.js     |   24 +++---
- examples/accelgroup.js      |   30 +++----
- examples/actions.js         |   90 ++++++++++-----------
- examples/async-quine.js     |   14 ++--
- examples/calculator.js      |  148 +++++++++++++++++-----------------
- examples/clutter-0.8.js     |  154 ++++++++++++++++++------------------
- examples/clutter-0.9.js     |  160 ++++++++++++++++++-------------------
- examples/clutter-cogl.js    |  148 +++++++++++++++++-----------------
- examples/gdkpixbufloader.js |   38 ++++-----
- examples/gtkplug.js         |   14 ++--
- examples/json-packing.js    |   32 ++++----
- examples/ls.js              |    6 +-
- examples/notify-test.js     |    3 +-
- examples/poppler.js         |  184 +++++++++++++++++++++----------------------
- examples/repl.js            |   18 ++---
+ examples/Gnio-server.js     |  24 +++---
+ examples/accelgroup.js      |  30 ++++----
+ examples/actions.js         |  90 +++++++++++-----------
+ examples/async-quine.js     |  14 ++--
+ examples/calculator.js      | 148 +++++++++++++++++------------------
+ examples/clutter-0.8.js     | 154 ++++++++++++++++++------------------
+ examples/clutter-0.9.js     | 160 +++++++++++++++++++-------------------
+ examples/clutter-cogl.js    | 148 +++++++++++++++++------------------
+ examples/gdkpixbufloader.js |  38 ++++-----
+ examples/gtkplug.js         |  14 ++--
+ examples/json-packing.js    |  32 ++++----
+ examples/ls.js              |   6 +-
+ examples/notify-test.js     |   3 +-
+ examples/poppler.js         | 184 ++++++++++++++++++++++----------------------
+ examples/repl.js            |  18 ++---
  15 files changed, 532 insertions(+), 531 deletions(-)
 
 commit 87cef48930ac2ce9f6b6207f82f46ddb11c0568e
@@ -11183,7 +12545,7 @@ Date:   Tue Apr 28 12:59:17 2009 -0400
 
     Bump version to 0.5.5
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e51eb6abe7409440edf013031238be9b429b4581
@@ -11192,7 +12554,7 @@ Date:   Tue Apr 28 12:56:53 2009 -0400
 
     Check for O_DSYNC, O_RSYNC, O_DIRECT, and O_NOATIME as they do not exist on non GNU c library platforms
 
- modules/os/os.c |   12 ++++++++++--
+ modules/os/os.c | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 commit f6b9ccea62a345665150609067ab004281f14c84
@@ -11201,8 +12563,8 @@ Date:   Tue Apr 28 12:52:49 2009 -0400
 
     Make OS module build conditional
 
- configure.ac           |   11 +++++++++++
- modules/os/Makefile.am |    3 +++
+ configure.ac           | 11 +++++++++++
+ modules/os/Makefile.am |  3 +++
  2 files changed, 14 insertions(+)
 
 commit 3c6e33e7c0d30e5b76ccb186141dba9026fbbc0e
@@ -11211,9 +12573,9 @@ Date:   Tue Apr 28 12:44:34 2009 -0400
 
     Fix OS module build on OSX. OSX has a monolithic C library, and does not have pty.h
 
- config.h.in     |    3 +++
- configure.ac    |    2 ++
- modules/os/os.c |    5 +++++
+ config.h.in     | 3 +++
+ configure.ac    | 2 ++
+ modules/os/os.c | 5 +++++
  3 files changed, 10 insertions(+)
 
 commit df538f89ffe205d0757e8d1d802aead1a40a3ff8
@@ -11222,9 +12584,9 @@ Date:   Tue Apr 28 12:34:05 2009 -0400
 
     Fix OSX build
 
- configure.ac                    |   11 +++++++----
- examples/browser/BrowserView.js |    2 +-
- examples/vte-test.js            |   40 +++++++++++++++++++--------------------
+ configure.ac                    | 11 +++++++----
+ examples/browser/BrowserView.js |  2 +-
+ examples/vte-test.js            | 40 ++++++++++++++++++++--------------------
  3 files changed, 28 insertions(+), 25 deletions(-)
 
 commit 8172c689e3d283496bf90a4206a09d1bb4cca5b4
@@ -11233,7 +12595,7 @@ Date:   Mon Apr 27 23:24:07 2009 -0400
 
     Remove Makefile.in.in from GIT, it should not be there
 
- po/Makefile.in.in |  217 -----------------------------------------------------
+ po/Makefile.in.in | 217 ------------------------------------------------------
  1 file changed, 217 deletions(-)
 
 commit 3e9758b06cedfe00c3e0e605603f0f2bba98eb61
@@ -11242,7 +12604,7 @@ Date:   Mon Apr 27 23:23:12 2009 -0400
 
     Remove -O3 from configure.ac
 
- configure.ac |    2 --
+ configure.ac | 2 --
  1 file changed, 2 deletions(-)
 
 commit e423fc593afb6c19d7c5f8841e7ee99fbb0ecb35
@@ -11257,18 +12619,18 @@ Date:   Mon Apr 27 23:19:28 2009 -0400
      - Make configure fail if required dependencies for a module are not available, instead of silently dropping it.
      - Removed 'ugly' linking to .libs dirs in order to use libtool
 
- Makefile.am                         |    2 +
- configure.ac                        |  113 ++++++++++++++++-------------------
- examples/turtle/Makefile.am         |   17 +++---
- libseed/Makefile.am                 |   20 +++++--
- modules/Multiprocessing/Makefile.am |   32 ++++------
- modules/canvas/Makefile.am          |   33 +++++-----
- modules/example/Makefile.am         |   24 ++++----
- modules/os/Makefile.am              |   31 ++++------
- modules/readline/Makefile.am        |   28 ++++-----
- modules/sqlite/Makefile.am          |   34 +++++------
- src/Makefile.am                     |   32 +++++-----
- tests/c/Makefile.am                 |   12 ++--
+ Makefile.am                         |   2 +
+ configure.ac                        | 113 +++++++++++++++++-------------------
+ examples/turtle/Makefile.am         |  17 +++---
+ libseed/Makefile.am                 |  20 +++++--
+ modules/Multiprocessing/Makefile.am |  32 +++++-----
+ modules/canvas/Makefile.am          |  33 +++++------
+ modules/example/Makefile.am         |  24 ++++----
+ modules/os/Makefile.am              |  31 +++++-----
+ modules/readline/Makefile.am        |  28 ++++-----
+ modules/sqlite/Makefile.am          |  34 +++++------
+ src/Makefile.am                     |  32 +++++-----
+ tests/c/Makefile.am                 |  12 ++--
  12 files changed, 178 insertions(+), 200 deletions(-)
 
 commit df1ac9c5cd3bc5ba6cfe09d177419c53f9070626
@@ -11279,9 +12641,9 @@ Date:   Mon Apr 27 17:09:50 2009 -0400
     
     This reverts commit 5d4d99016decfdf65b0cb8e973b48444e0cb2a15.
 
- configure.ac        |   11 ++++++-----
- libseed/Makefile.am |    4 ++--
- src/Makefile.am     |    2 +-
+ configure.ac        | 11 ++++++-----
+ libseed/Makefile.am |  4 ++--
+ src/Makefile.am     |  2 +-
  3 files changed, 9 insertions(+), 8 deletions(-)
 
 commit 5d4d99016decfdf65b0cb8e973b48444e0cb2a15
@@ -11292,9 +12654,9 @@ Date:   Mon Apr 27 17:09:36 2009 -0400
     
     This reverts commit 3e89e1d856f478bc9df948b79c0529c9c3b874bb.
 
- configure.ac        |   11 +++++------
- libseed/Makefile.am |    4 ++--
- src/Makefile.am     |    2 +-
+ configure.ac        | 11 +++++------
+ libseed/Makefile.am |  4 ++--
+ src/Makefile.am     |  2 +-
  3 files changed, 8 insertions(+), 9 deletions(-)
 
 commit 3e89e1d856f478bc9df948b79c0529c9c3b874bb
@@ -11303,9 +12665,9 @@ Date:   Sun Apr 26 01:43:37 2009 -0400
 
     Fix checking for libffi
 
- configure.ac        |   11 ++++++-----
- libseed/Makefile.am |    4 ++--
- src/Makefile.am     |    2 +-
+ configure.ac        | 11 ++++++-----
+ libseed/Makefile.am |  4 ++--
+ src/Makefile.am     |  2 +-
  3 files changed, 9 insertions(+), 8 deletions(-)
 
 commit 20bf627becb6bad570d471e4cc891267ef92029a
@@ -11316,7 +12678,7 @@ Date:   Sun Apr 26 01:41:22 2009 -0400
     
     This reverts commit 0095b6d727b64bdd52a3308ff2fa33c0cb4ace6c.
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 0095b6d727b64bdd52a3308ff2fa33c0cb4ace6c
@@ -11325,7 +12687,7 @@ Date:   Sun Apr 26 01:31:57 2009 -0400
 
     Use FFI_LDADD instead of FFI_LIBS
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 7abe93f67e3e8b166160860a168466f55eeb0fef
@@ -11334,7 +12696,7 @@ Date:   Sun Apr 26 00:47:05 2009 -0400
 
     Add an index of examples to the documentation site
 
- doc/index.html |   77 +++++++++++++++++++++++++++-----------------------------
+ doc/index.html | 77 ++++++++++++++++++++++++++++------------------------------
  1 file changed, 37 insertions(+), 40 deletions(-)
 
 commit cdfc21e44d50c0a15db1ec1328dc87ba2e54c6a6
@@ -11343,7 +12705,7 @@ Date:   Sun Apr 26 00:39:59 2009 -0400
 
     Add an index of examples to the documentation index
 
- doc/index.html |   47 +++++++++++++++++++++++++++++++++++++++++++++++
+ doc/index.html | 47 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 47 insertions(+)
 
 commit 31afe2f2180d8bd7f39d1afe43f64e202a451293
@@ -11352,11 +12714,11 @@ Date:   Sun Apr 26 00:23:21 2009 -0400
 
     Update module documentation to use new imports system
 
- doc/index.html                      |    2 +-
- doc/modules/canvas.html.in          |    2 +-
- doc/modules/multiprocessing.html.in |    2 +-
- doc/modules/readline.html.in        |    2 +-
- doc/modules/sqlite.html.in          |    2 +-
+ doc/index.html                      | 2 +-
+ doc/modules/canvas.html.in          | 2 +-
+ doc/modules/multiprocessing.html.in | 2 +-
+ doc/modules/readline.html.in        | 2 +-
+ doc/modules/sqlite.html.in          | 2 +-
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 commit fd11efc39826b1238b9cd5dfe96624f6455d9011
@@ -11365,7 +12727,7 @@ Date:   Sun Apr 26 00:20:32 2009 -0400
 
     Add the native module documentation to the documentation index
 
- doc/index.html |   23 +++++++++++++++++++++++
+ doc/index.html | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
 commit 6c97c7604e2608105d4a48e83afd452580068bbf
@@ -11374,7 +12736,7 @@ Date:   Sun Apr 26 00:14:35 2009 -0400
 
     Add the documentation index site to GIT
 
- doc/index.html |   32 ++++++++++++++++++++++++++++++++
+ doc/index.html | 32 ++++++++++++++++++++++++++++++++
  1 file changed, 32 insertions(+)
 
 commit d37e1fd27fe343c2530cef80a037241a14cfc086
@@ -11383,7 +12745,7 @@ Date:   Sun Apr 26 00:09:03 2009 -0400
 
     Fix build
 
- doc/Makefile.am |    3 +--
+ doc/Makefile.am | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 95a0ad67a741c1c26be0fd78124689f6b3f75860
@@ -11392,7 +12754,7 @@ Date:   Sat Apr 25 17:14:30 2009 -0400
 
     Fix typo in mapping documentation. Gtk.Main->Gtk.main
 
- doc/mapping/mapping.html.in |    2 +-
+ doc/mapping/mapping.html.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5c3ffe567c9ab2b62d06dce811df665608e5adfa
@@ -11401,7 +12763,7 @@ Date:   Sat Apr 25 16:49:26 2009 -0400
 
     Add a section on GObjects to the mapping documentation, covers constructors, methods and static methods, the property lookup chain, and signals
 
- doc/mapping/mapping.html.in |   91 ++++++++++++++++++++++++++++++++++++++++---
+ doc/mapping/mapping.html.in | 91 ++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 86 insertions(+), 5 deletions(-)
 
 commit 3289e20c12b54594434c9614d46bf17ec92821b1
@@ -11410,7 +12772,7 @@ Date:   Sat Apr 25 16:05:29 2009 -0400
 
     Add a section on structs and unions to the mapping documentation. Also discuss constants briefly, and make a note on enum validation.
 
- doc/mapping/mapping.html.in |   22 ++++++++++++++++++++++
+ doc/mapping/mapping.html.in | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 commit 226b085ee068994bc7f3ecbd28f38d5c3dbffe17
@@ -11419,13 +12781,13 @@ Date:   Sat Apr 25 15:53:27 2009 -0400
 
     Properly map named constructors of structs, i.e. soup_date_new_from_now now maps to 'new Soup.Date.from_now' instead of 'Soup.Date.new_from_now'
 
- libseed/seed-importer.c |   16 +++++-
- m4/intltool.m4          |   64 +++++++++++++++---------
- m4/libtool.m4           |  128 ++++++++++++++++++++++++++++++++---------------
- m4/ltoptions.m4         |    2 +-
- m4/ltsugar.m4           |   20 ++++----
- m4/ltversion.m4         |   10 ++--
- po/Makefile.in.in       |    4 +-
+ libseed/seed-importer.c |  16 +++++-
+ m4/intltool.m4          |  64 +++++++++++++++---------
+ m4/libtool.m4           | 128 +++++++++++++++++++++++++++++++++---------------
+ m4/ltoptions.m4         |   2 +-
+ m4/ltsugar.m4           |  20 ++++----
+ m4/ltversion.m4         |  10 ++--
+ po/Makefile.in.in       |   4 +-
  7 files changed, 161 insertions(+), 83 deletions(-)
 
 commit 066b57ac90721617763d75f7d7d815d86bf25796
@@ -11434,13 +12796,13 @@ Date:   Sat Apr 25 15:08:40 2009 -0400
 
     Start writing the mapping documentation
 
- configure.ac                 |    4 ++-
- doc/Makefile.am              |    2 +-
- doc/mapping.html.in          |   27 ------------------
- doc/mapping/Makefile.am      |   10 +++++++
- doc/mapping/enum-mapping.png |  Bin 0 -> 10652 bytes
- doc/mapping/mapping.html.in  |   64 ++++++++++++++++++++++++++++++++++++++++++
- doc/style.css                |   13 ++++++++-
+ configure.ac                 |   4 ++-
+ doc/Makefile.am              |   2 +-
+ doc/mapping.html.in          |  27 ------------------
+ doc/mapping/Makefile.am      |  10 +++++++
+ doc/mapping/enum-mapping.png | Bin 0 -> 10652 bytes
+ doc/mapping/mapping.html.in  |  64 +++++++++++++++++++++++++++++++++++++++++++
+ doc/style.css                |  13 ++++++++-
  7 files changed, 90 insertions(+), 30 deletions(-)
 
 commit 2eccde091bb5df84ff1da1b4d2bd0a9c633f188c
@@ -11449,7 +12811,7 @@ Date:   Fri Apr 24 19:57:28 2009 -0400
 
     Add DOAP file describing Seed.
 
- seed.doap |   25 +++++++++++++++++++++++++
+ seed.doap | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 commit f19fd914c49badbadfdd48010e666345b0073717
@@ -11458,16 +12820,16 @@ Date:   Fri Apr 24 05:28:56 2009 -0400
 
     Update transitions to work
 
- examples/browser/main.js                           |    4 -
- examples/clutter-transitions/main.js               |    7 ++
- examples/clutter-transitions/transition-library.js |    3 -
- examples/same-seed/main.js                         |    2 +-
- m4/intltool.m4                                     |   64 ++++------
- m4/libtool.m4                                      |  128 ++++++--------------
- m4/ltoptions.m4                                    |    2 +-
- m4/ltsugar.m4                                      |   20 +--
- m4/ltversion.m4                                    |   10 +-
- po/Makefile.in.in                                  |    4 +-
+ examples/browser/main.js                           |   4 -
+ examples/clutter-transitions/main.js               |   7 ++
+ examples/clutter-transitions/transition-library.js |   3 -
+ examples/same-seed/main.js                         |   2 +-
+ m4/intltool.m4                                     |  64 ++++-------
+ m4/libtool.m4                                      | 128 +++++++--------------
+ m4/ltoptions.m4                                    |   2 +-
+ m4/ltsugar.m4                                      |  20 ++--
+ m4/ltversion.m4                                    |  10 +-
+ po/Makefile.in.in                                  |   4 +-
  10 files changed, 90 insertions(+), 154 deletions(-)
 
 commit d3bc63792c10addeef813d7c2deabcd2f2bc322d
@@ -11476,7 +12838,7 @@ Date:   Fri Apr 24 03:16:57 2009 -0400
 
     Fix small typo in GtkTextView example
 
- examples/gtktextview.js |    2 +-
+ examples/gtktextview.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8e97448f5a04b235457541407f49ec5a7f5065aa
@@ -11485,7 +12847,7 @@ Date:   Fri Apr 24 03:02:52 2009 -0400
 
     Add a GtkTextView example
 
- examples/gtktextview.js |   19 +++++++++++++++++++
+ examples/gtktextview.js | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit b091b1bbd4ccbd36614ae661e258e2a94e307090
@@ -11494,11 +12856,11 @@ Date:   Thu Apr 23 23:17:14 2009 -0400
 
     Switch signal definition to use array of "signals" on GType definition.
 
- libseed/seed-gtype.c                       |   85 ++++++++++++++++++++++++----
- tests/javascript/Makefile.am               |    1 -
- tests/javascript/gtype-signal-args.js      |   14 ++---
- tests/javascript/gtype-signal-exception.js |   42 --------------
- tests/javascript/gtype-signal.js           |   18 ++----
+ libseed/seed-gtype.c                       | 85 ++++++++++++++++++++++++++----
+ tests/javascript/Makefile.am               |  1 -
+ tests/javascript/gtype-signal-args.js      | 14 ++---
+ tests/javascript/gtype-signal-exception.js | 42 ---------------
+ tests/javascript/gtype-signal.js           | 18 ++-----
  5 files changed, 82 insertions(+), 78 deletions(-)
 
 commit c582e4ccc37b7bbf905e7cf56f4130bd1ce4911c
@@ -11507,7 +12869,7 @@ Date:   Thu Apr 23 17:41:09 2009 -0400
 
     Update c-module.js test to use the new imports system
 
- tests/javascript/c-module.js |    2 +-
+ tests/javascript/c-module.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2ebc9e50f8549062f9a1895fa26997463f6078af
@@ -11516,7 +12878,7 @@ Date:   Thu Apr 23 17:40:35 2009 -0400
 
     Rename readline_bind test to readline-bind, to keep convention
 
- tests/javascript/readline-bind.js |    9 +++++++++
+ tests/javascript/readline-bind.js | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit d0113b18407552a044d4163bdaf0079575bb0afd
@@ -11525,11 +12887,11 @@ Date:   Thu Apr 23 17:39:35 2009 -0400
 
     Add gtype-property-construct.js test. Tests installing construction properties
 
- libseed/seed-gtype.c                         |   35 ++++++++++++++++++++++++++
- tests/javascript/Makefile.am                 |    1 +
- tests/javascript/gtype-property-construct.js |   30 ++++++++++++++++++++++
- tests/javascript/gtype-property.js           |    5 ++--
- tests/javascript/readline_bind.js            |    9 -------
+ libseed/seed-gtype.c                         | 35 ++++++++++++++++++++++++++++
+ tests/javascript/Makefile.am                 |  1 +
+ tests/javascript/gtype-property-construct.js | 30 ++++++++++++++++++++++++
+ tests/javascript/gtype-property.js           |  5 ++--
+ tests/javascript/readline_bind.js            |  9 -------
  5 files changed, 68 insertions(+), 12 deletions(-)
 
 commit d2fe9686717db07354797ffcc6da70d384f8ff34
@@ -11540,7 +12902,7 @@ Date:   Thu Apr 23 02:14:50 2009 -0400
     
     This might break some compatibility
 
- libseed/seed-gtype.c |   73 +++++++++++++++++++++++++++++---------------------
+ libseed/seed-gtype.c | 73 ++++++++++++++++++++++++++++++----------------------
  1 file changed, 42 insertions(+), 31 deletions(-)
 
 commit 3b3374ad0b2abdb9d14a8f7ffba3d0297eb014c9
@@ -11549,7 +12911,7 @@ Date:   Thu Apr 23 01:54:12 2009 -0400
 
     Reimplement class_init closures without using FFI.
 
- libseed/seed-gtype.c |  160 +++++++++++++++++++++++---------------------------
+ libseed/seed-gtype.c | 160 +++++++++++++++++++++++----------------------------
  1 file changed, 72 insertions(+), 88 deletions(-)
 
 commit 5811e74fbe5854d63ac9e3679e3b907685532ecf
@@ -11560,8 +12922,8 @@ Date:   Wed Apr 22 23:19:56 2009 -0400
     
     Instead of creating an ffi closure for each GType's instance init closure. We simply store the function as qdata on the GType. This saves memory and improves performance. It also makes it easier in the future to implement memory management of finalizing GTypes.
 
- libseed/seed-gtype.c         |  102 +++++++++++++++++-------------------------
- modules/readline/Makefile.am |    4 +-
+ libseed/seed-gtype.c         | 102 ++++++++++++++++++-------------------------
+ modules/readline/Makefile.am |   4 +-
  2 files changed, 43 insertions(+), 63 deletions(-)
 
 commit 9dc6b8b758bb758af1135ad29b0d6c76f107aa0e
@@ -11570,8 +12932,8 @@ Date:   Wed Apr 22 00:46:08 2009 -0400
 
     Improve closure memory management
 
- examples/clutter-0.8.js |   35 ++++++++++++++++++-----------------
- libseed/seed-closure.c  |    2 ++
+ examples/clutter-0.8.js | 35 ++++++++++++++++++-----------------
+ libseed/seed-closure.c  |  2 ++
  2 files changed, 20 insertions(+), 17 deletions(-)
 
 commit 3d696e4cc8824640cd1f9fa7b051d03036db1da2
@@ -11580,7 +12942,7 @@ Date:   Tue Apr 21 18:34:44 2009 -0400
 
     Fix possible leak of signal user data
 
- libseed/seed-signals.c |   10 +++-------
+ libseed/seed-signals.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
 
 commit 855f10ff740db8122ff55d0c8df61bc67457f373
@@ -11589,7 +12951,7 @@ Date:   Tue Apr 21 18:33:10 2009 -0400
 
     Remove double GC protection of functions connected to signals
 
- libseed/seed-signals.c |    2 --
+ libseed/seed-signals.c | 2 --
  1 file changed, 2 deletions(-)
 
 commit 76c2d6ddc3c7ef42b36bab610088f64f11230c00
@@ -11600,7 +12962,7 @@ Date:   Tue Apr 21 18:29:27 2009 -0400
     
     This reverts commit a85c0360d45d82def1b164ba6e329f5e771dc1a8.
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a85c0360d45d82def1b164ba6e329f5e771dc1a8
@@ -11609,7 +12971,7 @@ Date:   Tue Apr 21 18:13:39 2009 -0400
 
     Importer should only include files as JavaScript files if they end in .js
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4aaba3b31dd04ca185b6db3caa140159d08d0cbb
@@ -11618,7 +12980,7 @@ Date:   Tue Apr 21 18:08:33 2009 -0400
 
     Fix leak in imports, relating to the importer directory objects
 
- libseed/seed-importer.c |   48 ++++++++---------------------------------------
+ libseed/seed-importer.c | 48 ++++++++----------------------------------------
  1 file changed, 8 insertions(+), 40 deletions(-)
 
 commit d04f6885c3ba19cc2aea20219cf55668192f3aec
@@ -11627,7 +12989,7 @@ Date:   Mon Apr 20 01:19:36 2009 -0400
 
     Implement imports.Directory constructor
 
- libseed/seed-importer.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-importer.c | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit bc1421da515e6f504945cd5ec103f31286fd632f
@@ -11636,7 +12998,7 @@ Date:   Fri Apr 17 20:51:32 2009 -0400
 
     Remove the deprecated Seed.get/set include path
 
- libseed/seed-builtins.c |   56 -----------------------------------------------
+ libseed/seed-builtins.c | 56 -------------------------------------------------
  1 file changed, 56 deletions(-)
 
 commit d995a4bbe5fc55d42af5ac30953ef9dc794ea8ee
@@ -11645,7 +13007,7 @@ Date:   Fri Apr 17 20:50:01 2009 -0400
 
     Add seed_prepare_global_context to the API
 
- libseed/seed.h |    2 ++
+ libseed/seed.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 8ccbaefbd86a0cac6d06b2b580bde06240e8983a
@@ -11654,11 +13016,11 @@ Date:   Fri Apr 17 19:59:52 2009 -0400
 
     Clean up some warnings
 
- libseed/Makefile.am     |    2 +-
- libseed/seed-engine.c   |   26 --------------------------
- libseed/seed-gtype.c    |    3 +--
- libseed/seed-importer.c |   10 +++++-----
- libseed/seed-signals.c  |    3 ---
+ libseed/Makefile.am     |  2 +-
+ libseed/seed-engine.c   | 26 --------------------------
+ libseed/seed-gtype.c    |  3 +--
+ libseed/seed-importer.c | 10 +++++-----
+ libseed/seed-signals.c  |  3 ---
  5 files changed, 7 insertions(+), 37 deletions(-)
 
 commit ee8be847da0105a447de678d3e0f1c53051d7e43
@@ -11667,7 +13029,7 @@ Date:   Fri Apr 17 19:55:46 2009 -0400
 
     Reimplement Seed.import_namespace in terms of the new system, it's still deprecated, but at least it works now
 
- libseed/seed-engine.c |  261 ++-----------------------------------------------
+ libseed/seed-engine.c | 261 ++------------------------------------------------
  1 file changed, 6 insertions(+), 255 deletions(-)
 
 commit b4adaa4bdd36f2cee652052fa56d8c5208a8302c
@@ -11676,10 +13038,10 @@ Date:   Fri Apr 17 14:43:15 2009 -0400
 
     Some tutorial updates
 
- doc/tutorial-standalone/1.js             |    4 +--
- doc/tutorial-standalone/2.js             |   20 ++++++------
- doc/tutorial-standalone/3.js             |   50 +++++++++++++++---------------
- doc/tutorial-standalone/tutorial.html.in |   10 +++---
+ doc/tutorial-standalone/1.js             |  4 +--
+ doc/tutorial-standalone/2.js             | 20 ++++++-------
+ doc/tutorial-standalone/3.js             | 50 ++++++++++++++++----------------
+ doc/tutorial-standalone/tutorial.html.in | 10 +++----
  4 files changed, 42 insertions(+), 42 deletions(-)
 
 commit f64b01c0505f8ddf9a20c2bced56e0ff55fef4b8
@@ -11688,7 +13050,7 @@ Date:   Fri Apr 17 04:13:52 2009 -0400
 
     Workaround for strange timeline problem.
 
- examples/clutter-transitions/main.js |    6 +++++-
+ examples/clutter-transitions/main.js | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 1461d92ed7e63444c1c3baa31fa3995104af7798
@@ -11697,7 +13059,7 @@ Date:   Fri Apr 17 04:06:18 2009 -0400
 
     Fix usage of JSCore types in xternal header file
 
- libseed/seed.h |    2 +-
+ libseed/seed.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit df6af1b41e14bfc4a256880b3318a30feb2e280c
@@ -11706,9 +13068,9 @@ Date:   Fri Apr 17 03:39:44 2009 -0400
 
     Add seed_importer_set_search_path to the API
 
- RELEASE                 |    7 ++++++-
- libseed/seed-importer.c |   21 +++++++++++++++++++++
- libseed/seed.h          |    3 +++
+ RELEASE                 |  7 ++++++-
+ libseed/seed-importer.c | 21 +++++++++++++++++++++
+ libseed/seed.h          |  3 +++
  3 files changed, 30 insertions(+), 1 deletion(-)
 
 commit f5acdac571893d47309d69da8c3476eb422bf93c
@@ -11720,9 +13082,9 @@ Date:   Thu Apr 16 20:44:53 2009 -0400
     * Add version checking for introspection (>=0.6.3)
     * Don't check for libffi in the wrong place
 
- configure.ac        |    8 ++++----
- libseed/Makefile.am |    2 +-
- src/Makefile.am     |    1 +
+ configure.ac        | 8 ++++----
+ libseed/Makefile.am | 2 +-
+ src/Makefile.am     | 1 +
  3 files changed, 6 insertions(+), 5 deletions(-)
 
 commit be6fcb043c05935eed2cd80fcf11663b63baa28d
@@ -11731,8 +13093,8 @@ Date:   Thu Apr 16 14:00:52 2009 -0400
 
     Add release notes
 
- ChangeLog |    2 ++
- RELEASE   |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog |  2 ++
+ RELEASE   | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 87 insertions(+)
 
 commit 1012762ddfae9d6b33c00d7a10bb07201e499814
@@ -11741,7 +13103,7 @@ Date:   Wed Apr 15 20:51:28 2009 -0400
 
     Stopgap to get around the broken pipe test thing.
 
- tests/run-tests.py |   61 +++++++++++++++++++++++++++-------------------------
+ tests/run-tests.py | 61 ++++++++++++++++++++++++++++--------------------------
  1 file changed, 32 insertions(+), 29 deletions(-)
 
 commit 510b74c44059d7b6518356e229207750cdfc47c6
@@ -11750,7 +13112,7 @@ Date:   Wed Apr 15 20:46:00 2009 -0400
 
     %Zd is size_t, not %d...
 
- modules/os/os.c |    2 +-
+ modules/os/os.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 34a99f1fb4fb4e893ea3dbbd6c6578529bc9e729
@@ -11759,8 +13121,8 @@ Date:   Wed Apr 15 20:41:32 2009 -0400
 
     Missing INSTALL.osx and gtype-signal-args tests in tarball.
 
- Makefile.am                  |    1 +
- tests/javascript/Makefile.am |    1 +
+ Makefile.am                  | 1 +
+ tests/javascript/Makefile.am | 1 +
  2 files changed, 2 insertions(+)
 
 commit 3d17524f5da326c92a296faee3e3e519d985960a
@@ -11769,7 +13131,7 @@ Date:   Wed Apr 15 20:38:05 2009 -0400
 
     Add them to configure.
 
- configure.ac |    2 ++
+ configure.ac | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 63930876a97c2b92caada1a4bb034c34837b60c8
@@ -11778,10 +13140,10 @@ Date:   Wed Apr 15 20:37:27 2009 -0400
 
     Add some files that were missing from the build.
 
- examples/Makefile.am           |  130 +++++++++++++++++++++-------------------
- examples/opengl/Makefile.am    |    2 +-
- examples/pong/Makefile.am      |   19 ++++++
- examples/same-seed/Makefile.am |   29 +++++++++
+ examples/Makefile.am           | 130 +++++++++++++++++++++--------------------
+ examples/opengl/Makefile.am    |   2 +-
+ examples/pong/Makefile.am      |  19 ++++++
+ examples/same-seed/Makefile.am |  29 +++++++++
  4 files changed, 116 insertions(+), 64 deletions(-)
 
 commit 74c227033bf0f977f3ac20caf7be02627d388788
@@ -11790,7 +13152,7 @@ Date:   Wed Apr 15 20:29:08 2009 -0400
 
     That release-checking script I've been talking about.
 
- tools/check-release.sh |   38 ++++++++++++++++++++++++++++++++++++++
+ tools/check-release.sh | 38 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 38 insertions(+)
 
 commit 4c41a2361128d672b92b2fd7ba72ec39e7716aa8
@@ -11799,7 +13161,7 @@ Date:   Wed Apr 15 17:00:53 2009 -0400
 
     Update pong example to use new imports
 
- examples/pong/pong.js |   89 +++++++++++++++++++++++++------------------------
+ examples/pong/pong.js | 89 ++++++++++++++++++++++++++-------------------------
  1 file changed, 45 insertions(+), 44 deletions(-)
 
 commit 9cccb2862f009d7673bdbe61355c69742cfe6ca5
@@ -11808,9 +13170,9 @@ Date:   Wed Apr 15 16:57:42 2009 -0400
 
     Some changelog updates, bump version number
 
- ChangeLog                    |    7 ++++---
- configure.ac                 |    2 +-
- doc/reference/tmpl/seed.sgml |    1 +
+ ChangeLog                    | 7 ++++---
+ configure.ac                 | 2 +-
+ doc/reference/tmpl/seed.sgml | 1 +
  3 files changed, 6 insertions(+), 4 deletions(-)
 
 commit 9919c9ba25149a464912f7c4fa58e1cea87a22dd
@@ -11826,7 +13188,7 @@ Date:   Wed Apr 15 12:44:43 2009 -0400
 
     Addos.ttyname os.tcsetpgrp and os.tcgetpgrp
 
- modules/os/os.c |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ modules/os/os.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 67 insertions(+), 2 deletions(-)
 
 commit f4ae29de47abfff57bc7897d0c76252082a29e82
@@ -11835,7 +13197,7 @@ Date:   Wed Apr 15 12:40:27 2009 -0400
 
     Add os.write
 
- modules/os/os.c |   27 ++++++++++++++++++++++++++-
+ modules/os/os.c | 27 ++++++++++++++++++++++++++-
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 commit e7f263321f4c91f7b6c043bdd573b82cdebaf183
@@ -11844,7 +13206,7 @@ Date:   Wed Apr 15 12:36:03 2009 -0400
 
     Add os.read
 
- modules/os/os.c |   34 +++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 34 +++++++++++++++++++++++++++++++++-
  1 file changed, 33 insertions(+), 1 deletion(-)
 
 commit 266451256299166ec9c2a42523d98dc6b4d2d6dd
@@ -11853,8 +13215,8 @@ Date:   Wed Apr 15 12:29:17 2009 -0400
 
     Add os.openpty and os.pipe
 
- modules/os/Makefile.am |    2 +-
- modules/os/os.c        |   59 +++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/os/Makefile.am |  2 +-
+ modules/os/os.c        | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 59 insertions(+), 2 deletions(-)
 
 commit c779c7ddd2c77e23837d371ff7d841fe6ea673b4
@@ -11863,8 +13225,8 @@ Date:   Wed Apr 15 12:23:16 2009 -0400
 
     Add os.lseek
 
- examples/glib/timeout.js |    8 +++++---
- modules/os/os.c          |   25 ++++++++++++++++++++++++-
+ examples/glib/timeout.js |  8 +++++---
+ modules/os/os.c          | 25 ++++++++++++++++++++++++-
  2 files changed, 29 insertions(+), 4 deletions(-)
 
 commit 621ffa1bd2ea68e3b3b3aebf640c0db5e512a2f0
@@ -11873,7 +13235,7 @@ Date:   Wed Apr 15 03:29:31 2009 -0400
 
     Small fix.
 
- examples/clutter-cogl.js |    2 +-
+ examples/clutter-cogl.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2a8f26d886738518eefc07ca6d8966fc3a71eca0
@@ -11882,7 +13244,7 @@ Date:   Wed Apr 15 02:53:40 2009 -0400
 
     Update gitignore.
 
- .gitignore |   19 ++++++++++++++++++-
+ .gitignore | 19 ++++++++++++++++++-
  1 file changed, 18 insertions(+), 1 deletion(-)
 
 commit 4e09f555fc4149603a8edcbd8ed5f38e5b42f37c
@@ -11891,7 +13253,7 @@ Date:   Wed Apr 15 02:51:31 2009 -0400
 
     Update changelog to lots and lots of changes
 
- ChangeLog |   15 +++++++++++++--
+ ChangeLog | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 commit 434308df1b49763e6f99b3d78af04e3cc99b0e92
@@ -11900,7 +13262,7 @@ Date:   Wed Apr 15 02:50:42 2009 -0400
 
     Update clutter 0.9 test to new imports style and match some changes in Clutter trunk.
 
- examples/clutter-0.9.js |    8 ++++++--
+ examples/clutter-0.9.js | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit b8b71b44c662ed3c5ff2a7004ce69895be63e938
@@ -11916,7 +13278,7 @@ Date:   Wed Apr 15 02:36:53 2009 -0400
 
     Update documentation to API changes.
 
- doc/runtime.html.in |   75 ++++++++++++++++++++++++++++++++++++++++++---------
+ doc/runtime.html.in | 75 +++++++++++++++++++++++++++++++++++++++++++----------
  1 file changed, 62 insertions(+), 13 deletions(-)
 
 commit fda06cd21b7e24eeb74f824f96ebd3635c955a7e
@@ -11925,9 +13287,9 @@ Date:   Wed Apr 15 02:23:21 2009 -0400
 
     Make the file passed to the seed binary available as imports.filename off the bat to prevent recursive running
 
- libseed/seed-importer.c |   33 ++++++++++++++++++++++++++++++---
- libseed/seed.h          |    2 ++
- src/main.c              |    9 ++++++++-
+ libseed/seed-importer.c | 33 ++++++++++++++++++++++++++++++---
+ libseed/seed.h          |  2 ++
+ src/main.c              |  9 ++++++++-
  3 files changed, 40 insertions(+), 4 deletions(-)
 
 commit a041b37d244543f8e12de931c6d7f03b7a7564f8
@@ -11936,7 +13298,7 @@ Date:   Wed Apr 15 01:58:11 2009 -0400
 
     Some more tweaks to the canvas tests
 
- modules/canvas/run-tests.js |    3 +--
+ modules/canvas/run-tests.js | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit ff9eaff0f3f254e6fa30c5e21728e5041a8c7207
@@ -11952,7 +13314,7 @@ Date:   Wed Apr 15 01:51:44 2009 -0400
 
     Add os.ftruncate and os.isatty
 
- modules/os/os.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 43 insertions(+), 1 deletion(-)
 
 commit d3b7fd4e3e65e260abacfa60f58024216823fd18
@@ -11961,7 +13323,7 @@ Date:   Wed Apr 15 01:48:00 2009 -0400
 
     Add os.fsync
 
- modules/os/os.c |   22 +++++++++++++++++++++-
+ modules/os/os.c | 22 +++++++++++++++++++++-
  1 file changed, 21 insertions(+), 1 deletion(-)
 
 commit 44c2e67f287118ea4e5ef2de5125902369290368
@@ -11970,7 +13332,7 @@ Date:   Wed Apr 15 01:46:28 2009 -0400
 
     Add os.fdatasync and os.fpathconf
 
- modules/os/os.c |   43 ++++++++++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 42 insertions(+), 1 deletion(-)
 
 commit 88ca63c2208ebada1399b63536067428a047114c
@@ -11979,8 +13341,8 @@ Date:   Wed Apr 15 01:39:47 2009 -0400
 
     Add os.fchown
 
- libseed/seed-importer.c |    2 +-
- modules/os/os.c         |   26 +++++++++++++++++++++++++-
+ libseed/seed-importer.c |  2 +-
+ modules/os/os.c         | 26 +++++++++++++++++++++++++-
  2 files changed, 26 insertions(+), 2 deletions(-)
 
 commit 5cddaef1692519895f6d22c79d21ee5cd319a324
@@ -11989,8 +13351,8 @@ Date:   Wed Apr 15 01:11:24 2009 -0400
 
     Quiiick fixes to make Same Seed run again. However, there's an annotation missing in Clutter, so you'll have to wait some time to be able to run it yourself.
 
- examples/same-seed/board.js |    4 ++--
- examples/same-seed/main.js  |   50 ++++++++++++++++++++++++++-----------------
+ examples/same-seed/board.js |  4 ++--
+ examples/same-seed/main.js  | 50 +++++++++++++++++++++++++++------------------
  2 files changed, 32 insertions(+), 22 deletions(-)
 
 commit 1c9468574123a1b95a9d6006bbb23930e62eece4
@@ -11999,8 +13361,8 @@ Date:   Tue Apr 14 23:47:51 2009 -0400
 
     When evaluating a script in the importer, deifne the this object to be the global context of the script including the included script
 
- examples/introspect.js  |    2 +-
- libseed/seed-importer.c |    5 +++--
+ examples/introspect.js  | 2 +-
+ libseed/seed-importer.c | 5 +++--
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit 8160ebadf6511b263ecd3ff15ee17f02cb21df60
@@ -12009,8 +13371,8 @@ Date:   Tue Apr 14 23:08:28 2009 -0400
 
     Shader example works with new importer now
 
- examples/clutter-shader/ShaderView.js |   19 ++++++++++++-------
- examples/clutter-shader/main.js       |    6 ++++--
+ examples/clutter-shader/ShaderView.js | 19 ++++++++++++-------
+ examples/clutter-shader/main.js       |  6 ++++--
  2 files changed, 16 insertions(+), 9 deletions(-)
 
 commit fd0b7e567850c6399d804b8c5317ddecf2ddacd9
@@ -12019,10 +13381,10 @@ Date:   Tue Apr 14 23:03:19 2009 -0400
 
     Rough sketch of a port of the browser, could probably be reorganized a bit
 
- examples/browser/BrowserToolbar.js |    4 +++-
- examples/browser/BrowserView.js    |    4 +++-
- examples/browser/TabbedBrowser.js  |    2 +-
- examples/browser/main.js           |    9 +++++----
+ examples/browser/BrowserToolbar.js | 4 +++-
+ examples/browser/BrowserView.js    | 4 +++-
+ examples/browser/TabbedBrowser.js  | 2 +-
+ examples/browser/main.js           | 9 +++++----
  4 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 6daf67689c20e7164fd1c5ceacbb74f6533c87ce
@@ -12031,7 +13393,7 @@ Date:   Tue Apr 14 23:03:02 2009 -0400
 
     Update importer to support mutually inclusive files
 
- libseed/seed-importer.c |    3 ++-
+ libseed/seed-importer.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 28d3161ff4cbc3dabc8649d8cde059616959641b
@@ -12040,7 +13402,7 @@ Date:   Tue Apr 14 21:48:22 2009 -0400
 
     Add os.dup, os.dup2, and os.fchmod
 
- modules/os/os.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ modules/os/os.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 66 insertions(+), 2 deletions(-)
 
 commit be051da8de46f0ed206b99159c55fd0da25548ab
@@ -12049,7 +13411,7 @@ Date:   Tue Apr 14 21:40:12 2009 -0400
 
     Add os.open and os.close
 
- modules/os/os.c |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 48 insertions(+), 1 deletion(-)
 
 commit 2b119d05c22d1df34076f1ad794c5340e117134e
@@ -12058,7 +13420,7 @@ Date:   Tue Apr 14 21:26:43 2009 -0400
 
     Add definitions of all the O_* defines to the OS module
 
- modules/os/os.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ modules/os/os.c | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit 2dd8699f08cecceeecc68115797f0571a47afbd0
@@ -12067,8 +13429,8 @@ Date:   Tue Apr 14 19:18:22 2009 -0400
 
     I don't understand canvas...some more work on handling state correctly
 
- modules/canvas/run-tests.js  |   38 ++++++++++++++++++++------------------
- modules/canvas/seed-canvas.c |   17 ++++++++---------
+ modules/canvas/run-tests.js  | 38 ++++++++++++++++++++------------------
+ modules/canvas/seed-canvas.c | 17 ++++++++---------
  2 files changed, 28 insertions(+), 27 deletions(-)
 
 commit 0b9938eb40741a164ebdc852a027ac049573aa45
@@ -12077,8 +13439,8 @@ Date:   Tue Apr 14 16:26:01 2009 -0400
 
     Composite type tests was testing composite types that didn't exist
 
- modules/canvas/run-tests.js  |    7 +++--
- modules/canvas/seed-canvas.c |   63 ++++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/run-tests.js  |  7 ++---
+ modules/canvas/seed-canvas.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 67 insertions(+), 3 deletions(-)
 
 commit ab31fe85466d51dad60adc4b32d06f07bf5cc2e5
@@ -12087,7 +13449,7 @@ Date:   Tue Apr 14 03:29:01 2009 -0400
 
     Add tests for (unimplemented) compositing operators in seed canvas
 
- modules/canvas/run-tests.js |   27 ++++++++++++++++++++++++++-
+ modules/canvas/run-tests.js | 27 ++++++++++++++++++++++++++-
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 commit ef154e7e67d4367be00157e7c530bdbdaeb7cf3d
@@ -12096,7 +13458,7 @@ Date:   Tue Apr 14 03:11:52 2009 -0400
 
     Fix type in canvas color parsing
 
- modules/canvas/seed-canvas.c |    6 ++----
+ modules/canvas/seed-canvas.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit 74bed7a4a96556d9b90299c4301ff7b335afa835
@@ -12105,7 +13467,7 @@ Date:   Tue Apr 14 03:04:45 2009 -0400
 
     seed_canvas_update_fill/stroke style should return TRUE
 
- modules/canvas/seed-canvas.c |   11 +++++++----
+ modules/canvas/seed-canvas.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit 2057a7c39333fcdc3e8799d8fa2d4a3bbaddc2d9
@@ -12114,7 +13476,7 @@ Date:   Tue Apr 14 01:26:04 2009 -0400
 
     Add a feature to debug builds that checks signal connection arity
 
- libseed/seed-signals.c |   14 ++++++++++++++
+ libseed/seed-signals.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit bd4626f4ac8fa0138f4af8ec8331638f83b02988
@@ -12123,7 +13485,7 @@ Date:   Tue Apr 14 00:51:06 2009 -0400
 
     Protect struct and union prototypes after putting them in the hash table...fixes a crash
 
- libseed/seed-structs.c |    2 ++
+ libseed/seed-structs.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 4f2ea965b9de235debdecd9cc408bd7e1b7bbe41
@@ -12132,7 +13494,7 @@ Date:   Mon Apr 13 22:21:52 2009 -0400
 
     Add os.unsetenv
 
- modules/os/os.c |   27 ++++++++++++++++++++++++++-
+ modules/os/os.c | 27 ++++++++++++++++++++++++++-
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 commit 814279e79b415c531dd4523e5bfad46dc4e527e5
@@ -12141,7 +13503,7 @@ Date:   Mon Apr 13 22:18:23 2009 -0400
 
     Add os.uname
 
- modules/os/os.c |   33 ++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 33 ++++++++++++++++++++++++++++++++-
  1 file changed, 32 insertions(+), 1 deletion(-)
 
 commit 3a7c83541409ba021036639d7d7f7c8bffd1ed7a
@@ -12150,7 +13512,7 @@ Date:   Mon Apr 13 22:13:20 2009 -0400
 
     Add os.umask
 
- modules/os/os.c |   24 +++++++++++++++++++++++-
+ modules/os/os.c | 24 +++++++++++++++++++++++-
  1 file changed, 23 insertions(+), 1 deletion(-)
 
 commit 99fa2d1edf139fb22612ea289119dcf91fac5bca
@@ -12159,7 +13521,7 @@ Date:   Mon Apr 13 22:10:02 2009 -0400
 
     Add os.strerror
 
- modules/os/os.c |   26 ++++++++++++++++++++++++--
+ modules/os/os.c | 26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
 
 commit 65a20841c82794b82a8400e414aa8ff831c1868d
@@ -12168,7 +13530,7 @@ Date:   Mon Apr 13 22:08:06 2009 -0400
 
     Add os.setegid os.setgid os.seteuid and os.setuid
 
- modules/os/os.c |   83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 82 insertions(+), 1 deletion(-)
 
 commit 9aeb14fc9b93bf7a2d1848f3eb1f6727024c45d3
@@ -12177,7 +13539,7 @@ Date:   Mon Apr 13 22:00:32 2009 -0400
 
     Fix redundant requirement of GObject typelib
 
- src/main.c |    4 ----
+ src/main.c | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 01d6fd856d5615b3448efce60831ab59cb4d7e9b
@@ -12186,7 +13548,7 @@ Date:   Mon Apr 13 22:00:09 2009 -0400
 
     Fix the REPL script in main.c
 
- src/main.c |    2 +-
+ src/main.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit baf8914fbfeb4c4de05d694c107820cfb398a372
@@ -12195,8 +13557,8 @@ Date:   Mon Apr 13 21:59:02 2009 -0400
 
     Remove some deprecated usage of Seed.import_namespace in hardcoded strings that could trigger readline module to be imported twice
 
- libseed/seed-engine.c |   12 +++++-------
- src/main.c            |    8 ++++----
+ libseed/seed-engine.c | 12 +++++-------
+ src/main.c            |  8 ++++----
  2 files changed, 9 insertions(+), 11 deletions(-)
 
 commit 0e747232a46f6c0c4d821fdc3a2c451c52e2def7
@@ -12205,7 +13567,7 @@ Date:   Mon Apr 13 21:41:48 2009 -0400
 
     Have class_init callbacks use g_object_info_get_class_struct
 
- libseed/seed-gtype.c |   55 ++++++++++++++++++++++++++++++++++++++++++--------
+ libseed/seed-gtype.c | 55 ++++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 47 insertions(+), 8 deletions(-)
 
 commit df566d56a8f03f522aa1c46071cb154e92d475f6
@@ -12214,7 +13576,7 @@ Date:   Mon Apr 13 21:14:40 2009 -0400
 
     Add os.putenv
 
- modules/os/os.c |   30 +++++++++++++++++++++++++++++-
+ modules/os/os.c | 30 +++++++++++++++++++++++++++++-
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 commit 7d4e47ecb5d5ff687166e4ae76989e3a846037be
@@ -12223,7 +13585,7 @@ Date:   Mon Apr 13 21:10:26 2009 -0400
 
     Add os.getenv
 
- modules/os/os.c |   30 +++++++++++++++++++++++++++---
+ modules/os/os.c | 30 +++++++++++++++++++++++++++---
  1 file changed, 27 insertions(+), 3 deletions(-)
 
 commit bdaad2fb565c0cc576560b3539b4c7e33d348904
@@ -12232,7 +13594,7 @@ Date:   Mon Apr 13 21:01:37 2009 -0400
 
     Add getpid and getppid
 
- modules/os/os.c |   36 +++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 36 +++++++++++++++++++++++++++++++++++-
  1 file changed, 35 insertions(+), 1 deletion(-)
 
 commit 84da10cba691bc7d628f728e0af89faf5e58d6a0
@@ -12241,7 +13603,7 @@ Date:   Mon Apr 13 20:59:15 2009 -0400
 
     Add os.getpgrp
 
- modules/os/os.c |   19 ++++++++++++++++++-
+ modules/os/os.c | 19 ++++++++++++++++++-
  1 file changed, 18 insertions(+), 1 deletion(-)
 
 commit 7dfbb440f03d3448a12a6e713a91e1d688c367aa
@@ -12250,7 +13612,7 @@ Date:   Mon Apr 13 20:56:50 2009 -0400
 
     Add os.getpgid
 
- modules/os/os.c |   23 +++++++++++++++++++++--
+ modules/os/os.c | 23 +++++++++++++++++++++--
  1 file changed, 21 insertions(+), 2 deletions(-)
 
 commit 8520a9e2dd7de1b24a301600e3d315fe99806451
@@ -12259,7 +13621,7 @@ Date:   Mon Apr 13 20:51:50 2009 -0400
 
     Add os.getlogin
 
- modules/os/os.c |   37 +++++++++++++++++++++++++------------
+ modules/os/os.c | 37 +++++++++++++++++++++++++------------
  1 file changed, 25 insertions(+), 12 deletions(-)
 
 commit 0c856b68768797d1534222b0af6ae6a221218db8
@@ -12268,7 +13630,7 @@ Date:   Mon Apr 13 20:48:41 2009 -0400
 
     Add os.getgroups
 
- modules/os/os.c |   24 ++++++++++++++++++++----
+ modules/os/os.c | 24 ++++++++++++++++++++----
  1 file changed, 20 insertions(+), 4 deletions(-)
 
 commit 752afdfc4d6791ed8ad54e6a27babe1ea3ca948a
@@ -12277,9 +13639,9 @@ Date:   Mon Apr 13 20:43:14 2009 -0400
 
     Add seed_make_array to the API
 
- libseed/seed-api.c |    8 +++++++
- libseed/seed.h     |    3 +++
- modules/os/os.c    |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-api.c |  8 +++++++
+ libseed/seed.h     |  3 +++
+ modules/os/os.c    | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
  3 files changed, 76 insertions(+), 1 deletion(-)
 
 commit ac649d8e3fa6f2112bdb2ea1ee4857f67b872b17
@@ -12288,7 +13650,7 @@ Date:   Mon Apr 13 20:35:50 2009 -0400
 
     Add getegid and geteuid
 
- modules/os/os.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
+ modules/os/os.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 43 insertions(+), 1 deletion(-)
 
 commit aab46bab3c26a94eb5263cb401940fedc8f90c54
@@ -12297,7 +13659,7 @@ Date:   Mon Apr 13 20:32:42 2009 -0400
 
     Add ctermid
 
- modules/os/os.c |   26 +++++++++++++++++++++++++-
+ modules/os/os.c | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 
 commit 437f98900823b3311087d6c42d122129684d3f06
@@ -12306,11 +13668,11 @@ Date:   Mon Apr 13 20:30:40 2009 -0400
 
     Start fleshing out the os module a little bit...aiming for identical to the python one as much as possible
 
- configure.ac            |    1 +
- libseed/seed-importer.c |   24 +++++++++++-
- modules/Makefile.am     |    2 +-
- modules/os/Makefile.am  |   25 +++++++++++++
- modules/os/os.c         |   93 +++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac            |  1 +
+ libseed/seed-importer.c | 24 ++++++++++++-
+ modules/Makefile.am     |  2 +-
+ modules/os/Makefile.am  | 25 +++++++++++++
+ modules/os/os.c         | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
  5 files changed, 143 insertions(+), 2 deletions(-)
 
 commit d13b9cfa68155829ef0d3e5476ec8e634bf9b9a9
@@ -12319,10 +13681,10 @@ Date:   Mon Apr 13 19:56:59 2009 -0400
 
     Start porting the browser example
 
- examples/browser/BrowserTab.js     |   34 ++++++++++++++++++++--------------
- examples/browser/BrowserToolbar.js |   10 ++++++----
- examples/browser/BrowserView.js    |    6 ------
- examples/browser/TabbedBrowser.js  |    5 +++--
+ examples/browser/BrowserTab.js     | 34 ++++++++++++++++++++--------------
+ examples/browser/BrowserToolbar.js | 10 ++++++----
+ examples/browser/BrowserView.js    |  6 ------
+ examples/browser/TabbedBrowser.js  |  5 +++--
  4 files changed, 29 insertions(+), 26 deletions(-)
 
 commit bb31ba72f9704ae8aa03d56bd501e87d7ad4f971
@@ -12331,7 +13693,7 @@ Date:   Mon Apr 13 18:10:56 2009 -0400
 
     Wheeeeeeeeeeeeeeeeeeeeeeeeeeeeee
 
- libseed/seed-importer.c |   18 +++++++++++++++---
+ libseed/seed-importer.c | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 commit 36a818f47f041bb2b2d584cbaca56ffc4fedf684
@@ -12340,7 +13702,7 @@ Date:   Mon Apr 13 17:27:36 2009 -0400
 
     Remove old comment
 
- libseed/seed-importer.c |    3 ---
+ libseed/seed-importer.c | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 14293b0e09dd1ac423bd8784e5978aae7974b1a7
@@ -12349,7 +13711,7 @@ Date:   Mon Apr 13 17:24:50 2009 -0400
 
     Remove gratuitous protection
 
- libseed/seed-importer.c |    1 -
+ libseed/seed-importer.c | 1 -
  1 file changed, 1 deletion(-)
 
 commit f79987039e87d7ca1164e3ef077e5a03659163ea
@@ -12358,7 +13720,7 @@ Date:   Mon Apr 13 17:23:48 2009 -0400
 
     Some more importer cleanup stuff
 
- libseed/seed-importer.c |    9 +++++++--
+ libseed/seed-importer.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit e84377143afd804aa0643db9f3c3060f317ca911
@@ -12367,8 +13729,8 @@ Date:   Mon Apr 13 16:49:20 2009 -0400
 
     Fix some more context confusion, and add a seed_prepare_global_context function
 
- examples/browser/BrowserView.js |    4 ++++
- libseed/seed-importer.c         |   12 ++++++++++--
+ examples/browser/BrowserView.js |  4 ++++
+ libseed/seed-importer.c         | 12 ++++++++++--
  2 files changed, 14 insertions(+), 2 deletions(-)
 
 commit 85fcd4d3a8e49ddfec3a0318825c9ea824f0558d
@@ -12377,16 +13739,16 @@ Date:   Mon Apr 13 16:04:10 2009 -0400
 
     Fix shadowed variable declaration causing the Seed global object to be wrong sometimes with the new importer
 
- examples/browser/BrowserView.js |    2 ++
- libseed/seed-builtins.c         |    4 +++-
- libseed/seed-closure.c          |    2 ++
- libseed/seed-engine.c           |   11 ++++++++++-
- libseed/seed-engine.h           |    2 ++
- libseed/seed-gtype.c            |    8 ++++++++
- libseed/seed-importer.c         |   11 ++---------
- libseed/seed-importer.h         |    2 ++
- libseed/seed-signals.c          |    4 +++-
- libseed/seed-types.c            |    3 ++-
+ examples/browser/BrowserView.js |  2 ++
+ libseed/seed-builtins.c         |  4 +++-
+ libseed/seed-closure.c          |  2 ++
+ libseed/seed-engine.c           | 11 ++++++++++-
+ libseed/seed-engine.h           |  2 ++
+ libseed/seed-gtype.c            |  8 ++++++++
+ libseed/seed-importer.c         | 11 ++---------
+ libseed/seed-importer.h         |  2 ++
+ libseed/seed-signals.c          |  4 +++-
+ libseed/seed-types.c            |  3 ++-
  10 files changed, 36 insertions(+), 13 deletions(-)
 
 commit b335fdec6c7ae1632d91acc1c8dc152e4a72d07b
@@ -12395,8 +13757,8 @@ Date:   Mon Apr 13 14:11:57 2009 -0400
 
     Add a high level description/spec of the importer object
 
- libseed/seed-importer.c     |   34 ++++++++++++++++++++++++++++++++++
- modules/canvas/run-tests.js |   36 ++++++++++++++++++------------------
+ libseed/seed-importer.c     | 34 ++++++++++++++++++++++++++++++++++
+ modules/canvas/run-tests.js | 36 ++++++++++++++++++------------------
  2 files changed, 52 insertions(+), 18 deletions(-)
 
 commit a13762d1721d6aeea36df0d56ecc8634fb168a30
@@ -12405,7 +13767,7 @@ Date:   Mon Apr 13 13:54:30 2009 -0400
 
     Some comments on the new importer
 
- libseed/seed-importer.c |    2 ++
+ libseed/seed-importer.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 6d6594fc7b9007e26e0dd684448e730a2549cc37
@@ -12414,9 +13776,9 @@ Date:   Sun Apr 12 17:57:15 2009 -0400
 
     Use the correct context for adding globals to new import contexts
 
- examples/browser/TabbedBrowser.js |    1 +
- examples/browser/main.js          |   13 ++++++-------
- libseed/seed-importer.c           |    6 +++---
+ examples/browser/TabbedBrowser.js |  1 +
+ examples/browser/main.js          | 13 ++++++-------
+ libseed/seed-importer.c           |  6 +++---
  3 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 868ccb7ec9c567c2cc322eff5a9d4c596ca7daf3
@@ -12425,9 +13787,9 @@ Date:   Sun Apr 12 17:38:53 2009 -0400
 
     Add SEED_DEBUG_IMPORTER and some debugging statements
 
- libseed/seed-debug.h    |    3 ++-
- libseed/seed-engine.c   |    3 ++-
- libseed/seed-importer.c |    9 +++++++++
+ libseed/seed-debug.h    | 3 ++-
+ libseed/seed-engine.c   | 3 ++-
+ libseed/seed-importer.c | 9 +++++++++
  3 files changed, 13 insertions(+), 2 deletions(-)
 
 commit 35d756a2bb843c37f6c0f9b943ecbfb089ecd0f3
@@ -12436,7 +13798,7 @@ Date:   Sun Apr 12 17:27:10 2009 -0400
 
     Update shader example
 
- examples/clutter-shader/main.js |   15 ++++++++-------
+ examples/clutter-shader/main.js | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit 345812d7124fa8766803a16e7de8f545a0e62969
@@ -12445,13 +13807,13 @@ Date:   Sun Apr 12 17:25:09 2009 -0400
 
     A bunch of more minor examples updated
 
- examples/n-oscillator.js  |   26 +++++++++++++-------------
- examples/notify-test.js   |    8 ++++----
- examples/poppler.js       |   40 ++++++++++++++++++++--------------------
- examples/quine.js         |    2 +-
- examples/repl.js          |    2 +-
- examples/soup.js          |    2 +-
- examples/threaded-repl.js |    4 ++--
+ examples/n-oscillator.js  | 26 +++++++++++++-------------
+ examples/notify-test.js   |  8 ++++----
+ examples/poppler.js       | 40 ++++++++++++++++++++--------------------
+ examples/quine.js         |  2 +-
+ examples/repl.js          |  2 +-
+ examples/soup.js          |  2 +-
+ examples/threaded-repl.js |  4 ++--
  7 files changed, 42 insertions(+), 42 deletions(-)
 
 commit 292052e0f19e03821f2f288d721b753cf3f02827
@@ -12460,16 +13822,16 @@ Date:   Sun Apr 12 17:22:30 2009 -0400
 
     Update twitter example
 
- examples/browser/BrowserStatusbar.js |    7 ++++--
- examples/browser/BrowserView.js      |   45 ++++++++++++++++++----------------
- examples/browser/TabbedBrowser.js    |   25 +++++++++++--------
- examples/browser/main.js             |    8 +++---
- examples/twitter/twitter.js          |   24 +++++++++---------
- libseed/seed-engine.c                |    3 ++-
- libseed/seed-engine.h                |    2 ++
- libseed/seed-gtype.c                 |    8 +++---
- libseed/seed-gtype.h                 |    2 ++
- libseed/seed-importer.c              |    2 ++
+ examples/browser/BrowserStatusbar.js |  7 ++++--
+ examples/browser/BrowserView.js      | 45 +++++++++++++++++++-----------------
+ examples/browser/TabbedBrowser.js    | 25 ++++++++++++--------
+ examples/browser/main.js             |  8 +++----
+ examples/twitter/twitter.js          | 24 +++++++++----------
+ libseed/seed-engine.c                |  3 ++-
+ libseed/seed-engine.h                |  2 ++
+ libseed/seed-gtype.c                 |  8 ++++---
+ libseed/seed-gtype.h                 |  2 ++
+ libseed/seed-importer.c              |  2 ++
  10 files changed, 73 insertions(+), 53 deletions(-)
 
 commit 03bed9f537d73f4df1f7e318054ed729752cc807
@@ -12478,12 +13840,12 @@ Date:   Sun Apr 12 11:26:43 2009 -0400
 
     Update more examples
 
- examples/async-quine.js     |    6 +++---
- examples/gdkpixbufloader.js |   12 ++++++------
- examples/gtktreeview.js     |    3 ++-
- examples/json-packing.js    |    2 +-
- examples/json-reddit.js     |    8 ++++----
- examples/ls.js              |    2 +-
+ examples/async-quine.js     |  6 +++---
+ examples/gdkpixbufloader.js | 12 ++++++------
+ examples/gtktreeview.js     |  3 ++-
+ examples/json-packing.js    |  2 +-
+ examples/json-reddit.js     |  8 ++++----
+ examples/ls.js              |  2 +-
  6 files changed, 17 insertions(+), 16 deletions(-)
 
 commit 814c1bbc82575fb42f1bcaadc3f107868989d1ed
@@ -12492,10 +13854,10 @@ Date:   Sun Apr 12 11:22:52 2009 -0400
 
     Update some more examples to new importer
 
- examples/glib/env.js     |    2 +-
- examples/glib/thread.js  |    2 +-
- examples/glib/timeout.js |    2 +-
- examples/glib/timer.js   |    2 +-
+ examples/glib/env.js     | 2 +-
+ examples/glib/thread.js  | 2 +-
+ examples/glib/timeout.js | 2 +-
+ examples/glib/timer.js   | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit a929363e82a8d8071aa2d3d53d4e4684e523a636
@@ -12504,10 +13866,10 @@ Date:   Sun Apr 12 11:21:54 2009 -0400
 
     Start randomly updating a few examples
 
- examples/calculator.js |   26 +++++++++++++-------------
- examples/gtkplug.js    |   11 ++++++-----
- examples/video.js      |    6 +++---
- examples/vte-test.js   |    6 +++---
+ examples/calculator.js | 26 +++++++++++++-------------
+ examples/gtkplug.js    | 11 ++++++-----
+ examples/video.js      |  6 +++---
+ examples/vte-test.js   |  6 +++---
  4 files changed, 25 insertions(+), 24 deletions(-)
 
 commit 2a0a481dd0be0d7e61a740f79252183b25ad1811
@@ -12516,9 +13878,9 @@ Date:   Sun Apr 12 11:16:55 2009 -0400
 
     Add some more SEED_NOTE's
 
- extensions/Gtk.js      |   45 +++++++++++++++++++++++----------------------
- libseed/seed-engine.c  |    1 +
- libseed/seed-signals.c |   19 -------------------
+ extensions/Gtk.js      | 45 +++++++++++++++++++++++----------------------
+ libseed/seed-engine.c  |  1 +
+ libseed/seed-signals.c | 19 -------------------
  3 files changed, 24 insertions(+), 41 deletions(-)
 
 commit 6d51dd5292b5c1a63365ed1aee13f8ea21bef1bc
@@ -12527,9 +13889,9 @@ Date:   Sun Apr 12 10:53:22 2009 -0400
 
     Fix enum validation to not break flags
 
- examples/accelgroup.js |   16 ++++++++--------
- examples/actions.js    |    6 +++---
- libseed/seed-types.c   |    2 +-
+ examples/accelgroup.js | 16 ++++++++--------
+ examples/actions.js    |  6 +++---
+ libseed/seed-types.c   |  2 +-
  3 files changed, 12 insertions(+), 12 deletions(-)
 
 commit a2a5c2101c1e05223f9a83e366adfdf3ba1d2f0f
@@ -12538,10 +13900,10 @@ Date:   Sun Apr 12 10:49:32 2009 -0400
 
     Fix the rest of the tests
 
- tests/c/api-js-signal-from-c.c        |    3 ++-
- tests/javascript/everything.js        |    1 +
- tests/javascript/gtype-signal-args.js |    3 ++-
- tests/javascript/gvalue-argument.js   |    3 ++-
+ tests/c/api-js-signal-from-c.c        | 3 ++-
+ tests/javascript/everything.js        | 1 +
+ tests/javascript/gtype-signal-args.js | 3 ++-
+ tests/javascript/gvalue-argument.js   | 3 ++-
  4 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 60d259c7d7355c4388c086671a6d985f866a8e7e
@@ -12550,7 +13912,7 @@ Date:   Sun Apr 12 10:43:19 2009 -0400
 
     Change searchPath to include '.' last
 
- extensions/Seed.js |    2 +-
+ extensions/Seed.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4a9f2f1f956e114dbb546b7788276a5862e0e825
@@ -12559,54 +13921,54 @@ Date:   Sun Apr 12 10:17:23 2009 -0400
 
     Tests still don't all pass
 
- extensions/Clutter.js                          |    2 +-
- extensions/GObject.js                          |    2 +-
- extensions/Gio.js                              |    2 +-
- extensions/Gtk.js                              |    2 +-
- libseed/seed-engine.c                          |    8 ++------
- tests/javascript/array-gtype.js                |    4 ++--
- tests/javascript/closure-finalization.js       |    2 +-
- tests/javascript/compare.js                    |    2 +-
- tests/javascript/constructor-args.js           |    2 +-
- tests/javascript/constructor-prototype.js      |    2 +-
- tests/javascript/enum.js                       |    2 +-
- tests/javascript/everything.js                 |    2 +-
- tests/javascript/function-info.js              |    4 ++--
- tests/javascript/gdk-event.js                  |    4 ++--
- tests/javascript/gerror.js                     |    2 +-
- tests/javascript/gobject-scope.js              |    2 +-
- tests/javascript/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtype-property.js             |    4 ++--
- tests/javascript/gtype-signal-args.js          |    2 +-
- tests/javascript/gtype-signal-exception.js     |    2 +-
- tests/javascript/gtype-signal.js               |    2 +-
- tests/javascript/gtype-typerror.js             |    2 +-
- tests/javascript/gtype.js                      |    2 +-
- tests/javascript/gvalue-argument.js            |    2 +-
- tests/javascript/introspect.js                 |    2 +-
- tests/javascript/json-constructor.js           |    4 ++--
- tests/javascript/list-test.js                  |    2 +-
- tests/javascript/native-closure-exception.js   |    2 +-
- tests/javascript/native-closure.js             |    2 +-
- tests/javascript/object-info.js                |    4 ++--
- tests/javascript/out-test.js                   |    2 +-
- tests/javascript/property-benchmark.js         |    2 +-
- tests/javascript/property-glib-exception.js    |    2 +-
- tests/javascript/readline.js                   |    2 +-
- tests/javascript/readline_bind.js              |    2 +-
- tests/javascript/signal-connect.js             |    2 +-
- tests/javascript/signal-exception.js           |    2 +-
- tests/javascript/signal-expects.js             |    2 +-
- tests/javascript/signal-userdata.js            |    2 +-
- tests/javascript/signal.js                     |    2 +-
- tests/javascript/sqlite.js                     |    4 ++--
- tests/javascript/struct-constructor.js         |    2 +-
- tests/javascript/struct-enumerate.js           |    2 +-
- tests/javascript/struct-nested-set.js          |    2 +-
- tests/javascript/struct-offsets.js             |    2 +-
- tests/javascript/struct-set-member.js          |    2 +-
- tests/javascript/struct-union-enumerate.js     |    2 +-
- tests/javascript/type-conversion.js            |    2 +-
+ extensions/Clutter.js                          | 2 +-
+ extensions/GObject.js                          | 2 +-
+ extensions/Gio.js                              | 2 +-
+ extensions/Gtk.js                              | 2 +-
+ libseed/seed-engine.c                          | 8 ++------
+ tests/javascript/array-gtype.js                | 4 ++--
+ tests/javascript/closure-finalization.js       | 2 +-
+ tests/javascript/compare.js                    | 2 +-
+ tests/javascript/constructor-args.js           | 2 +-
+ tests/javascript/constructor-prototype.js      | 2 +-
+ tests/javascript/enum.js                       | 2 +-
+ tests/javascript/everything.js                 | 2 +-
+ tests/javascript/function-info.js              | 4 ++--
+ tests/javascript/gdk-event.js                  | 4 ++--
+ tests/javascript/gerror.js                     | 2 +-
+ tests/javascript/gobject-scope.js              | 2 +-
+ tests/javascript/gtype-class-init-exception.js | 2 +-
+ tests/javascript/gtype-property.js             | 4 ++--
+ tests/javascript/gtype-signal-args.js          | 2 +-
+ tests/javascript/gtype-signal-exception.js     | 2 +-
+ tests/javascript/gtype-signal.js               | 2 +-
+ tests/javascript/gtype-typerror.js             | 2 +-
+ tests/javascript/gtype.js                      | 2 +-
+ tests/javascript/gvalue-argument.js            | 2 +-
+ tests/javascript/introspect.js                 | 2 +-
+ tests/javascript/json-constructor.js           | 4 ++--
+ tests/javascript/list-test.js                  | 2 +-
+ tests/javascript/native-closure-exception.js   | 2 +-
+ tests/javascript/native-closure.js             | 2 +-
+ tests/javascript/object-info.js                | 4 ++--
+ tests/javascript/out-test.js                   | 2 +-
+ tests/javascript/property-benchmark.js         | 2 +-
+ tests/javascript/property-glib-exception.js    | 2 +-
+ tests/javascript/readline.js                   | 2 +-
+ tests/javascript/readline_bind.js              | 2 +-
+ tests/javascript/signal-connect.js             | 2 +-
+ tests/javascript/signal-exception.js           | 2 +-
+ tests/javascript/signal-expects.js             | 2 +-
+ tests/javascript/signal-userdata.js            | 2 +-
+ tests/javascript/signal.js                     | 2 +-
+ tests/javascript/sqlite.js                     | 4 ++--
+ tests/javascript/struct-constructor.js         | 2 +-
+ tests/javascript/struct-enumerate.js           | 2 +-
+ tests/javascript/struct-nested-set.js          | 2 +-
+ tests/javascript/struct-offsets.js             | 2 +-
+ tests/javascript/struct-set-member.js          | 2 +-
+ tests/javascript/struct-union-enumerate.js     | 2 +-
+ tests/javascript/type-conversion.js            | 2 +-
  48 files changed, 56 insertions(+), 60 deletions(-)
 
 commit 59194331a6c2911b85c60da07e705de921631777
@@ -12615,14 +13977,14 @@ Date:   Sun Apr 12 10:06:39 2009 -0400
 
     Make importer work for including the JS extensions to GI modules
 
- extensions/Clutter.js   |    2 ++
- extensions/GObject.js   |    2 ++
- extensions/Gio.js       |    2 ++
- extensions/Gtk.js       |    2 ++
- extensions/Makefile.am  |    2 +-
- extensions/Seed.js      |    2 +-
- libseed/seed-engine.c   |   11 +++++------
- libseed/seed-importer.c |   21 ++++++++++++++++-----
+ extensions/Clutter.js   |  2 ++
+ extensions/GObject.js   |  2 ++
+ extensions/Gio.js       |  2 ++
+ extensions/Gtk.js       |  2 ++
+ extensions/Makefile.am  |  2 +-
+ extensions/Seed.js      |  2 +-
+ libseed/seed-engine.c   | 11 +++++------
+ libseed/seed-importer.c | 21 ++++++++++++++++-----
  8 files changed, 31 insertions(+), 13 deletions(-)
 
 commit c51b2abe85707deb650d56b5617fdde3499ab0ed
@@ -12631,7 +13993,7 @@ Date:   Sun Apr 12 09:46:37 2009 -0400
 
     Properly set Namespace.Object.prototype in the new importer
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 603661a0cf9e08bef21a4147c987f12ffb54d4ea
@@ -12640,49 +14002,49 @@ Date:   Sun Apr 12 09:45:47 2009 -0400
 
     Begin to update tests
 
- tests/javascript/array-gtype.js                |    4 ++--
- tests/javascript/closure-finalization.js       |    3 ++-
- tests/javascript/compare.js                    |    2 +-
- tests/javascript/constructor-args.js           |    2 +-
- tests/javascript/constructor-prototype.js      |    2 +-
- tests/javascript/enum.js                       |    2 +-
- tests/javascript/everything.js                 |    2 +-
- tests/javascript/function-info.js              |    4 ++--
- tests/javascript/gdk-event.js                  |    4 ++--
- tests/javascript/gerror.js                     |    2 +-
- tests/javascript/gobject-scope.js              |    2 +-
- tests/javascript/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtype-property.js             |    4 ++--
- tests/javascript/gtype-signal-args.js          |    2 +-
- tests/javascript/gtype-signal-exception.js     |    2 +-
- tests/javascript/gtype-signal.js               |    2 +-
- tests/javascript/gtype-typerror.js             |    2 +-
- tests/javascript/gtype.js                      |    2 +-
- tests/javascript/gvalue-argument.js            |    2 +-
- tests/javascript/introspect.js                 |    2 +-
- tests/javascript/json-constructor.js           |    4 ++--
- tests/javascript/list-test.js                  |    2 +-
- tests/javascript/native-closure-exception.js   |    2 +-
- tests/javascript/native-closure.js             |    2 +-
- tests/javascript/object-info.js                |    4 ++--
- tests/javascript/out-test.js                   |    2 +-
- tests/javascript/property-benchmark.js         |    2 +-
- tests/javascript/property-glib-exception.js    |    2 +-
- tests/javascript/readline.js                   |    2 +-
- tests/javascript/readline_bind.js              |    2 +-
- tests/javascript/signal-connect.js             |    2 +-
- tests/javascript/signal-exception.js           |    2 +-
- tests/javascript/signal-expects.js             |    2 +-
- tests/javascript/signal-userdata.js            |    2 +-
- tests/javascript/signal.js                     |    2 +-
- tests/javascript/sqlite.js                     |    5 ++---
- tests/javascript/struct-constructor.js         |    2 +-
- tests/javascript/struct-enumerate.js           |    2 +-
- tests/javascript/struct-nested-set.js          |    2 +-
- tests/javascript/struct-offsets.js             |    2 +-
- tests/javascript/struct-set-member.js          |    2 +-
- tests/javascript/struct-union-enumerate.js     |    2 +-
- tests/javascript/type-conversion.js            |    2 +-
+ tests/javascript/array-gtype.js                | 4 ++--
+ tests/javascript/closure-finalization.js       | 3 ++-
+ tests/javascript/compare.js                    | 2 +-
+ tests/javascript/constructor-args.js           | 2 +-
+ tests/javascript/constructor-prototype.js      | 2 +-
+ tests/javascript/enum.js                       | 2 +-
+ tests/javascript/everything.js                 | 2 +-
+ tests/javascript/function-info.js              | 4 ++--
+ tests/javascript/gdk-event.js                  | 4 ++--
+ tests/javascript/gerror.js                     | 2 +-
+ tests/javascript/gobject-scope.js              | 2 +-
+ tests/javascript/gtype-class-init-exception.js | 2 +-
+ tests/javascript/gtype-property.js             | 4 ++--
+ tests/javascript/gtype-signal-args.js          | 2 +-
+ tests/javascript/gtype-signal-exception.js     | 2 +-
+ tests/javascript/gtype-signal.js               | 2 +-
+ tests/javascript/gtype-typerror.js             | 2 +-
+ tests/javascript/gtype.js                      | 2 +-
+ tests/javascript/gvalue-argument.js            | 2 +-
+ tests/javascript/introspect.js                 | 2 +-
+ tests/javascript/json-constructor.js           | 4 ++--
+ tests/javascript/list-test.js                  | 2 +-
+ tests/javascript/native-closure-exception.js   | 2 +-
+ tests/javascript/native-closure.js             | 2 +-
+ tests/javascript/object-info.js                | 4 ++--
+ tests/javascript/out-test.js                   | 2 +-
+ tests/javascript/property-benchmark.js         | 2 +-
+ tests/javascript/property-glib-exception.js    | 2 +-
+ tests/javascript/readline.js                   | 2 +-
+ tests/javascript/readline_bind.js              | 2 +-
+ tests/javascript/signal-connect.js             | 2 +-
+ tests/javascript/signal-exception.js           | 2 +-
+ tests/javascript/signal-expects.js             | 2 +-
+ tests/javascript/signal-userdata.js            | 2 +-
+ tests/javascript/signal.js                     | 2 +-
+ tests/javascript/sqlite.js                     | 5 ++---
+ tests/javascript/struct-constructor.js         | 2 +-
+ tests/javascript/struct-enumerate.js           | 2 +-
+ tests/javascript/struct-nested-set.js          | 2 +-
+ tests/javascript/struct-offsets.js             | 2 +-
+ tests/javascript/struct-set-member.js          | 2 +-
+ tests/javascript/struct-union-enumerate.js     | 2 +-
+ tests/javascript/type-conversion.js            | 2 +-
  43 files changed, 51 insertions(+), 51 deletions(-)
 
 commit 36f38b756b74d4e04a4bddd2eb260e5970001ea3
@@ -12691,7 +14053,7 @@ Date:   Sun Apr 12 09:32:42 2009 -0400
 
     Add a default search path
 
- extensions/Seed.js |    8 +++++---
+ extensions/Seed.js | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 85a1bf4bddd2ca04c18b885cea3b9d9d1e379d66
@@ -12700,15 +14062,15 @@ Date:   Sun Apr 12 09:27:28 2009 -0400
 
     Importer supports native modules
 
- libseed/seed-engine.c            |    5 +-
- libseed/seed-engine.h            |    2 +-
- libseed/seed-importer.c          |   60 ++++++++
- libseed/seed.h                   |    2 +-
- modules/Multiprocessing/multi.c  |  253 +++++++++++++++++-----------------
- modules/canvas/seed-canvas.c     |    8 +-
- modules/example/example.c        |    6 +-
- modules/readline/seed-readline.c |  208 ++++++++++++++--------------
- modules/sqlite/seed-sqlite.c     |  278 +++++++++++++++++++-------------------
+ libseed/seed-engine.c            |   5 +-
+ libseed/seed-engine.h            |   2 +-
+ libseed/seed-importer.c          |  60 +++++++++
+ libseed/seed.h                   |   2 +-
+ modules/Multiprocessing/multi.c  | 253 ++++++++++++++++++-----------------
+ modules/canvas/seed-canvas.c     |   8 +-
+ modules/example/example.c        |   6 +-
+ modules/readline/seed-readline.c | 208 ++++++++++++++---------------
+ modules/sqlite/seed-sqlite.c     | 278 +++++++++++++++++++--------------------
  9 files changed, 442 insertions(+), 380 deletions(-)
 
 commit f74a63f7744ef96d242697c8b50bc7841686bcfc
@@ -12724,7 +14086,7 @@ Date:   Sun Apr 12 01:48:42 2009 -0400
 
     Make it actually work
 
- libseed/seed-importer.c |    3 ++-
+ libseed/seed-importer.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 39d0a68c6fcd92a9e31b91056b859dc8465a4e35
@@ -12733,7 +14095,7 @@ Date:   Sun Apr 12 01:46:47 2009 -0400
 
     Some work on nested directory imports
 
- libseed/seed-importer.c |   36 ++++++++++++++++++++++++++++++++++--
+ libseed/seed-importer.c | 36 ++++++++++++++++++++++++++++++++++--
  1 file changed, 34 insertions(+), 2 deletions(-)
 
 commit 7f6e81885e7b9f492ab09d331015026d644c18e8
@@ -12742,7 +14104,7 @@ Date:   Sun Apr 12 01:42:11 2009 -0400
 
     Free the search path
 
- libseed/seed-importer.c |   72 ++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-importer.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 71 insertions(+), 1 deletion(-)
 
 commit ecb2600a4b4fefe825dc21f7ad1deeb836fe49b9
@@ -12751,7 +14113,7 @@ Date:   Sat Apr 11 21:55:22 2009 -0400
 
     Make importer cache imports for files properly
 
- libseed/seed-importer.c |   10 +++++++++-
+ libseed/seed-importer.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit f5c61e039f2ebff9d606fa680818e83a2179ccd5
@@ -12760,7 +14122,7 @@ Date:   Sat Apr 11 21:50:57 2009 -0400
 
     Fix dumb person bug
 
- libseed/seed-importer.c |    2 +-
+ libseed/seed-importer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a15e3c5de9478936c1d4ed698ec491241b06e52c
@@ -12769,7 +14131,7 @@ Date:   Sat Apr 11 20:49:55 2009 -0400
 
     Work on start of importer for normal files
 
- libseed/seed-importer.c |  147 ++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-importer.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 145 insertions(+), 2 deletions(-)
 
 commit f44544bc62ad5173485f0f0a3cbe0a66a40857c9
@@ -12778,8 +14140,8 @@ Date:   Sat Apr 11 18:42:57 2009 -0400
 
     Fix build
 
- configure.ac        |    1 -
- modules/Makefile.am |    2 +-
+ configure.ac        | 1 -
+ modules/Makefile.am | 2 +-
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 commit 2aeab1a8094ae99177610b46dc22e89b346f8fea
@@ -12788,7 +14150,7 @@ Date:   Sat Apr 11 18:40:00 2009 -0400
 
     Add support for versions
 
- libseed/seed-importer.c |   23 ++++++++++++++++++++---
+ libseed/seed-importer.c | 23 ++++++++++++++++++++---
  1 file changed, 20 insertions(+), 3 deletions(-)
 
 commit 8c714a8651697a258828c36e636c1b24d8245bc3
@@ -12797,7 +14159,7 @@ Date:   Sat Apr 11 18:31:34 2009 -0400
 
     Protect against multiple imports
 
- libseed/seed-importer.c |   12 +++++++++++-
+ libseed/seed-importer.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit b43ef7566f1b07ebf0a13681bda5b9e4563b3e17
@@ -12806,7 +14168,7 @@ Date:   Sat Apr 11 18:13:50 2009 -0400
 
     Support GI_INFO_TYPE_CONSTANT, and some refactoring
 
- libseed/seed-importer.c |   64 +++++++++++++++++++++++++++++++++++++++++------
+ libseed/seed-importer.c | 64 ++++++++++++++++++++++++++++++++++++++++++-------
  1 file changed, 56 insertions(+), 8 deletions(-)
 
 commit e350054082438fc288b76fe2ca0f1390910afbdd
@@ -12815,7 +14177,7 @@ Date:   Sat Apr 11 17:58:14 2009 -0400
 
     Importer supports GI_INFO_TYPE_UNION
 
- libseed/seed-importer.c |   42 +++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-importer.c | 42 +++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 41 insertions(+), 1 deletion(-)
 
 commit 58f0d615b63c9ae0da60ff83267f4e1e4f7bd6a6
@@ -12824,8 +14186,8 @@ Date:   Sat Apr 11 17:55:47 2009 -0400
 
     Importer supports GI_INFO_TYPE_STRUCT
 
- libseed/seed-engine.h   |    1 +
- libseed/seed-importer.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.h   |  1 +
+ libseed/seed-importer.c | 40 ++++++++++++++++++++++++++++++++++++++++
  2 files changed, 41 insertions(+)
 
 commit 404a707a050a2f2568ef47bf246685adc5a45894
@@ -12834,8 +14196,8 @@ Date:   Sat Apr 11 17:47:15 2009 -0400
 
     Importer now supports GI_INFO_TYPE_OBJECT
 
- libseed/seed-engine.h   |    2 ++
- libseed/seed-importer.c |   90 +++++++++++++++++++++++++++++++++++++++++++----
+ libseed/seed-engine.h   |  2 ++
+ libseed/seed-importer.c | 90 +++++++++++++++++++++++++++++++++++++++++++++----
  2 files changed, 85 insertions(+), 7 deletions(-)
 
 commit 25432cb8505a771fba915a1e1bb8d7d92e7a6743
@@ -12844,7 +14206,7 @@ Date:   Sat Apr 11 16:52:56 2009 -0400
 
     Importer now supports enums and toplevel functions
 
- libseed/seed-importer.c |  167 ++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-importer.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 166 insertions(+), 1 deletion(-)
 
 commit 876b7e939e4bf48734f0673740fc70049e7e443d
@@ -12853,11 +14215,11 @@ Date:   Sat Apr 11 16:10:40 2009 -0400
 
     Begin work on the new importer
 
- libseed/Makefile.am     |    4 +++-
- libseed/seed-engine.c   |    4 ++++
- libseed/seed-importer.c |   34 ++++++++++++++++++++++++++++++++++
- libseed/seed-importer.h |    8 ++++++++
- libseed/seed-private.h  |    1 +
+ libseed/Makefile.am     |  4 +++-
+ libseed/seed-engine.c   |  4 ++++
+ libseed/seed-importer.c | 34 ++++++++++++++++++++++++++++++++++
+ libseed/seed-importer.h |  8 ++++++++
+ libseed/seed-private.h  |  1 +
  5 files changed, 50 insertions(+), 1 deletion(-)
 
 commit 7e65ec58c53adf8b06840ff3e8e60d4af2ae1446
@@ -12866,16 +14228,16 @@ Date:   Fri Apr 10 16:09:05 2009 -0400
 
     Add scoped includes
 
- configure.ac            |    3 ++
- extensions/Clutter.js   |    3 +-
- libseed/seed-builtins.c |  101 ++++++++++++++++++++++++++++++++++++-
- m4/intltool.m4          |   64 +++++++++++++++---------
- m4/libtool.m4           |  128 ++++++++++++++++++++++++++++++++---------------
- m4/ltoptions.m4         |    2 +-
- m4/ltsugar.m4           |   20 ++++----
- m4/ltversion.m4         |   10 ++--
- modules/Makefile.am     |    2 +-
- po/Makefile.in.in       |    4 +-
+ configure.ac            |   3 ++
+ extensions/Clutter.js   |   3 +-
+ libseed/seed-builtins.c | 101 +++++++++++++++++++++++++++++++++++++-
+ m4/intltool.m4          |  64 +++++++++++++++---------
+ m4/libtool.m4           | 128 +++++++++++++++++++++++++++++++++---------------
+ m4/ltoptions.m4         |   2 +-
+ m4/ltsugar.m4           |  20 ++++----
+ m4/ltversion.m4         |  10 ++--
+ modules/Makefile.am     |   2 +-
+ po/Makefile.in.in       |   4 +-
  10 files changed, 252 insertions(+), 85 deletions(-)
 
 commit bd6901a8761835b05e362bfa03fdaf8c895f8e46
@@ -12884,8 +14246,8 @@ Date:   Tue Apr 7 17:16:42 2009 -0400
 
     Big signal rework. Should save some memory. Dynamically create signal objects, also smaller signal privates struct...fix a leak...all kinds of good stuff
 
- libseed/seed-engine.c  |    6 +++-
- libseed/seed-signals.c |   88 ++++++++++++++++++++++--------------------------
+ libseed/seed-engine.c  |  6 +++-
+ libseed/seed-signals.c | 88 +++++++++++++++++++++++---------------------------
  2 files changed, 45 insertions(+), 49 deletions(-)
 
 commit e3cfcec59fc81169ee1e5a10dca0c39e606edfa7
@@ -12894,8 +14256,8 @@ Date:   Sun Apr 5 19:49:58 2009 -0400
 
     Add seed_init_with_context_group
 
- libseed/seed-engine.c |   84 +++++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed.h        |    5 ++-
+ libseed/seed-engine.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed.h        |  5 ++-
  2 files changed, 88 insertions(+), 1 deletion(-)
 
 commit 42aca0c50fea8ac5ec7ad914d5b5c78565e42973
@@ -12904,7 +14266,7 @@ Date:   Sat Mar 28 22:22:29 2009 -0400
 
     Yay webkit committed the patch.
 
- patches/fix_webkit_soup_introspection.patch |   22 ----------------------
+ patches/fix_webkit_soup_introspection.patch | 22 ----------------------
  1 file changed, 22 deletions(-)
 
 commit dd93b2e755cc67e731f236e7e705715b4f84aa9d
@@ -12913,7 +14275,7 @@ Date:   Fri Mar 27 21:29:55 2009 -0400
 
     Patch patch to WebKit to make it introspectible. WK guys say that they're going to have it in for 1.1.4.
 
- patches/fix_webkit_soup_introspection.patch |   22 ++++++++++++++++++++++
+ patches/fix_webkit_soup_introspection.patch | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 commit 7b0791fd03173916a418cce848b64705ec968116
@@ -12922,7 +14284,7 @@ Date:   Fri Mar 27 16:29:13 2009 -0400
 
     Add Seed.breakpoint for debugging purposes
 
- libseed/seed-builtins.c |   13 +++++++++++++
+ libseed/seed-builtins.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 029ea2977d631294c40295f5c72176888b509f85
@@ -12931,7 +14293,7 @@ Date:   Tue Mar 24 23:16:49 2009 -0400
 
     Minor cosmetic improvements to seed-types.c
 
- libseed/seed-types.c |   24 +++++++++++++-----------
+ libseed/seed-types.c | 24 +++++++++++++-----------
  1 file changed, 13 insertions(+), 11 deletions(-)
 
 commit f3dc26292d3ed4b877d15c345b4edd6678d72ba1
@@ -12940,7 +14302,7 @@ Date:   Tue Mar 24 23:09:16 2009 -0400
 
     Add validation of enum types to the GArgument conversion logic
 
- libseed/seed-types.c |   13 +++++++++++++
+ libseed/seed-types.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit fd9f3bc2f3743a9870909214b1573fab040fc425
@@ -12949,9 +14311,9 @@ Date:   Tue Mar 24 23:05:25 2009 -0400
 
     Validate enum types in property setting
 
- libseed/seed-signals.c |    2 +-
- libseed/seed-types.c   |   24 ++++++++++++++++++++++--
- libseed/seed-types.h   |    2 ++
+ libseed/seed-signals.c |  2 +-
+ libseed/seed-types.c   | 24 ++++++++++++++++++++++--
+ libseed/seed-types.h   |  2 ++
  3 files changed, 25 insertions(+), 3 deletions(-)
 
 commit b7265ce94d5efa8c9d1dce291160c96311f22572
@@ -12967,7 +14329,7 @@ Date:   Thu Mar 19 22:29:44 2009 -0400
 
     One question resolved.
 
- OPEN_QUESTIONS |    3 ---
+ OPEN_QUESTIONS | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 5ea43401eaba2daea6de37ce59f158b50d151fd9
@@ -12976,13 +14338,13 @@ Date:   Thu Mar 19 22:17:51 2009 -0400
 
     Patch from Matt, fixes horrible crash in include path code.
 
- libseed/seed-api.c |    4 +-
- libseed/seed.h     |    2 +-
- m4/libtool.m4      |  128 ++++++++++++++++------------------------------------
- m4/ltoptions.m4    |    2 +-
- m4/ltsugar.m4      |   20 ++++----
- m4/ltversion.m4    |   10 ++--
- src/main.c         |    6 +--
+ libseed/seed-api.c |   4 +-
+ libseed/seed.h     |   2 +-
+ m4/libtool.m4      | 128 +++++++++++++++++------------------------------------
+ m4/ltoptions.m4    |   2 +-
+ m4/ltsugar.m4      |  20 ++++-----
+ m4/ltversion.m4    |  10 ++---
+ src/main.c         |   6 +--
  7 files changed, 60 insertions(+), 112 deletions(-)
 
 commit 5aca0971f9842b7f45c3fd61054823750f095586
@@ -12991,8 +14353,8 @@ Date:   Wed Mar 18 16:28:28 2009 -0400
 
     Some fixes to canvas color parsing
 
- libseed/seed-engine.c        |    4 +++-
- modules/canvas/seed-canvas.c |   15 +++++++++------
+ libseed/seed-engine.c        |  4 +++-
+ modules/canvas/seed-canvas.c | 15 +++++++++------
  2 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 838b823356aec1dfd6494e4bf1f013cab98a4611
@@ -13001,8 +14363,8 @@ Date:   Wed Mar 18 16:05:15 2009 -0400
 
     More gtk-doc
 
- doc/reference/html/index.html |    4 ++--
- libseed/seed-types.c          |   17 +++++++++++++++++
+ doc/reference/html/index.html |  4 ++--
+ libseed/seed-types.c          | 17 +++++++++++++++++
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 commit ce9f1e8eaa0292fc651fd059765d7bc2b15452ec
@@ -13011,7 +14373,7 @@ Date:   Wed Mar 18 15:55:57 2009 -0400
 
     Style fixes in seed-api.c
 
- libseed/seed-api.c |   23 ++++++++++++++++-------
+ libseed/seed-api.c | 23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
 commit ec092a5962d983087702f25e8351fa35ee883da1
@@ -13020,7 +14382,7 @@ Date:   Mon Mar 16 21:40:42 2009 -0400
 
     Update debian packaging now that ogl-glib is no longer inside of seed.
 
- debian/control |    7 ++-----
+ debian/control | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 commit d4e31e3d7d6dae85dca207877c43adf64b486a83
@@ -13032,7 +14394,7 @@ Date:   Mon Mar 16 21:30:20 2009 -0400
     simple patch changing the api to take the : separated path. also fixed a
     huge mistake with memory leak if you set the path from the api
 
- libseed/seed-api.c |    8 ++++----
+ libseed/seed-api.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 423e3eaf5374abf681bfdc71a988c61c71551548
@@ -13041,8 +14403,8 @@ Date:   Sun Mar 15 15:48:21 2009 -0400
 
     Add seed_context_get_global function to API
 
- libseed/seed-api.c |    6 ++++++
- libseed/seed.h     |    1 +
+ libseed/seed-api.c | 6 ++++++
+ libseed/seed.h     | 1 +
  2 files changed, 7 insertions(+)
 
 commit e9d05b86c052703b97748cd244696eb9da1cc774
@@ -13051,7 +14413,7 @@ Date:   Sun Mar 15 09:52:18 2009 -0400
 
     Fix indentation on C tests
 
- tests/c/main.c |   58 ++++++++++++++++++++++++++++----------------------------
+ tests/c/main.c | 58 +++++++++++++++++++++++++++++-----------------------------
  1 file changed, 29 insertions(+), 29 deletions(-)
 
 commit c39776b3d6d76076d6a907c3c3da06cf5392fbf8
@@ -13060,12 +14422,12 @@ Date:   Sun Mar 15 09:51:17 2009 -0400
 
     Add seed_signal_connect and seed_signal_connect_full C convenience API
 
- doc/reference/seed-sections.txt |    6 +++++-
- libseed/seed-api.c              |   44 ++++++++++++++++++++++++++++++++++++++-
- libseed/seed-private.h          |    1 +
- libseed/seed-signals.c          |    5 +++--
- libseed/seed-signals.h          |    9 ++++++++
- libseed/seed.h                  |   15 +++++++++++++
+ doc/reference/seed-sections.txt |  6 +++++-
+ libseed/seed-api.c              | 44 ++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-private.h          |  1 +
+ libseed/seed-signals.c          |  5 +++--
+ libseed/seed-signals.h          |  9 +++++++++
+ libseed/seed.h                  | 15 ++++++++++++++
  6 files changed, 76 insertions(+), 4 deletions(-)
 
 commit e905ea4aec058fe3a84b9ed99ff2523e22c69d1f
@@ -13074,7 +14436,7 @@ Date:   Sun Mar 15 09:26:48 2009 -0400
 
     Fix warning in C test
 
- tests/c/api-js-signal-from-c.c |    2 ++
+ tests/c/api-js-signal-from-c.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit cf93fe0ea8761d47459e95a546d7acf5a3f959e4
@@ -13083,13 +14445,13 @@ Date:   Wed Mar 11 22:24:24 2009 -0400
 
     Big build system reorganization.n. Also add shave for pretty builds
 
- autogen.sh               |  177 +++++++---------------------------------------
- config.h.in              |    4 ++
- configure.ac             |   45 ++++++++----
- libseed/Makefile.am      |    9 +--
- m4/shave.m4              |   40 +++++++++++
- scripts/shave-libtool.in |   69 ++++++++++++++++++
- scripts/shave.in         |   76 ++++++++++++++++++++
+ autogen.sh               | 177 ++++++++---------------------------------------
+ config.h.in              |   4 ++
+ configure.ac             |  45 ++++++++----
+ libseed/Makefile.am      |   9 +--
+ m4/shave.m4              |  40 +++++++++++
+ scripts/shave-libtool.in |  69 ++++++++++++++++++
+ scripts/shave.in         |  76 ++++++++++++++++++++
  7 files changed, 250 insertions(+), 170 deletions(-)
 
 commit f771c891598897f2970c03ad45ad543140530e3a
@@ -13105,9 +14467,9 @@ Date:   Tue Mar 10 15:16:01 2009 -0400
 
     Switch seed_prepare_closure to use g_callable_info_prepare_closure...drops a lot of code
 
- libseed/seed-builtins.c |    2 +
- libseed/seed-closure.c  |  102 ++---------------------------------------------
- libseed/seed-engine.c   |    4 +-
+ libseed/seed-builtins.c |   2 +
+ libseed/seed-closure.c  | 102 ++----------------------------------------------
+ libseed/seed-engine.c   |   4 +-
  3 files changed, 7 insertions(+), 101 deletions(-)
 
 commit 91108a0f24175228d5b65e3a4abfb2fa58306fc6
@@ -13116,7 +14478,7 @@ Date:   Mon Mar 9 22:42:46 2009 -0400
 
     Most of seed-types.c is documented now (most of the public part, anyway).
 
- libseed/seed-types.c |  132 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-types.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 132 insertions(+)
 
 commit 7ba93ef1049807e2c971b56d2aaeea75516a8823
@@ -13125,8 +14487,8 @@ Date:   Mon Mar 9 22:18:23 2009 -0400
 
     Exception documentation. GtkDoc is losing some of my docs on seed_make_exception for some reason. Also, somehow some of our headers are out of sync (variable-name-wise) with implementation files.
 
- libseed/seed-exceptions.c |   65 +++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed.h            |   14 +++++-----
+ libseed/seed-exceptions.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed.h            | 14 +++++-----
  2 files changed, 72 insertions(+), 7 deletions(-)
 
 commit 27ca247ac00e98235df5dae935ea5a215094d86a
@@ -13135,7 +14497,7 @@ Date:   Mon Mar 9 19:27:33 2009 -0400
 
     Matt fixed up his Seed.set_search_path function, so we've enabled it.
 
- libseed/seed-builtins.c |   44 +++++++-------------------------------------
+ libseed/seed-builtins.c | 44 +++++++-------------------------------------
  1 file changed, 7 insertions(+), 37 deletions(-)
 
 commit 2d5e0c7b8fd61247bc8787f8945b9449aa28d2d7
@@ -13144,7 +14506,7 @@ Date:   Tue Mar 3 20:39:43 2009 -0500
 
     Somehow I accidentally committed with 2 colors on.
 
- examples/same-seed/main.js |    2 +-
+ examples/same-seed/main.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d3cb95749aea6ca9b45305203d42ab1b297e219c
@@ -13157,8 +14519,8 @@ Date:   Tue Mar 3 20:36:18 2009 -0500
     
     Err. Oops. That didn't fix it either like it seemed it might; now, I'm confused.
 
- libseed/seed-engine.c |    2 --
- libseed/seed-types.c  |    3 ++-
+ libseed/seed-engine.c | 2 --
+ libseed/seed-types.c  | 3 ++-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit af622b554d79ede03df8ab76c170b7dafbb0bc9f
@@ -13171,8 +14533,8 @@ Date:   Tue Mar 3 20:33:04 2009 -0500
     
     This clearly wasn't as dubious as it seemed, and must have made sense at the time. This commit removes the ability to Ctrl-C in our Clutter games at the very least (actually all Seed Clutter apps, but not much else, as far as I can see).
 
- libseed/seed-engine.c |    2 ++
- libseed/seed-types.c  |    3 +--
+ libseed/seed-engine.c | 2 ++
+ libseed/seed-types.c  | 3 +--
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 029f9e35ec661912f98d883134ae6692b298ca51
@@ -13181,8 +14543,8 @@ Date:   Mon Mar 2 22:01:57 2009 -0500
 
     Remove incredibly dubious setting of SIGCHLD
 
- libseed/seed-engine.c |    2 --
- libseed/seed-types.c  |    3 ++-
+ libseed/seed-engine.c | 2 --
+ libseed/seed-types.c  | 3 ++-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit f0c46d887da7004fabc23a6368a9900ecbd76153
@@ -13191,9 +14553,9 @@ Date:   Mon Mar 2 21:49:16 2009 -0500
 
     Switch GObject reference to the JS ref to use g_object_set_qdata, low hanging optimization
 
- libseed/seed-engine.c |    5 ++++-
- libseed/seed-types.c  |    4 ++--
- libseed/seed-types.h  |    2 ++
+ libseed/seed-engine.c | 5 ++++-
+ libseed/seed-types.c  | 4 ++--
+ libseed/seed-types.h  | 2 ++
  3 files changed, 8 insertions(+), 3 deletions(-)
 
 commit ef2117280b8ddbbaa2ec76f188e3ce25fbc9d859
@@ -13202,7 +14564,7 @@ Date:   Mon Mar 2 21:44:29 2009 -0500
 
     Add an assertion in seed_value_to_gobject, should be helpful in catching a few memory bugs that sometimes pop up
 
- libseed/seed-types.c |    1 +
+ libseed/seed-types.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3797376e36c6863ce6d055ba09f3637574fee6e1
@@ -13211,7 +14573,7 @@ Date:   Mon Mar 2 21:41:11 2009 -0500
 
     Fix potential crash (or confusion) in seed_value_to_string
 
- libseed/seed-types.c |    8 ++++----
+ libseed/seed-types.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit f37e1c383f4d34b480e6361284999bee04335b1e
@@ -13220,7 +14582,7 @@ Date:   Mon Mar 2 21:35:41 2009 -0500
 
     Support some more primitive array types
 
- libseed/seed-types.c |   39 ++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-types.c | 39 ++++++++++++++++++++++++++++++++++++++-
  1 file changed, 38 insertions(+), 1 deletion(-)
 
 commit 817a511a946ee3064ab398b163f5349dfdc741d5
@@ -13229,8 +14591,8 @@ Date:   Mon Mar 2 19:16:51 2009 -0500
 
     Some type documentation, mostly copy/paste.
 
- .gitignore           |   17 +++--
- libseed/seed-types.c |  171 ++++++++++++++++++++++++++++++++++++++++++++------
+ .gitignore           |  17 +++--
+ libseed/seed-types.c | 171 +++++++++++++++++++++++++++++++++++++++++++++------
  2 files changed, 166 insertions(+), 22 deletions(-)
 
 commit ebefeec870b7aa87786e7de719f33a52ed579c85
@@ -13239,8 +14601,8 @@ Date:   Sat Feb 28 20:14:44 2009 -0500
 
     Other files that got updated by the last commit.
 
- doc/reference/html/index.html |    8 ++-
- doc/reference/tmpl/seed.sgml  |  130 -----------------------------------------
+ doc/reference/html/index.html |   8 ++-
+ doc/reference/tmpl/seed.sgml  | 130 ------------------------------------------
  2 files changed, 7 insertions(+), 131 deletions(-)
 
 commit f519ead8cf12c9f82c9e62b54cf747c40f5d79de
@@ -13249,19 +14611,19 @@ Date:   Sat Feb 28 20:12:10 2009 -0500
 
     Mushing documentation around into sections, fixing headers that indent screwed up (as usual...) and stuff.
 
- doc/reference/seed-docs.sgml    |    2 ++
- doc/reference/seed-sections.txt |   42 ++++++++++++++++++++++++---------------
- libseed/seed-builtins.h         |   26 ++++++++++++------------
- libseed/seed-closure.h          |   26 ++++++++++++------------
- libseed/seed-debug.h            |   26 ++++++++++++------------
- libseed/seed-engine.h           |   26 ++++++++++++------------
- libseed/seed-exceptions.h       |   30 +++++++++++++++++-----------
- libseed/seed-gtype.h            |   26 ++++++++++++------------
- libseed/seed-private.h          |   26 ++++++++++++------------
- libseed/seed-signals.h          |   26 ++++++++++++------------
- libseed/seed-structs.h          |   26 ++++++++++++------------
- libseed/seed-types.h            |   36 ++++++++++++++++++++++-----------
- libseed/seed.h                  |    6 ------
+ doc/reference/seed-docs.sgml    |  2 ++
+ doc/reference/seed-sections.txt | 42 +++++++++++++++++++++++++----------------
+ libseed/seed-builtins.h         | 26 ++++++++++++-------------
+ libseed/seed-closure.h          | 26 ++++++++++++-------------
+ libseed/seed-debug.h            | 26 ++++++++++++-------------
+ libseed/seed-engine.h           | 26 ++++++++++++-------------
+ libseed/seed-exceptions.h       | 30 +++++++++++++++++------------
+ libseed/seed-gtype.h            | 26 ++++++++++++-------------
+ libseed/seed-private.h          | 26 ++++++++++++-------------
+ libseed/seed-signals.h          | 26 ++++++++++++-------------
+ libseed/seed-structs.h          | 26 ++++++++++++-------------
+ libseed/seed-types.h            | 36 +++++++++++++++++++++++------------
+ libseed/seed.h                  |  6 ------
  13 files changed, 174 insertions(+), 150 deletions(-)
 
 commit 2ad86d6e8c0a503362b397eed92ccdaad9c71479
@@ -13270,12 +14632,12 @@ Date:   Sat Feb 28 20:02:31 2009 -0500
 
     Starting to move documentation into different sections.
 
- doc/reference/html/index.html       |   11 +-
- doc/reference/seed-docs.sgml        |    1 +
- doc/reference/seed-sections.txt     |   75 ++---
- doc/reference/tmpl/seed-unused.sgml |   24 ++
- doc/reference/tmpl/seed.sgml        |  595 +++++++++++++++++++++++++++++++++++
- libseed/seed.h                      |   30 +-
+ doc/reference/html/index.html       |  11 +-
+ doc/reference/seed-docs.sgml        |   1 +
+ doc/reference/seed-sections.txt     |  75 ++---
+ doc/reference/tmpl/seed-unused.sgml |  24 ++
+ doc/reference/tmpl/seed.sgml        | 595 ++++++++++++++++++++++++++++++++++++
+ libseed/seed.h                      |  30 +-
  6 files changed, 686 insertions(+), 50 deletions(-)
 
 commit 0985fbce82e787ec20b8e0bbc146f95eef5559a2
@@ -13284,18 +14646,18 @@ Date:   Sat Feb 28 19:27:50 2009 -0500
 
     I'm pretty sure that carrying the templates aroung in Git is unnecessary (the GtkDoc docs suggest so anyway...)
 
- doc/reference/tmpl/seed-builtins.sgml   |   19 -
- doc/reference/tmpl/seed-closure.sgml    |   19 -
- doc/reference/tmpl/seed-debug.sgml      |   64 ---
- doc/reference/tmpl/seed-engine.sgml     |   44 --
- doc/reference/tmpl/seed-exceptions.sgml |   80 ---
- doc/reference/tmpl/seed-gtype.sgml      |   19 -
- doc/reference/tmpl/seed-private.sgml    |   19 -
- doc/reference/tmpl/seed-signals.sgml    |   19 -
- doc/reference/tmpl/seed-structs.sgml    |   29 -
- doc/reference/tmpl/seed-types.sgml      |  350 -----------
- doc/reference/tmpl/seed-unused.sgml     |  659 ---------------------
- doc/reference/tmpl/seed.sgml            |  957 -------------------------------
+ doc/reference/tmpl/seed-builtins.sgml   |  19 -
+ doc/reference/tmpl/seed-closure.sgml    |  19 -
+ doc/reference/tmpl/seed-debug.sgml      |  64 ---
+ doc/reference/tmpl/seed-engine.sgml     |  44 --
+ doc/reference/tmpl/seed-exceptions.sgml |  80 ---
+ doc/reference/tmpl/seed-gtype.sgml      |  19 -
+ doc/reference/tmpl/seed-private.sgml    |  19 -
+ doc/reference/tmpl/seed-signals.sgml    |  19 -
+ doc/reference/tmpl/seed-structs.sgml    |  29 -
+ doc/reference/tmpl/seed-types.sgml      | 350 ------------
+ doc/reference/tmpl/seed-unused.sgml     | 659 ----------------------
+ doc/reference/tmpl/seed.sgml            | 957 --------------------------------
  12 files changed, 2278 deletions(-)
 
 commit 00c7135426ed8cee8082e0650c7d5823c978c26e
@@ -13304,7 +14666,7 @@ Date:   Sat Feb 28 19:20:36 2009 -0500
 
     Documentation for seed_object_call. This marks 100% of the functions in seed-api.c being documented. Still a long way to go.
 
- libseed/seed-api.c |   17 +++++++++++++++++
+ libseed/seed-api.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 33ce45e9b0d98f1134aeeb1ddfe7ceba1ced3056
@@ -13313,7 +14675,7 @@ Date:   Sat Feb 28 19:07:47 2009 -0500
 
     Create .gitignore and add everything that's currently untracked. I'm pretty sure we've got stuff in the repo that shouldn't be, but that's OK for now. If we're ignoring anything we shouldn't be, ... oops.
 
- .gitignore |  145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ .gitignore | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 145 insertions(+)
 
 commit 9d69cf261676bc80570dd1a28f7303a42657dfc9
@@ -13322,7 +14684,7 @@ Date:   Sat Feb 28 18:58:08 2009 -0500
 
     Missed some return values.
 
- libseed/seed-api.c |    4 ++++
+ libseed/seed-api.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 1e20d268f9080492b0f3914328b2350b29995899
@@ -13331,12 +14693,12 @@ Date:   Sat Feb 28 18:54:04 2009 -0500
 
     Lots of *(un)ref docs.
 
- config.h.in                          |    4 -
- doc/reference/html/index.html        |    8 +-
- doc/reference/tmpl/seed-private.sgml |    9 --
- doc/reference/tmpl/seed-unused.sgml  |  291 ++++++++++++++++++++++++++++++++++
- doc/reference/tmpl/seed.sgml         |   45 +++++-
- libseed/seed-api.c                   |   38 ++++-
+ config.h.in                          |   4 -
+ doc/reference/html/index.html        |   8 +-
+ doc/reference/tmpl/seed-private.sgml |   9 --
+ doc/reference/tmpl/seed-unused.sgml  | 291 +++++++++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed.sgml         |  45 +++++-
+ libseed/seed-api.c                   |  38 ++++-
  6 files changed, 368 insertions(+), 27 deletions(-)
 
 commit 5627b43fe35e9e1bfd82d63c5c937f1c6ea0bc61
@@ -13345,7 +14707,7 @@ Date:   Sat Feb 28 18:47:23 2009 -0500
 
     protect and unprotect documentation.
 
- libseed/seed-api.c |   21 +++++++++++++++++++++
+ libseed/seed-api.c | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
 
 commit b667786d2914e882f46257cb891a1f5d1dfe4337
@@ -13354,7 +14716,7 @@ Date:   Sat Feb 28 18:38:13 2009 -0500
 
     GtkDoc is choking on long type names? Wrote a note, anyway.
 
- libseed/seed-api.c |    5 ++++-
+ libseed/seed-api.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 9abcc742e761c6ac440615d1889f3bb56c682f6a
@@ -13363,7 +14725,7 @@ Date:   Sat Feb 28 18:32:49 2009 -0500
 
     Lots of documentation updates. Also, do we have a typedef for JSClassDefinition?
 
- libseed/seed-api.c |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-api.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 59 insertions(+)
 
 commit 684df6b8466920b2174a0ff9fbb70e46b76aecc0
@@ -13372,7 +14734,7 @@ Date:   Sat Feb 28 18:00:16 2009 -0500
 
     Don't need all these extra sections that we're simply not using. Maybe some other day, but for now we're only documenting the external API.
 
- doc/reference/seed-sections.txt |  130 +--------------------------------------
+ doc/reference/seed-sections.txt | 130 +---------------------------------------
  1 file changed, 3 insertions(+), 127 deletions(-)
 
 commit 7cb283504a994215fd8c6e4cd1f607defc491c45
@@ -13381,7 +14743,7 @@ Date:   Sat Feb 28 17:57:24 2009 -0500
 
     80characters.
 
- libseed/seed-api.c |   23 +++++++++++++++--------
+ libseed/seed-api.c | 23 +++++++++++++++--------
  1 file changed, 15 insertions(+), 8 deletions(-)
 
 commit ffb9482308755db8489734e237633cf9291b95fe
@@ -13390,7 +14752,7 @@ Date:   Sat Feb 28 17:46:20 2009 -0500
 
     seed_string_is_equal_utf8 docs.
 
- libseed/seed-api.c |   18 ++++++++++++++++++
+ libseed/seed-api.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 6d3b1e062139a9fdd191fda158978cebb638ff3f
@@ -13399,7 +14761,7 @@ Date:   Sat Feb 28 17:40:51 2009 -0500
 
     Oops. seed_string_to_utf8_buffer doesn't /return/ a buffer!
 
- libseed/seed-api.c |    2 +-
+ libseed/seed-api.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a2aa5f95d22b85f5253c9e6707611667eb615668
@@ -13408,7 +14770,7 @@ Date:   Sat Feb 28 17:36:31 2009 -0500
 
     Docs for seed_make_object.
 
- libseed/seed-api.c |   11 ++++++++++-
+ libseed/seed-api.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 71b4291871892adb73425d40d90395cc35006662
@@ -13417,7 +14779,7 @@ Date:   Sat Feb 28 17:15:37 2009 -0500
 
     Docs for seed_context_create.
 
- libseed/seed-api.c |    8 ++++++++
+ libseed/seed-api.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 9f59df1c6c552f60be539af0901054d99d579c8e
@@ -13426,7 +14788,7 @@ Date:   Sat Feb 28 17:11:11 2009 -0500
 
     Updated docs (don't show JS* types in API documentation!)
 
- libseed/seed-api.c |   24 ++++++++++++------------
+ libseed/seed-api.c | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit 834fbd216f48317e73b7b0bcb86947dab2089541
@@ -13435,7 +14797,7 @@ Date:   Sat Feb 28 16:50:35 2009 -0500
 
     Don't put lines between parameter documentation or GtkDoc gets mad.
 
- libseed/seed-api.c |    3 +--
+ libseed/seed-api.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit a42a24504d0271425760109fd08b03f7582a79b9
@@ -13444,8 +14806,8 @@ Date:   Sat Feb 28 16:45:50 2009 -0500
 
     Matt added documentation for seed_engine_get_search_path.
 
- libseed/seed-api.c      |    9 ++++++++-
- libseed/seed-builtins.c |    3 +++
+ libseed/seed-api.c      | 9 ++++++++-
+ libseed/seed-builtins.c | 3 +++
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit f4eb7878fe5396c86607aec91fda120c9d3a0fc9
@@ -13454,7 +14816,7 @@ Date:   Tue Feb 24 17:30:14 2009 -0500
 
     Fix matt's docs (still need documentation for the second function, too.)
 
- libseed/seed-api.c |    4 +---
+ libseed/seed-api.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit ed28cce323ff182279b4a72753bc5c61b79507ff
@@ -13463,7 +14825,7 @@ Date:   Tue Feb 24 17:28:28 2009 -0500
 
     Fix some small lacks of use of g_*, etc
 
- libseed/seed-types.c |    7 +++----
+ libseed/seed-types.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 0a8148ab341ddac5f8a121141426ce696be1744a
@@ -13472,13 +14834,13 @@ Date:   Tue Feb 24 17:23:50 2009 -0500
 
     Reapply cleaned up version of Matt's patch.
 
- doc/reference/seed-sections.txt |    2 +
- libseed/seed-api.c              |   23 ++++++++
- libseed/seed-builtins.c         |  114 ++++++++++++++++++++++++++++++++++++++-
- libseed/seed-engine.c           |    1 +
- libseed/seed-private.h          |    1 +
- libseed/seed.h                  |    4 ++
- src/main.c                      |    8 +++
+ doc/reference/seed-sections.txt |   2 +
+ libseed/seed-api.c              |  23 ++++++++
+ libseed/seed-builtins.c         | 114 +++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-engine.c           |   1 +
+ libseed/seed-private.h          |   1 +
+ libseed/seed.h                  |   4 ++
+ src/main.c                      |   8 +++
  7 files changed, 151 insertions(+), 2 deletions(-)
 
 commit 853ecf968d1797866d24f38ec31a332b04b2f3ee
@@ -13487,11 +14849,11 @@ Date:   Tue Feb 24 17:07:59 2009 -0500
 
     Indentation.
 
- libseed/seed-builtins.c |    2 +-
- libseed/seed-signals.c  |   10 ++---
- libseed/seed-structs.c  |   15 +++----
- libseed/seed-types.c    |    3 +-
- src/main.c              |  114 ++++++++++++++++++++++++-----------------------
+ libseed/seed-builtins.c |   2 +-
+ libseed/seed-signals.c  |  10 ++---
+ libseed/seed-structs.c  |  15 +++----
+ libseed/seed-types.c    |   3 +-
+ src/main.c              | 114 +++++++++++++++++++++++++-----------------------
  5 files changed, 72 insertions(+), 72 deletions(-)
 
 commit 7c6deffbc7407fa8a8e4ef018dfb4531c393a967
@@ -13508,17 +14870,17 @@ Date:   Tue Feb 24 15:19:45 2009 -0500
     sense. The error handling is somewhat inconsistent ("Cannot open path
     entry") exception probably shouldn't exist.
 
- libseed/seed-api.c                          |   16 ----
- libseed/seed-builtins.c                     |  127 ++-------------------------
- libseed/seed-engine.c                       |    1 -
- libseed/seed-private.h                      |    1 -
- libseed/seed-signals.c                      |    9 +-
- libseed/seed-structs.c                      |   15 ++--
- libseed/seed-types.c                        |   40 +++++----
- libseed/seed.h                              |    3 -
- modules/readline/seed-readline.c            |    2 +-
- src/main.c                                  |   11 +--
- tests/javascript/builtin-argument-length.js |    2 +-
+ libseed/seed-api.c                          |  16 ----
+ libseed/seed-builtins.c                     | 127 ++--------------------------
+ libseed/seed-engine.c                       |   1 -
+ libseed/seed-private.h                      |   1 -
+ libseed/seed-signals.c                      |   9 +-
+ libseed/seed-structs.c                      |  15 ++--
+ libseed/seed-types.c                        |  40 +++++----
+ libseed/seed.h                              |   3 -
+ modules/readline/seed-readline.c            |   2 +-
+ src/main.c                                  |  11 +--
+ tests/javascript/builtin-argument-length.js |   2 +-
  11 files changed, 44 insertions(+), 183 deletions(-)
 
 commit 12e184eeec9144f5a223cef4b097b32f0855784d
@@ -13527,7 +14889,7 @@ Date:   Tue Feb 24 15:09:19 2009 -0500
 
     Initialize default stroke/fill colors when making a new SeedCanvasStyle
 
- modules/canvas/seed-canvas.c |   21 +++++++++++++++++----
+ modules/canvas/seed-canvas.c | 21 +++++++++++++++++----
  1 file changed, 17 insertions(+), 4 deletions(-)
 
 commit a40983bae301bc68ac4885cbccf70b0e52ba88ac
@@ -13536,8 +14898,8 @@ Date:   Tue Feb 24 15:03:34 2009 -0500
 
     cleanup canvas tests a bit...more work on stage
 
- modules/canvas/run-tests.js  |  589 +++++++++++++++++++++---------------------
- modules/canvas/seed-canvas.c |    6 +-
+ modules/canvas/run-tests.js  | 589 ++++++++++++++++++++++---------------------
+ modules/canvas/seed-canvas.c |   6 +-
  2 files changed, 299 insertions(+), 296 deletions(-)
 
 commit 3649f16b05792b99ce2943f26739a6f9c4e96324
@@ -13553,7 +14915,7 @@ Date:   Tue Feb 24 14:56:02 2009 -0500
 
     Some more work on Canvas...it's a little broken right now but in the middle of an essential rewrite that should let state work properly
 
- modules/canvas/seed-canvas.c |  309 ++++++++++++++++++++++++++----------------
+ modules/canvas/seed-canvas.c | 309 +++++++++++++++++++++++++++----------------
  1 file changed, 193 insertions(+), 116 deletions(-)
 
 commit 882e7e11c7d62a363ac5931aea67ffe34b1c00a3
@@ -13572,17 +14934,17 @@ Date:   Tue Feb 24 12:46:25 2009 -0500
 
     Patch from Matt to add global include paths. Can't set from JS, but can from C, and gets used as search path during Seed.include. Also, swapping between indent styles isn't cool.
 
- libseed/seed-api.c                          |   16 ++++
- libseed/seed-builtins.c                     |  127 +++++++++++++++++++++++++--
- libseed/seed-engine.c                       |    1 +
- libseed/seed-private.h                      |    1 +
- libseed/seed-signals.c                      |    9 +-
- libseed/seed-structs.c                      |   15 ++--
- libseed/seed-types.c                        |   40 ++++-----
- libseed/seed.h                              |    3 +
- modules/readline/seed-readline.c            |    2 +-
- src/main.c                                  |   11 ++-
- tests/javascript/builtin-argument-length.js |    2 +-
+ libseed/seed-api.c                          |  16 ++++
+ libseed/seed-builtins.c                     | 127 ++++++++++++++++++++++++++--
+ libseed/seed-engine.c                       |   1 +
+ libseed/seed-private.h                      |   1 +
+ libseed/seed-signals.c                      |   9 +-
+ libseed/seed-structs.c                      |  15 ++--
+ libseed/seed-types.c                        |  40 ++++-----
+ libseed/seed.h                              |   3 +
+ modules/readline/seed-readline.c            |   2 +-
+ src/main.c                                  |  11 ++-
+ tests/javascript/builtin-argument-length.js |   2 +-
  11 files changed, 183 insertions(+), 44 deletions(-)
 
 commit cc1345135e336cded856805b953e6c7026698135
@@ -13591,7 +14953,7 @@ Date:   Mon Feb 23 16:36:56 2009 -0500
 
     seed_print doesn't need to use printf
 
- libseed/seed-builtins.c |    3 ++-
+ libseed/seed-builtins.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ba4d0ce9c90439dc58ea94ecca5d198598327c04
@@ -13600,8 +14962,8 @@ Date:   Mon Feb 23 16:25:22 2009 -0500
 
     Change the two tests that use Clutter to use Pango and GTK instead
 
- tests/javascript/struct-offsets.js  |    8 ++++----
- tests/javascript/type-conversion.js |   13 ++++++-------
+ tests/javascript/struct-offsets.js  |  8 ++++----
+ tests/javascript/type-conversion.js | 13 ++++++-------
  2 files changed, 10 insertions(+), 11 deletions(-)
 
 commit 3ae12b3b9f6024f003f14b90b50e1fbd04eccf5a
@@ -13610,7 +14972,7 @@ Date:   Mon Feb 23 16:09:16 2009 -0500
 
     Avoid initializing return GValue in case of G_TYPE_NONE (also avoid unsetting it leading to an unpleasant message on the console)
 
- libseed/seed-signals.c |    6 ++++--
+ libseed/seed-signals.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit f17991a54c6dcffadacef481ed786936d687548f
@@ -13619,7 +14981,7 @@ Date:   Mon Feb 23 16:07:19 2009 -0500
 
     api-js-signal-from-c needs to use double as the return value if it wants to strictly check for equality (Given JSCore is always in double precision
 
- tests/c/api-js-signal-from-c.c |    6 +++---
+ tests/c/api-js-signal-from-c.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 968fc93a9ac3e9886bedb320f5e963ea06e8c348
@@ -13635,10 +14997,10 @@ Date:   Mon Feb 23 16:03:42 2009 -0500
 
     hello_cb in api-js-signal-form-c was smashing the stack
 
- libseed/seed-gtype.c           |  177 +---------------------------------------
- libseed/seed-private.h         |    1 +
- tests/c/Makefile.am            |    2 +-
- tests/c/api-js-signal-from-c.c |   40 ++++-----
+ libseed/seed-gtype.c           | 177 +----------------------------------------
+ libseed/seed-private.h         |   1 +
+ tests/c/Makefile.am            |   2 +-
+ tests/c/api-js-signal-from-c.c |  40 +++++-----
  4 files changed, 23 insertions(+), 197 deletions(-)
 
 commit 57e8f122e1b036d2db32cd0fe3e81c4fe4a05c44
@@ -13647,8 +15009,8 @@ Date:   Mon Feb 23 15:52:26 2009 -0500
 
     seed_gobject_signal_emit needs to initialize ret_value to query.return_type, fixes two tests
 
- libseed/seed-signals.c |    6 +++++-
- libseed/seed-types.c   |    3 ++-
+ libseed/seed-signals.c | 6 +++++-
+ libseed/seed-types.c   | 3 ++-
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 09c867506c611bf533405fa5a0f2b9ef13f2ee24
@@ -13657,9 +15019,9 @@ Date:   Mon Feb 23 15:33:17 2009 -0500
 
     Fix longstanding seed_gi_argument_make_js bug with handling enums, sometimes broke things in getting struct properties struct-nested-set.js passes now
 
- libseed/seed-structs.c                |    8 +++++---
- libseed/seed-types.c                  |    2 +-
- tests/javascript/struct-nested-set.js |    2 +-
+ libseed/seed-structs.c                | 8 +++++---
+ libseed/seed-types.c                  | 2 +-
+ tests/javascript/struct-nested-set.js | 2 +-
  3 files changed, 7 insertions(+), 5 deletions(-)
 
 commit 381f6a0e7b55fb109770519dfa2327ecd7766c6e
@@ -13675,14 +15037,15 @@ Date:   Mon Feb 23 15:23:31 2009 -0500
 
     Docs cleanup. Added missing seed.h symbols, created a reasonable ordering, added subsections, etc.
 
- doc/reference/Makefile.am           |    2 +-
- doc/reference/html/index.html       |    2 +-
- doc/reference/seed-docs.sgml        |    2 +-
- doc/reference/seed-sections.txt     |   74 +++++---
- doc/reference/tmpl/seed-types.sgml  |   22 +++
- doc/reference/tmpl/seed-unused.sgml |   24 +++
- doc/reference/tmpl/seed.sgml        |  319 +++++++++++++++++++++--------------
- 7 files changed, 287 insertions(+), 158 deletions(-)
+ doc/reference/Makefile.am           |   2 +-
+ doc/reference/html/index.html       |   2 +-
+ doc/reference/seed-docs.sgml        |   2 +-
+ doc/reference/seed-sections.txt     |  74 ++++++---
+ doc/reference/seed.types            |   0
+ doc/reference/tmpl/seed-types.sgml  |  22 +++
+ doc/reference/tmpl/seed-unused.sgml |  24 +++
+ doc/reference/tmpl/seed.sgml        | 319 +++++++++++++++++++++---------------
+ 8 files changed, 287 insertions(+), 158 deletions(-)
 
 commit dd05c6962e83903a26242e557856226d1411c4ee
 Author: Robert Carr <racarr@mireia.(none)>
@@ -13690,7 +15053,7 @@ Date:   Mon Feb 23 15:13:37 2009 -0500
 
     Fix missing seed_union_set_property implementation.
 
- libseed/seed-structs.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-structs.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 43 insertions(+), 1 deletion(-)
 
 commit 02e716dcb604820918b89d46893cbb8bc2ce6e81
@@ -13699,7 +15062,7 @@ Date:   Mon Feb 23 15:00:45 2009 -0500
 
     Remove gtype-signal-gvalue.js test as it is nonsense (Note GObject.TYPE_VALUE does not exist)
 
- tests/javascript/gtype-signal-gvalue.js |   33 -------------------------------
+ tests/javascript/gtype-signal-gvalue.js | 33 ---------------------------------
  1 file changed, 33 deletions(-)
 
 commit 94dc664a9f3a8b06ab91abe1682e442e64a4f1f5
@@ -13708,7 +15071,7 @@ Date:   Mon Feb 23 14:58:41 2009 -0500
 
     Fix readline bindings Makefile
 
- modules/readline/Makefile.am |    1 +
+ modules/readline/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit dc2a4d2bfe91fe1dfc0a86a036a744020270cbdb
@@ -13749,13 +15112,13 @@ Date:   Sun Feb 22 14:30:44 2009 -0500
 
     Long patch from Matt that changes lots of things to glib functions, removing most of the stdio includes so we don't accidentally use them, switching printf(size_t) to use %Zd instead of casting to an int, etc.
 
- libseed/seed-builtins.c          |   22 ++++++++++------------
- libseed/seed-engine.c            |   15 ++++++---------
- libseed/seed-gtype.c             |   13 +++++--------
- libseed/seed-private.h           |    3 +--
- libseed/seed-signals.c           |   13 ++++++-------
- modules/readline/seed-readline.c |    3 ++-
- src/main.c                       |    8 ++++----
+ libseed/seed-builtins.c          | 22 ++++++++++------------
+ libseed/seed-engine.c            | 15 ++++++---------
+ libseed/seed-gtype.c             | 13 +++++--------
+ libseed/seed-private.h           |  3 +--
+ libseed/seed-signals.c           | 13 ++++++-------
+ modules/readline/seed-readline.c |  3 ++-
+ src/main.c                       |  8 ++++----
  7 files changed, 34 insertions(+), 43 deletions(-)
 
 commit f5d221245fa2a65596f1a6ebe441e4e61fa97667
@@ -13764,7 +15127,7 @@ Date:   Sun Feb 22 13:04:47 2009 -0500
 
     Matt's type fixes, and a warning fix (use %Zd instead of %d to print size_t)
 
- modules/readline/seed-readline.c |    8 ++++----
+ modules/readline/seed-readline.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 329afbfb2c44787e7dc2a0294b16552d3ad328b2
@@ -13773,7 +15136,7 @@ Date:   Sun Feb 22 05:36:17 2009 -0500
 
     More GtkDoc. Also, apparently there are functions we have that aren't showing up in GtkDoc. Maybe because they're not in the seed-sections.txt or whatever? Anyway, goodnight.
 
- libseed/seed-api.c |    2 +-
+ libseed/seed-api.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 86d65b3caaf7722f429d8863a3324555c8e356c1
@@ -13782,7 +15145,7 @@ Date:   Sun Feb 22 05:31:42 2009 -0500
 
     More GtkDoc.
 
- libseed/seed-api.c |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-api.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 61 insertions(+)
 
 commit 172885cbc722401ee8650f95e97afe0068e4a8cd
@@ -13791,10 +15154,10 @@ Date:   Sun Feb 22 04:46:29 2009 -0500
 
     It's finally time to start working on Gtk-Doc! Here's a slim beginning.
 
- doc/reference/tmpl/seed.sgml |    2 +-
- libseed/seed-api.c           |   31 +++++++++++++++++++++++++++----
- libseed/seed-engine.c        |   10 ++++++++++
- libseed/seed.h               |    2 +-
+ doc/reference/tmpl/seed.sgml |  2 +-
+ libseed/seed-api.c           | 31 +++++++++++++++++++++++++++----
+ libseed/seed-engine.c        | 10 ++++++++++
+ libseed/seed.h               |  2 +-
  4 files changed, 39 insertions(+), 6 deletions(-)
 
 commit 44ab7acf0fbb0abdd6b3d7c0990c290f40ba4e39
@@ -13803,8 +15166,8 @@ Date:   Sun Feb 22 04:25:38 2009 -0500
 
     Fix some autotools stuff so opengl and twitter examples get distributed in seed tarballs.
 
- examples/opengl/Makefile.am  |    4 ++++
- examples/twitter/Makefile.am |    5 ++++-
+ examples/opengl/Makefile.am  | 4 ++++
+ examples/twitter/Makefile.am | 5 ++++-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 6eeb16faaed7bbb72fe663f8950e1c0be2c9284f
@@ -13815,7 +15178,7 @@ Date:   Sun Feb 22 04:17:01 2009 -0500
     		* Why don't Clutter 0.9 GIRs have offsets for ClutterColor?
     Because we've resolved it: it was actually a clutter_color_parse annotation problem. There's a patch in /patches, and I'll file a bug against clutter tomorrow. Perhaps we can get a better API? (var col = Clutter.Color.parse("red"), or some such).
 
- OPEN_QUESTIONS |    4 +---
+ OPEN_QUESTIONS | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 36ee8c74c976dfd963c2d5b6a6423ab77a99b098
@@ -13824,7 +15187,7 @@ Date:   Sun Feb 22 04:13:51 2009 -0500
 
     Update changelog for today's business.
 
- ChangeLog |   13 +++++++++----
+ ChangeLog | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 commit 0c0d39b47b7c576ea84af10c8e009ce8c1fc96f1
@@ -13833,8 +15196,8 @@ Date:   Sun Feb 22 04:09:31 2009 -0500
 
     More JSLint fixes.
 
- examples/same-seed/board.js |   39 +++++++++++++++++++++------------------
- examples/same-seed/light.js |   20 ++++++++++----------
+ examples/same-seed/board.js | 39 +++++++++++++++++++++------------------
+ examples/same-seed/light.js | 20 ++++++++++----------
  2 files changed, 31 insertions(+), 28 deletions(-)
 
 commit 501786682fca3ee52ed681fe950fc05807621de0
@@ -13843,8 +15206,8 @@ Date:   Sun Feb 22 04:03:28 2009 -0500
 
     Fix two examples to conform to jslint.
 
- examples/gtkplug.js |   24 +++++++++++-------------
- examples/ls.js      |    2 +-
+ examples/gtkplug.js | 24 +++++++++++-------------
+ examples/ls.js      |  2 +-
  2 files changed, 12 insertions(+), 14 deletions(-)
 
 commit fc9f8400258dbe340831213a5d4db7ecf1e6e518
@@ -13853,8 +15216,8 @@ Date:   Sun Feb 22 03:54:54 2009 -0500
 
     Still slightly broken readline detection is now fixed - some things were manually linking against readline, which was wrong.
 
- src/Makefile.am     |    2 +-
- tests/c/Makefile.am |    2 +-
+ src/Makefile.am     | 2 +-
+ tests/c/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 1a828a87517162aeede71a7a48cc707663f18930
@@ -13863,17 +15226,17 @@ Date:   Sun Feb 22 03:50:09 2009 -0500
 
     Indent session!
 
- libseed/seed-engine.c            |   35 ++++-----
- libseed/seed-types.c             |    2 +-
- modules/readline/seed-readline.c |    4 +-
- src/main.c                       |   29 ++++----
- tests/c/api-closure.c            |   38 +++++-----
- tests/c/api-js-signal-from-c.c   |   56 ++++++++-------
- tests/c/api-types.c              |  145 +++++++++++++++++++-------------------
- tests/c/basic.c                  |    1 -
- tests/c/main.c                   |   28 ++++----
- tests/c/test-common.h            |   12 ++--
- tools/indent.sh                  |    5 +-
+ libseed/seed-engine.c            |  35 +++++-----
+ libseed/seed-types.c             |   2 +-
+ modules/readline/seed-readline.c |   4 +-
+ src/main.c                       |  29 ++++----
+ tests/c/api-closure.c            |  38 +++++-----
+ tests/c/api-js-signal-from-c.c   |  56 +++++++--------
+ tests/c/api-types.c              | 145 +++++++++++++++++++--------------------
+ tests/c/basic.c                  |   1 -
+ tests/c/main.c                   |  28 ++++----
+ tests/c/test-common.h            |  12 ++--
+ tools/indent.sh                  |   5 +-
  11 files changed, 176 insertions(+), 179 deletions(-)
 
 commit fe6f209ed2199064a1f3b7313d89c2cafacc5e74
@@ -13882,7 +15245,7 @@ Date:   Sun Feb 22 03:23:33 2009 -0500
 
     A patch from Matt adding persistent readline history.
 
- modules/readline/seed-readline.c |   15 ++++++++++++++-
+ modules/readline/seed-readline.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 commit c8e6acde9e1e6510f53d5629553109add61243e6
@@ -13891,7 +15254,7 @@ Date:   Sun Feb 22 00:15:17 2009 -0500
 
     Add matt's clutter thing to changelog.
 
- ChangeLog |    1 +
+ ChangeLog | 1 +
  1 file changed, 1 insertion(+)
 
 commit 235d8d36231c9d1ad443b02754f8b97a21b57bb8
@@ -13900,11 +15263,11 @@ Date:   Sun Feb 22 00:08:18 2009 -0500
 
     Fix up some docs autotools stuff, add empty shell of a 'mapping' guide like Gjs has.
 
- configure.ac                        |    1 +
- doc/Makefile.am                     |    7 ++++---
- doc/mapping.html.in                 |   27 +++++++++++++++++++++++++++
- doc/modules/Makefile.am             |    4 ++--
- doc/tutorial-standalone/Makefile.am |    2 +-
+ configure.ac                        |  1 +
+ doc/Makefile.am                     |  7 ++++---
+ doc/mapping.html.in                 | 27 +++++++++++++++++++++++++++
+ doc/modules/Makefile.am             |  4 ++--
+ doc/tutorial-standalone/Makefile.am |  2 +-
  5 files changed, 35 insertions(+), 6 deletions(-)
 
 commit 60f1c91638469ce3deb738eca5e46ef721f2e63c
@@ -13913,7 +15276,7 @@ Date:   Sat Feb 21 22:21:41 2009 -0500
 
     Cleanup Matt's patch a bit.
 
- examples/clutter-0.9.js |   50 +++++++++++++++++++++++------------------------
+ examples/clutter-0.9.js | 50 ++++++++++++++++++++++++-------------------------
  1 file changed, 25 insertions(+), 25 deletions(-)
 
 commit 29e5899f27883df08fa68dfdc6f747cf7dfca241
@@ -13922,7 +15285,7 @@ Date:   Sat Feb 21 22:08:50 2009 -0500
 
     Whoops! Forgot to update Makefile for new clutter example.
 
- examples/Makefile.am |    6 ++++--
+ examples/Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit c6762e551c73fa47a304300b02f4b1db0a016280
@@ -13931,10 +15294,10 @@ Date:   Sat Feb 21 22:03:33 2009 -0500
 
     Matt rewrote Robb's Clutter "game" for Clutter 0.9, using the new animation API and such. Requires the clutter-color-out-annotation.patch as of commit time, but hopefully that'll go upstream. Now we have something that uses Clutter 0.9 without using GtkClutter (yay!!)
 
- examples/HACKING        |    4 +-
- examples/clutter-0.8.js |  123 +++++++++++++++++++++++++++++++++++++++++++++++
- examples/clutter-0.9.js |  108 +++++++++++++++++++++++++++++++++++++++++
- examples/clutter.js     |  123 -----------------------------------------------
+ examples/HACKING        |   4 +-
+ examples/clutter-0.8.js | 123 ++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/clutter-0.9.js | 108 ++++++++++++++++++++++++++++++++++++++++++
+ examples/clutter.js     | 123 ------------------------------------------------
  4 files changed, 233 insertions(+), 125 deletions(-)
 
 commit 2e5dcf1bac1361f5a6fe93773f8f60e85ef93e9f
@@ -13943,8 +15306,8 @@ Date:   Sat Feb 21 21:44:58 2009 -0500
 
     It seems like a good idea to keep the not-yet-applied patches that we create against upstream projects /somewhere/ besides in my email...
 
- patches/clutter-animatev-with-annotation.patch |  325 ++++++++++++++++++++++++
- patches/clutter-color-out-annotation.patch     |   13 +
+ patches/clutter-animatev-with-annotation.patch | 325 +++++++++++++++++++++++++
+ patches/clutter-color-out-annotation.patch     |  13 +
  2 files changed, 338 insertions(+)
 
 commit 4825c424c117e259891613b205b1c6ba32990f02
@@ -13953,7 +15316,7 @@ Date:   Sat Feb 21 21:38:16 2009 -0500
 
     Struct offset test change from earlier no longer applies. An extra annotation to clutter_color_parse was what actually broke things; I have a patch to fix it.
 
- tests/javascript/struct-offsets.js |    2 +-
+ tests/javascript/struct-offsets.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0137efe639774f23dc710e86613ceddec329679c
@@ -13962,7 +15325,7 @@ Date:   Sat Feb 21 20:05:34 2009 -0500
 
     Fix seed_repl_expose output formatting.
 
- libseed/seed-engine.c |    6 +++---
+ libseed/seed-engine.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit a175cf31a1ecf85401a491c27252835f932db80a
@@ -13973,8 +15336,8 @@ Date:   Sat Feb 21 19:26:14 2009 -0500
     
     This is useful when you've got JSValue* stuff sitting around in C and want to poke around at it from Javascript.
 
- libseed/seed-engine.c |   40 ++++++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.h |    2 ++
+ libseed/seed-engine.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.h |  2 ++
  2 files changed, 42 insertions(+)
 
 commit f472db3f817806b19bdc8ff5132f25208a1d1c98
@@ -13983,7 +15346,7 @@ Date:   Sat Feb 21 17:08:57 2009 -0500
 
     Twitter client profile images are aligned right now.
 
- examples/twitter/twitter.js |    9 +++------
+ examples/twitter/twitter.js | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
 commit 10b7e167ac8c7dc2b7563c517b01874c4f10bde5
@@ -13992,7 +15355,7 @@ Date:   Sat Feb 21 16:54:47 2009 -0500
 
     Fix Twitter client so it responds to enter key as well as click.
 
- examples/twitter/twitter.js |   19 ++++++++++++-------
+ examples/twitter/twitter.js | 19 ++++++++++++-------
  1 file changed, 12 insertions(+), 7 deletions(-)
 
 commit ebc57b82c9642273981e156e9b2be5f2603db7ea
@@ -14001,7 +15364,7 @@ Date:   Sat Feb 21 04:33:31 2009 -0500
 
     Add a file of open questions that I have. If anyone has answers, let me know!
 
- OPEN_QUESTIONS |    9 +++++++++
+ OPEN_QUESTIONS | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit ffa1e19cdb74c80ae8e16f79da78cef011152b51
@@ -14010,7 +15373,7 @@ Date:   Sat Feb 21 04:07:58 2009 -0500
 
     Add middle-click-open-in-new-tab to seed browser. This exposes a bug in something which causes a segfault, so it's disabled for now.
 
- examples/browser/BrowserView.js |   17 +++++++++++++++++
+ examples/browser/BrowserView.js | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 30b49fc14813d0a43095ea2c5d1f47b6ce4f13a5
@@ -14019,14 +15382,14 @@ Date:   Sat Feb 21 03:44:27 2009 -0500
 
     Remove old copy of the browser (bad Git import, I assume...)
 
- ChangeLog                             |    2 +-
- examples/browser/browser-actions.js   |  347 ---------------------------------
- examples/browser/browser-bookmarks.js |   54 -----
- examples/browser/browser-find.js      |   39 ----
- examples/browser/browser-main.js      |   24 ---
- examples/browser/browser-menu.js      |  148 --------------
- examples/browser/browser-tab.js       |  160 ---------------
- examples/browser/browser-toolbar.js   |   25 ---
+ ChangeLog                             |   2 +-
+ examples/browser/browser-actions.js   | 347 ----------------------------------
+ examples/browser/browser-bookmarks.js |  54 ------
+ examples/browser/browser-find.js      |  39 ----
+ examples/browser/browser-main.js      |  24 ---
+ examples/browser/browser-menu.js      | 148 ---------------
+ examples/browser/browser-tab.js       | 160 ----------------
+ examples/browser/browser-toolbar.js   |  25 ---
  8 files changed, 1 insertion(+), 798 deletions(-)
 
 commit 565cb80fb5c91153f23722f4626a7c90107f7e29
@@ -14035,7 +15398,7 @@ Date:   Sat Feb 21 03:43:20 2009 -0500
 
     Add a few tiny conventions.
 
- doc/conventions.html.in |    8 ++++++++
+ doc/conventions.html.in | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit b80c26d7c5f41881f4fd2929be89c3385b1e4508
@@ -14044,7 +15407,7 @@ Date:   Sat Feb 21 03:36:40 2009 -0500
 
     Use gnome-www-browser instead of gnome-open for profiling output.
 
- Makefile.am |   12 ++++++------
+ Makefile.am | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 3c03707bd667354e09f6f7228775124c6275d2f3
@@ -14053,7 +15416,7 @@ Date:   Sat Feb 21 03:32:02 2009 -0500
 
     For some reason (upstream!) Clutter 0.9 GIRs don't have offset data for ClutterColor. Someone should fix this.
 
- tests/javascript/struct-offsets.js |    2 +-
+ tests/javascript/struct-offsets.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bdca452535c11a66f11e4a2eb2878539d31fbe88
@@ -14062,9 +15425,9 @@ Date:   Sat Feb 21 03:29:51 2009 -0500
 
     Fix some tests I accidentally broke in the last one (line numbers in exceptions changed, etc.)
 
- tests/javascript/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtype-signal-args.js          |    4 +---
- tests/javascript/signal-exception.js           |    2 +-
+ tests/javascript/gtype-class-init-exception.js | 2 +-
+ tests/javascript/gtype-signal-args.js          | 4 +---
+ tests/javascript/signal-exception.js           | 2 +-
  3 files changed, 3 insertions(+), 5 deletions(-)
 
 commit 4aa918fcd7fbce13df809e6052ec9e1d5ad6b38c
@@ -14073,33 +15436,33 @@ Date:   Sat Feb 21 03:25:55 2009 -0500
 
     Test formatting cleanup; lots of duplicated test headers.
 
- tests/javascript/argv.js                       |    1 +
- tests/javascript/array-gtype.js                |    1 +
- tests/javascript/builtin-argument-length.js    |    4 ----
- tests/javascript/c-module.js                   |    1 +
- tests/javascript/closure-finalization.js       |    1 +
- tests/javascript/constructor-args.js           |    1 +
- tests/javascript/constructor-prototype.js      |    1 +
- tests/javascript/function-info.js              |    1 +
- tests/javascript/gerror.js                     |    4 ----
- tests/javascript/gtype-class-init-exception.js |    1 +
- tests/javascript/gtype-property.js             |    4 ----
- tests/javascript/gtype-signal-exception.js     |    4 ----
- tests/javascript/gtype-typerror.js             |    1 +
- tests/javascript/gvalue-argument.js            |    1 +
- tests/javascript/include-syntax.js             |    1 +
- tests/javascript/json.js                       |    3 ++-
- tests/javascript/object-info.js                |    1 +
- tests/javascript/printf.js                     |    3 ++-
- tests/javascript/printprint.js                 |    1 +
- tests/javascript/signal-exception.js           |    1 +
- tests/javascript/struct-constructor.js         |    1 +
- tests/javascript/struct-enumerate.js           |    3 ++-
- tests/javascript/struct-functions.js           |    1 +
- tests/javascript/struct-nested-set.js          |    1 +
- tests/javascript/struct-offsets.js             |    5 +----
- tests/javascript/struct-set-member.js          |    7 ++-----
- tests/javascript/struct-union-enumerate.js     |    5 +----
+ tests/javascript/argv.js                       | 1 +
+ tests/javascript/array-gtype.js                | 1 +
+ tests/javascript/builtin-argument-length.js    | 4 ----
+ tests/javascript/c-module.js                   | 1 +
+ tests/javascript/closure-finalization.js       | 1 +
+ tests/javascript/constructor-args.js           | 1 +
+ tests/javascript/constructor-prototype.js      | 1 +
+ tests/javascript/function-info.js              | 1 +
+ tests/javascript/gerror.js                     | 4 ----
+ tests/javascript/gtype-class-init-exception.js | 1 +
+ tests/javascript/gtype-property.js             | 4 ----
+ tests/javascript/gtype-signal-exception.js     | 4 ----
+ tests/javascript/gtype-typerror.js             | 1 +
+ tests/javascript/gvalue-argument.js            | 1 +
+ tests/javascript/include-syntax.js             | 1 +
+ tests/javascript/json.js                       | 3 ++-
+ tests/javascript/object-info.js                | 1 +
+ tests/javascript/printf.js                     | 3 ++-
+ tests/javascript/printprint.js                 | 1 +
+ tests/javascript/signal-exception.js           | 1 +
+ tests/javascript/struct-constructor.js         | 1 +
+ tests/javascript/struct-enumerate.js           | 3 ++-
+ tests/javascript/struct-functions.js           | 1 +
+ tests/javascript/struct-nested-set.js          | 1 +
+ tests/javascript/struct-offsets.js             | 5 +----
+ tests/javascript/struct-set-member.js          | 7 ++-----
+ tests/javascript/struct-union-enumerate.js     | 5 +----
  27 files changed, 27 insertions(+), 32 deletions(-)
 
 commit ad8f93a26b0daa4c8ee55ee567c1dce0f55ceee1
@@ -14108,12 +15471,12 @@ Date:   Sat Feb 21 03:15:59 2009 -0500
 
     Don't depend on SVN.
 
- doc/reference/html/index.html |   37 ++++++++++++
- m4/libtool.m4                 |  128 +++++++++++++----------------------------
- m4/ltoptions.m4               |    2 +-
- m4/ltsugar.m4                 |   20 +++----
- m4/ltversion.m4               |   10 ++--
- tests/run-tests.py            |    5 +-
+ doc/reference/html/index.html |  37 ++++++++++++
+ m4/libtool.m4                 | 128 +++++++++++++-----------------------------
+ m4/ltoptions.m4               |   2 +-
+ m4/ltsugar.m4                 |  20 +++----
+ m4/ltversion.m4               |  10 ++--
+ tests/run-tests.py            |   5 +-
  6 files changed, 94 insertions(+), 108 deletions(-)
 
 commit 3775824bb6d2ee01ff1c0b76f4b88ffe5745ec93
@@ -14122,7 +15485,7 @@ Date:   Mon Feb 16 16:15:09 2009 -0500
 
     Didn't mean to add animate_with_timeline in the last push.
 
- extensions/Clutter.js |   11 -----------
+ extensions/Clutter.js | 11 -----------
  1 file changed, 11 deletions(-)
 
 commit a5151b40292f1ef471ed182dae450bc8af3c7e09
@@ -14131,8 +15494,8 @@ Date:   Mon Feb 16 16:13:10 2009 -0500
 
     Add SameSeed GtkBuilder UI file.
 
- examples/same-seed/board.js     |    2 +-
- examples/same-seed/same-seed.ui |   72 +++++++++++++++++++++++++++++++++++++++
+ examples/same-seed/board.js     |  2 +-
+ examples/same-seed/same-seed.ui | 72 +++++++++++++++++++++++++++++++++++++++++
  2 files changed, 73 insertions(+), 1 deletion(-)
 
 commit 78c793c89abee31453050d57db35126a20966bfb
@@ -14141,11 +15504,11 @@ Date:   Sat Feb 14 05:05:57 2009 -0500
 
     Holy crap so many changes.
 
- examples/same-seed/board.js |   63 ++++++++++++++++++++++++++++---------------
- examples/same-seed/light.js |    4 ++-
- examples/same-seed/main.js  |   20 +++++++-------
- examples/same-seed/score.js |    7 +++--
- extensions/Clutter.js       |   12 +++++++++
+ examples/same-seed/board.js | 63 ++++++++++++++++++++++++++++++---------------
+ examples/same-seed/light.js |  4 ++-
+ examples/same-seed/main.js  | 20 +++++++-------
+ examples/same-seed/score.js |  7 +++--
+ extensions/Clutter.js       | 12 +++++++++
  5 files changed, 72 insertions(+), 34 deletions(-)
 
 commit b55988d81517f3d176c9f74ee89189df03bd7cce
@@ -14156,7 +15519,7 @@ Date:   Sat Feb 7 09:39:53 2009 +0000
     
     svn path=/trunk/; revision=852
 
- libseed/seed-types.c |    9 ++++++++-
+ libseed/seed-types.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 5f7f3a35bdbcd4a38bb98516b4e2cb769a3ad129
@@ -14173,7 +15536,8 @@ Date:   Sat Feb 7 09:19:31 2009 +0000
  libseed/seed-engine.c   |    2 +-
  libseed/seed-types.c    | 2540 ++++++++++++++++++++++++-----------------------
  libseed/seed.h          |   12 +-
- 6 files changed, 1308 insertions(+), 1317 deletions(-)
+ tools/indent.sh         |    0
+ 7 files changed, 1308 insertions(+), 1317 deletions(-)
 
 commit cb254217c849bac205cbd876061f6fd967e899fa
 Author: Tim Horton <hortont@src.gnome.org>
@@ -14183,18 +15547,18 @@ Date:   Sat Feb 7 08:39:57 2009 +0000
     
     svn path=/trunk/; revision=850
 
- libseed/seed-builtins.h        |   26 +++++++++++++-------------
- libseed/seed-closure.h         |   27 ++++++++++++++-------------
- libseed/seed-debug.h           |   21 +++++++++++++++++++++
- libseed/seed-engine.h          |   26 +++++++++++++-------------
- libseed/seed-exceptions.h      |   27 ++++++++++++++-------------
- libseed/seed-gtype.h           |   26 +++++++++++++-------------
- libseed/seed-private.h         |   26 +++++++++++++-------------
- libseed/seed-signals.h         |   26 +++++++++++++-------------
- libseed/seed-structs.h         |   26 +++++++++++++-------------
- libseed/seed-types.h           |   26 +++++++++++++-------------
- libseed/seed.h                 |   32 +++++++++++++++++---------------
- tests/javascript/everything.js |   12 ++++++------
+ libseed/seed-builtins.h        | 26 +++++++++++++-------------
+ libseed/seed-closure.h         | 27 ++++++++++++++-------------
+ libseed/seed-debug.h           | 21 +++++++++++++++++++++
+ libseed/seed-engine.h          | 26 +++++++++++++-------------
+ libseed/seed-exceptions.h      | 27 ++++++++++++++-------------
+ libseed/seed-gtype.h           | 26 +++++++++++++-------------
+ libseed/seed-private.h         | 26 +++++++++++++-------------
+ libseed/seed-signals.h         | 26 +++++++++++++-------------
+ libseed/seed-structs.h         | 26 +++++++++++++-------------
+ libseed/seed-types.h           | 26 +++++++++++++-------------
+ libseed/seed.h                 | 32 +++++++++++++++++---------------
+ tests/javascript/everything.js | 12 ++++++------
  12 files changed, 163 insertions(+), 138 deletions(-)
 
 commit ec254cb7f301203c85220d6377a9659360cfd65c
@@ -14205,15 +15569,15 @@ Date:   Sat Feb 7 08:37:45 2009 +0000
     
     svn path=/trunk/; revision=849
 
- libseed/seed-api.c        |   31 ++++++++++++++++++-------------
- libseed/seed-builtins.c   |   34 +++++++++++++++++-----------------
- libseed/seed-closure.c    |   31 ++++++++++++++++---------------
- libseed/seed-engine.c     |   32 +++++++++++++++++---------------
- libseed/seed-exceptions.c |   26 +++++++++++++-------------
- libseed/seed-gtype.c      |   32 +++++++++++++++++---------------
- libseed/seed-signals.c    |   32 +++++++++++++++++---------------
- libseed/seed-structs.c    |   32 +++++++++++++++++---------------
- libseed/seed-types.c      |   28 ++++++++++++++--------------
+ libseed/seed-api.c        | 31 ++++++++++++++++++-------------
+ libseed/seed-builtins.c   | 34 +++++++++++++++++-----------------
+ libseed/seed-closure.c    | 31 ++++++++++++++++---------------
+ libseed/seed-engine.c     | 32 +++++++++++++++++---------------
+ libseed/seed-exceptions.c | 26 +++++++++++++-------------
+ libseed/seed-gtype.c      | 32 +++++++++++++++++---------------
+ libseed/seed-signals.c    | 32 +++++++++++++++++---------------
+ libseed/seed-structs.c    | 32 +++++++++++++++++---------------
+ libseed/seed-types.c      | 28 ++++++++++++++--------------
  9 files changed, 146 insertions(+), 132 deletions(-)
 
 commit 320c2efcd27714d59504b734050fb57d66373083
@@ -14224,8 +15588,8 @@ Date:   Sat Feb 7 08:07:34 2009 +0000
     
     svn path=/trunk/; revision=848
 
- ChangeLog                   |    2 +-
- examples/same-seed/score.js |    2 +-
+ ChangeLog                   | 2 +-
+ examples/same-seed/score.js | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 03c6ca522a5406dfce947f6da5a792855f76da75
@@ -14236,7 +15600,7 @@ Date:   Fri Feb 6 00:56:11 2009 +0000
     
     svn path=/trunk/; revision=847
 
- ChangeLog |   15 +++++++++++++++
+ ChangeLog | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 3b148ad1957b272436cb96bfa1a103a31e6b3e3b
@@ -14247,12 +15611,12 @@ Date:   Fri Feb 6 00:28:47 2009 +0000
     
     svn path=/trunk/; revision=846
 
- ChangeLog        |   18 +++++++-
- examples/HACKING |   37 +++++++++++++---
- m4/libtool.m4    |  128 +++++++++++++++++++++++++++++++++++++-----------------
- m4/ltoptions.m4  |    2 +-
- m4/ltsugar.m4    |   20 ++++-----
- m4/ltversion.m4  |   10 ++---
+ ChangeLog        |  18 +++++++-
+ examples/HACKING |  37 +++++++++++++---
+ m4/libtool.m4    | 128 ++++++++++++++++++++++++++++++++++++++-----------------
+ m4/ltoptions.m4  |   2 +-
+ m4/ltsugar.m4    |  20 ++++-----
+ m4/ltversion.m4  |  10 ++---
  6 files changed, 153 insertions(+), 62 deletions(-)
 
 commit 98bc13d651afed0525212e837ac415e93646857b
@@ -14263,7 +15627,7 @@ Date:   Tue Feb 3 17:18:03 2009 +0000
     
     svn path=/trunk/; revision=845
 
- examples/same-seed/board.js |    4 ----
+ examples/same-seed/board.js | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 02d4218f4c5bec0627a18ab2eb797e001ff1361e
@@ -14274,8 +15638,8 @@ Date:   Tue Feb 3 17:16:49 2009 +0000
     
     svn path=/trunk/; revision=844
 
- examples/same-seed/board.js |   24 +++++++++++++++++++++---
- examples/same-seed/light.js |    4 ++++
+ examples/same-seed/board.js | 24 +++++++++++++++++++++---
+ examples/same-seed/light.js |  4 ++++
  2 files changed, 25 insertions(+), 3 deletions(-)
 
 commit d2c641af2dbca7580e083ba75dc5e6359e81b0ec
@@ -14286,7 +15650,7 @@ Date:   Tue Feb 3 16:40:32 2009 +0000
     
     svn path=/trunk/; revision=843
 
- examples/same-seed/board.js |   11 +++++++++--
+ examples/same-seed/board.js | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 commit 662a1f2d708d6e7946e74a04d8ed7a3329e64936
@@ -14297,7 +15661,7 @@ Date:   Tue Feb 3 16:37:53 2009 +0000
     
     svn path=/trunk/; revision=842
 
- examples/same-seed/board.js |   11 ++++++-----
+ examples/same-seed/board.js | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit e4ea4257ecf0a6b91407919c538b9a09fc13a1f4
@@ -14308,7 +15672,7 @@ Date:   Tue Feb 3 16:19:59 2009 +0000
     
     svn path=/trunk/; revision=841
 
- examples/same-seed/board.js |    7 +++++--
+ examples/same-seed/board.js | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit ad8bc14757ff55ad7421144e8799eaf0e83ee745
@@ -14319,9 +15683,9 @@ Date:   Tue Feb 3 16:05:04 2009 +0000
     
     svn path=/trunk/; revision=840
 
- examples/same-seed/board.js |    6 +++---
- examples/same-seed/main.js  |    3 +--
- examples/same-seed/score.js |    2 +-
+ examples/same-seed/board.js | 6 +++---
+ examples/same-seed/main.js  | 3 +--
+ examples/same-seed/score.js | 2 +-
  3 files changed, 5 insertions(+), 6 deletions(-)
 
 commit 2035b88c736dd5792cb0ee2b90c14b1dc39dbf69
@@ -14332,8 +15696,8 @@ Date:   Tue Feb 3 15:30:08 2009 +0000
     
     svn path=/trunk/; revision=839
 
- examples/same-seed/board.js |    4 ++--
- examples/same-seed/main.js  |    2 +-
+ examples/same-seed/board.js | 4 ++--
+ examples/same-seed/main.js  | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 457efa63dcf6716b1a2953ea1b8d3c6a038ac843
@@ -14344,7 +15708,7 @@ Date:   Tue Feb 3 15:19:25 2009 +0000
     
     svn path=/trunk/; revision=838
 
- examples/same-seed/score.js |   76 +++++++++++++++++++++++++++++++++++++++++++
+ examples/same-seed/score.js | 76 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 76 insertions(+)
 
 commit 4463c9a076358fcfed8cc70be6a056450784abfd
@@ -14355,13 +15719,13 @@ Date:   Tue Feb 3 15:14:20 2009 +0000
     
     svn path=/trunk/; revision=837
 
- examples/same-seed/blue.svg   |   24 ++---
- examples/same-seed/board.js   |  200 ++++++++++++++++++++---------------------
- examples/same-seed/green.svg  |   26 +++---
- examples/same-seed/light.js   |   50 +++++++++--
- examples/same-seed/main.js    |   35 +++++---
- examples/same-seed/red.svg    |   26 +++---
- examples/same-seed/yellow.svg |   26 +++---
+ examples/same-seed/blue.svg   |  24 ++---
+ examples/same-seed/board.js   | 200 ++++++++++++++++++++----------------------
+ examples/same-seed/green.svg  |  26 +++---
+ examples/same-seed/light.js   |  50 +++++++++--
+ examples/same-seed/main.js    |  35 +++++---
+ examples/same-seed/red.svg    |  26 +++---
+ examples/same-seed/yellow.svg |  26 +++---
  7 files changed, 210 insertions(+), 177 deletions(-)
 
 commit a8b7d8460af0fda3c93d912d135e61f922ad6bc0
@@ -14372,8 +15736,8 @@ Date:   Tue Feb 3 10:04:22 2009 +0000
     
     svn path=/trunk/; revision=836
 
- examples/same-seed/board.js |   10 ++++++----
- examples/same-seed/light.js |    4 ++--
+ examples/same-seed/board.js | 10 ++++++----
+ examples/same-seed/light.js |  4 ++--
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 commit a226f6f7616fa09d8c082ae1873f960574625bf5
@@ -14384,9 +15748,9 @@ Date:   Tue Feb 3 09:53:25 2009 +0000
     
     svn path=/trunk/; revision=835
 
- examples/same-seed/board.js |   61 ++++++++++++++++++++++++++++++++++++-------
- examples/same-seed/light.js |   11 ++++++--
- examples/same-seed/main.js  |    2 ++
+ examples/same-seed/board.js | 61 ++++++++++++++++++++++++++++++++++++++-------
+ examples/same-seed/light.js | 11 ++++++--
+ examples/same-seed/main.js  |  2 ++
  3 files changed, 63 insertions(+), 11 deletions(-)
 
 commit 5fc0118fad0e4222d5d46bb827e62c279db09820
@@ -14397,7 +15761,7 @@ Date:   Tue Feb 3 08:59:57 2009 +0000
     
     svn path=/trunk/; revision=834
 
- examples/same-seed/board.js |    9 +++++++--
+ examples/same-seed/board.js | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 0b724146fb56a37fbbd8268be56c74c698915a52
@@ -14408,7 +15772,7 @@ Date:   Tue Feb 3 08:37:50 2009 +0000
     
     svn path=/trunk/; revision=833
 
- extensions/Clutter.js |   11 +++++++++++
+ extensions/Clutter.js | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 9e291fe56ecff003fc5e7bc70f0a7a71f5106417
@@ -14419,8 +15783,8 @@ Date:   Tue Feb 3 08:36:52 2009 +0000
     
     svn path=/trunk/; revision=832
 
- examples/same-seed/board.js |   71 +++++++++----------------------------------
- examples/same-seed/main.js  |    4 +--
+ examples/same-seed/board.js | 71 +++++++++------------------------------------
+ examples/same-seed/main.js  |  4 +--
  2 files changed, 16 insertions(+), 59 deletions(-)
 
 commit da23967ab28120dcf24945ac9c20f63a3ca62ffa
@@ -14443,7 +15807,7 @@ Date:   Mon Feb 2 12:10:34 2009 +0000
     
     svn path=/trunk/; revision=830
 
- tests/c/api-js-signal-from-c.c |   43 ++++++++++++++++++++++++++++++++++++++++
+ tests/c/api-js-signal-from-c.c | 43 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 43 insertions(+)
 
 commit 883073b5e3aa189d2b2afbbe425f447efdba3515
@@ -14454,10 +15818,10 @@ Date:   Mon Feb 2 11:46:08 2009 +0000
     
     svn path=/trunk/; revision=829
 
- libseed/seed-types.c                  |   59 +++++++++++++++------------------
- tests/c/Makefile.am                   |    3 +-
- tests/c/main.c                        |    1 +
- tests/javascript/gtype-signal-args.js |    7 ++--
+ libseed/seed-types.c                  | 59 ++++++++++++++++-------------------
+ tests/c/Makefile.am                   |  3 +-
+ tests/c/main.c                        |  1 +
+ tests/javascript/gtype-signal-args.js |  7 +++--
  4 files changed, 35 insertions(+), 35 deletions(-)
 
 commit f22ab8431b65778c62276f1a6d6fdcd3725d2afb
@@ -14468,8 +15832,8 @@ Date:   Mon Feb 2 06:48:03 2009 +0000
     
     svn path=/trunk/; revision=828
 
- examples/same-seed/board.js |  163 +++++++++++++++++++++++++++++++++++--------
- examples/same-seed/main.js  |    7 +-
+ examples/same-seed/board.js | 163 ++++++++++++++++++++++++++++++++++++--------
+ examples/same-seed/main.js  |   7 +-
  2 files changed, 140 insertions(+), 30 deletions(-)
 
 commit f7fb36a21250ddef0cd8a4eeca58f555c2188b52
@@ -14480,8 +15844,8 @@ Date:   Mon Feb 2 04:25:49 2009 +0000
     
     svn path=/trunk/; revision=827
 
- examples/same-seed/light.js |   12 ++++++------
- examples/same-seed/main.js  |    7 +++++--
+ examples/same-seed/light.js | 12 ++++++------
+ examples/same-seed/main.js  |  7 +++++--
  2 files changed, 11 insertions(+), 8 deletions(-)
 
 commit 1bc97cec25e6d5798f6a28f021991c095a964902
@@ -14492,8 +15856,8 @@ Date:   Mon Feb 2 01:25:02 2009 +0000
     
     svn path=/trunk/; revision=826
 
- examples/same-seed/board.js |   95 +++++++++++--------------------------------
- examples/same-seed/main.js  |    4 +-
+ examples/same-seed/board.js | 95 +++++++++++----------------------------------
+ examples/same-seed/main.js  |  4 +-
  2 files changed, 25 insertions(+), 74 deletions(-)
 
 commit e33c17f3f8af6cc2145dfe52edefdc84f781b367
@@ -14504,9 +15868,9 @@ Date:   Mon Feb 2 01:06:53 2009 +0000
     
     svn path=/trunk/; revision=825
 
- examples/same-seed/board.js |  124 +++++++++++++++++++++++++++++++------------
- examples/same-seed/light.js |   13 ++---
- examples/same-seed/main.js  |    4 +-
+ examples/same-seed/board.js | 124 ++++++++++++++++++++++++++++++++------------
+ examples/same-seed/light.js |  13 ++---
+ examples/same-seed/main.js  |   4 +-
  3 files changed, 95 insertions(+), 46 deletions(-)
 
 commit c9faa7551dba7c4adb1bdf819538c49cd00acb57
@@ -14517,14 +15881,14 @@ Date:   Sun Feb 1 23:49:35 2009 +0000
     
     svn path=/trunk/; revision=824
 
- examples/same-seed/bkg.svg    |   95 +++++++++++++++++++++
- examples/same-seed/blue.svg   |   97 ++++++++++++++++++++++
- examples/same-seed/board.js   |  183 +++++++++++++++++++++++++++++++++++++++++
- examples/same-seed/green.svg  |   97 ++++++++++++++++++++++
- examples/same-seed/light.js   |   88 ++++++++++++++++++++
- examples/same-seed/main.js    |   37 +++++++++
- examples/same-seed/red.svg    |   97 ++++++++++++++++++++++
- examples/same-seed/yellow.svg |   97 ++++++++++++++++++++++
+ examples/same-seed/bkg.svg    |  95 ++++++++++++++++++++++
+ examples/same-seed/blue.svg   |  97 ++++++++++++++++++++++
+ examples/same-seed/board.js   | 183 ++++++++++++++++++++++++++++++++++++++++++
+ examples/same-seed/green.svg  |  97 ++++++++++++++++++++++
+ examples/same-seed/light.js   |  88 ++++++++++++++++++++
+ examples/same-seed/main.js    |  37 +++++++++
+ examples/same-seed/red.svg    |  97 ++++++++++++++++++++++
+ examples/same-seed/yellow.svg |  97 ++++++++++++++++++++++
  8 files changed, 791 insertions(+)
 
 commit bf499fe1a240d865af305a845eefaaebe6bfc9c2
@@ -14535,7 +15899,7 @@ Date:   Fri Jan 30 00:32:44 2009 +0000
     
     svn path=/trunk/; revision=823
 
- tests/javascript/gtype-signal-gvalue.js |    6 ++++--
+ tests/javascript/gtype-signal-gvalue.js | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 8638a002defedb7778aab63b9bb37ea69090fb96
@@ -14546,7 +15910,7 @@ Date:   Fri Jan 30 00:21:35 2009 +0000
     
     svn path=/trunk/; revision=822
 
- tests/javascript/gtype-signal-gvalue.js |   31 +++++++++++++++++++++++++++++++
+ tests/javascript/gtype-signal-gvalue.js | 31 +++++++++++++++++++++++++++++++
  1 file changed, 31 insertions(+)
 
 commit 37bcb2c3202d2dfe48eec501742b8cf5fc64f0c0
@@ -14557,15 +15921,15 @@ Date:   Thu Jan 29 19:22:19 2009 +0000
     
     svn path=/trunk/; revision=821
 
- Makefile.am                         |   12 +++++-
- config.h.in                         |    3 ++
- configure.ac                        |   12 ++++++
- modules/Multiprocessing/Makefile.am |    9 ++++-
- modules/canvas/Makefile.am          |    9 ++++-
- modules/example/Makefile.am         |    9 ++++-
- modules/readline/Makefile.am        |    9 ++++-
- modules/sqlite/Makefile.am          |    9 ++++-
- tests/c/api-types.c                 |   75 +++++++++++++++++++++++++++++++++++
+ Makefile.am                         | 12 +++++-
+ config.h.in                         |  3 ++
+ configure.ac                        | 12 ++++++
+ modules/Multiprocessing/Makefile.am |  9 ++++-
+ modules/canvas/Makefile.am          |  9 ++++-
+ modules/example/Makefile.am         |  9 ++++-
+ modules/readline/Makefile.am        |  9 ++++-
+ modules/sqlite/Makefile.am          |  9 ++++-
+ tests/c/api-types.c                 | 75 +++++++++++++++++++++++++++++++++++++
  9 files changed, 135 insertions(+), 12 deletions(-)
 
 commit daace0cde64ddccf9d121756b1329ec5d178c3f9
@@ -14576,8 +15940,8 @@ Date:   Thu Jan 29 18:24:17 2009 +0000
     
     svn path=/trunk/; revision=820
 
- libseed/seed-api.c |   93 ++++++++++++++++++++++++++++++++--------------------
- libseed/seed.h     |    2 ++
+ libseed/seed-api.c | 93 +++++++++++++++++++++++++++++++++---------------------
+ libseed/seed.h     |  2 ++
  2 files changed, 59 insertions(+), 36 deletions(-)
 
 commit 4ffe29f19ed524c254107eaf7951f3a08f8b7928
@@ -14588,9 +15952,9 @@ Date:   Thu Jan 29 18:24:05 2009 +0000
     
     svn path=/trunk/; revision=819
 
- libseed/seed-api.c    |   20 ++++++++++++++++++++
- libseed/seed-engine.c |    4 +++-
- libseed/seed.h        |    7 +++++++
+ libseed/seed-api.c    | 20 ++++++++++++++++++++
+ libseed/seed-engine.c |  4 +++-
+ libseed/seed.h        |  7 +++++++
  3 files changed, 30 insertions(+), 1 deletion(-)
 
 commit d29ca7d4154e9442045665606e3822def048eacf
@@ -14601,7 +15965,7 @@ Date:   Wed Jan 28 10:48:26 2009 +0000
     
     svn path=/trunk/; revision=818
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit ef28ff8b116d40959e756b60ee36fa5dc14d8d60
@@ -14612,8 +15976,8 @@ Date:   Wed Jan 28 10:35:15 2009 +0000
     
     svn path=/trunk/; revision=817
 
- README       |    2 ++
- configure.ac |    2 +-
+ README       | 2 ++
+ configure.ac | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit d9e0946e0386a5adfd5c53f305bd3b1e48ae17fb
@@ -14643,9 +16007,9 @@ Date:   Wed Jan 28 00:55:17 2009 +0000
     
     svn path=/trunk/; revision=815
 
- examples/clutter-cogl.js  |    4 +-
- opengl-glib/GL-custom.h   |  520 +++++++++++++++++++++++++++++++++++++++++++++
- opengl-glib/Glut-custom.h |   80 +++++++
+ examples/clutter-cogl.js  |   4 +-
+ opengl-glib/GL-custom.h   | 520 ++++++++++++++++++++++++++++++++++++++++++++++
+ opengl-glib/Glut-custom.h |  80 +++++++
  3 files changed, 602 insertions(+), 2 deletions(-)
 
 commit d6240c18413b13da8e240d01755fc8285c8fdbcc
@@ -14656,7 +16020,7 @@ Date:   Mon Jan 26 15:16:49 2009 +0000
     
     svn path=/trunk/; revision=814
 
- configure.ac |   34 +++++++++++++++++++++++++++++++---
+ configure.ac | 34 +++++++++++++++++++++++++++++++---
  1 file changed, 31 insertions(+), 3 deletions(-)
 
 commit 142095adeedf40e38fcadd15e7100ca5dc6f0dfd
@@ -14667,7 +16031,7 @@ Date:   Mon Jan 26 00:58:49 2009 +0000
     
     svn path=/trunk/; revision=813
 
- debian/control |    6 +++++-
+ debian/control | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 356e8cf2ad16141e75186e66c60089448303ad30
@@ -14678,10 +16042,10 @@ Date:   Mon Jan 26 00:54:47 2009 +0000
     
     svn path=/trunk/; revision=812
 
- debian/changelog |   59 +++++++++++++++++++
- debian/control   |   46 +++++++++++++++
- debian/copyright |  165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- debian/rules     |   61 ++++++++++++++++++++
+ debian/changelog |  59 ++++++++++++++++++++
+ debian/control   |  46 ++++++++++++++++
+ debian/copyright | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ debian/rules     |  61 ++++++++++++++++++++
  4 files changed, 331 insertions(+)
 
 commit 012006f15eedb371a6e8f567fb5063cd650a8849
@@ -14693,7 +16057,7 @@ Date:   Mon Jan 26 00:42:31 2009 +0000
     
     svn path=/trunk/; revision=811
 
- tests/javascript/object-info.js |    2 +-
+ tests/javascript/object-info.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8980502b8324ae483f6ce17dc54ee5b96666c320
@@ -14705,7 +16069,7 @@ Date:   Mon Jan 26 00:33:36 2009 +0000
     
     svn path=/trunk/; revision=810
 
- tests/run-tests.py |   15 +++++++++++----
+ tests/run-tests.py | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 commit 2dfacd390cdb45c75428a27af3f69b051da737dc
@@ -14716,7 +16080,7 @@ Date:   Sun Jan 25 20:30:32 2009 +0000
     
     svn path=/trunk/; revision=809
 
- tests/javascript/builtin-argument-length.js |   32 +++++++++++++--------------
+ tests/javascript/builtin-argument-length.js | 32 ++++++++++++++---------------
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 commit e366bcfc1ad6cef16ebb0a639fb98870f6e8fd62
@@ -14727,19 +16091,19 @@ Date:   Sun Jan 25 10:26:00 2009 +0000
     
     svn path=/trunk/; revision=808
 
- examples/browser/BrowserView.js                    |    2 +-
- examples/browser/TabbedBrowser.js                  |    2 +-
- examples/clutter-shader/ShaderView.js              |    2 +-
- examples/clutter-transitions/main.js               |    2 +-
- examples/clutter-transitions/transition-library.js |   48 ++++++++++----------
- examples/glib/timeout.js                           |    3 +-
- examples/opengl/seed-gears.js                      |   31 +++++++------
- examples/opengl/triangle-actor.js                  |   39 ++++++++--------
- examples/pong/pong.js                              |   16 +++----
- examples/poppler.js                                |    2 +-
- examples/twitter/pretty.js                         |    2 +-
- examples/twitter/twitter.js                        |   10 ++--
- tests/javascript/struct-union-enumerate.js         |    2 +-
+ examples/browser/BrowserView.js                    |  2 +-
+ examples/browser/TabbedBrowser.js                  |  2 +-
+ examples/clutter-shader/ShaderView.js              |  2 +-
+ examples/clutter-transitions/main.js               |  2 +-
+ examples/clutter-transitions/transition-library.js | 48 +++++++++++-----------
+ examples/glib/timeout.js                           |  3 +-
+ examples/opengl/seed-gears.js                      | 31 ++++++++------
+ examples/opengl/triangle-actor.js                  | 39 +++++++++---------
+ examples/pong/pong.js                              | 16 ++++----
+ examples/poppler.js                                |  2 +-
+ examples/twitter/pretty.js                         |  2 +-
+ examples/twitter/twitter.js                        | 10 ++---
+ tests/javascript/struct-union-enumerate.js         |  2 +-
  13 files changed, 85 insertions(+), 76 deletions(-)
 
 commit 5ff2dd4947b80c55f511e1d3cb3a827ca5f44b0d
@@ -14750,7 +16114,7 @@ Date:   Sun Jan 25 09:54:50 2009 +0000
     
     svn path=/trunk/; revision=807
 
- examples/pong/pong.js |    2 +-
+ examples/pong/pong.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6923ab0ec4d492da7a863bf6b1977c90874f3e7a
@@ -14761,10 +16125,10 @@ Date:   Sun Jan 25 09:52:26 2009 +0000
     
     svn path=/trunk/; revision=806
 
- examples/clutter-cogl.js                           |    2 +-
- examples/clutter-shader/main.js                    |    2 +-
- examples/clutter-transitions/transition-library.js |    2 +-
- examples/clutter.js                                |    2 +-
+ examples/clutter-cogl.js                           | 2 +-
+ examples/clutter-shader/main.js                    | 2 +-
+ examples/clutter-transitions/transition-library.js | 2 +-
+ examples/clutter.js                                | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit a1ca8d8db4f0fe594635f753997a3faf80099eb8
@@ -14775,7 +16139,7 @@ Date:   Sun Jan 25 09:48:51 2009 +0000
     
     svn path=/trunk/; revision=805
 
- examples/clutter-cairo.js |    4 ++--
+ examples/clutter-cairo.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6e1aac94cb32b9d3e771ad2f0aebcfac18564dd9
@@ -14787,19 +16151,19 @@ Date:   Sun Jan 25 09:47:14 2009 +0000
     
     svn path=/trunk/; revision=804
 
- examples/accelgroup.js      |    2 +-
- examples/actions.js         |    2 +-
- examples/async-quine.js     |    4 ++--
- examples/calculator.js      |    7 +++----
- examples/clutter-cogl.js    |   14 +++++++-------
- examples/clutter.js         |    8 ++++----
- examples/gdkpixbufloader.js |    3 ++-
- examples/gtkplug.js         |    2 +-
- examples/n-oscillator.js    |   23 ++++++++++++-----------
- examples/poppler.js         |   18 ++++++++++++------
- examples/quine.js           |    2 +-
- examples/vte-test.js        |    2 +-
- tools/jslint.js             |    1 +
+ examples/accelgroup.js      |  2 +-
+ examples/actions.js         |  2 +-
+ examples/async-quine.js     |  4 ++--
+ examples/calculator.js      |  7 +++----
+ examples/clutter-cogl.js    | 14 +++++++-------
+ examples/clutter.js         |  8 ++++----
+ examples/gdkpixbufloader.js |  3 ++-
+ examples/gtkplug.js         |  2 +-
+ examples/n-oscillator.js    | 23 ++++++++++++-----------
+ examples/poppler.js         | 18 ++++++++++++------
+ examples/quine.js           |  2 +-
+ examples/vte-test.js        |  2 +-
+ tools/jslint.js             |  1 +
  13 files changed, 48 insertions(+), 40 deletions(-)
 
 commit 08105e580b708e067b005ba7678eb0c44e33f390
@@ -14810,8 +16174,8 @@ Date:   Sun Jan 25 09:15:01 2009 +0000
     
     svn path=/trunk/; revision=803
 
- examples/accelgroup.js |    2 +-
- tools/jslint.js        |   16 +++++++++++++++-
+ examples/accelgroup.js |  2 +-
+ tools/jslint.js        | 16 +++++++++++++++-
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 commit d029674a6a6f98af7ac613e9f5d0176d25cc952b
@@ -14822,7 +16186,7 @@ Date:   Sun Jan 25 09:05:10 2009 +0000
     
     svn path=/trunk/; revision=802
 
- tests/javascript/native-closure-exception.js |    2 +-
+ tests/javascript/native-closure-exception.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d1f0724950e963ac2ae08ff7638103411c9514d0
@@ -14834,22 +16198,22 @@ Date:   Sun Jan 25 09:03:51 2009 +0000
     
     svn path=/trunk/; revision=801
 
- doc/reference/seed-docs.sgml                 |    2 +-
- tests/javascript/closure-finalization.js     |    4 ++--
- tests/javascript/function-info.js            |    2 +-
- tests/javascript/gerror.js                   |    4 +++-
- tests/javascript/gtype-signal-args.js        |    4 ++--
- tests/javascript/gtype-signal.js             |    4 ++--
- tests/javascript/gtype.js                    |   19 +++++++++----------
- tests/javascript/namespace-exception-test.js |    7 ++-----
- tests/javascript/native-closure-exception.js |    5 +++--
- tests/javascript/native-closure.js           |    5 +++--
- tests/javascript/out-test.js                 |    8 +++++---
- tests/javascript/sqlite.js                   |    7 +++++--
- tests/javascript/struct-union-enumerate.js   |    4 ++--
- tests/javascript/type-conversion.js          |    4 ++--
- tools/jslint.js                              |    2 +-
- tools/run-lint.js                            |   13 ++++++++-----
+ doc/reference/seed-docs.sgml                 |  2 +-
+ tests/javascript/closure-finalization.js     |  4 ++--
+ tests/javascript/function-info.js            |  2 +-
+ tests/javascript/gerror.js                   |  4 +++-
+ tests/javascript/gtype-signal-args.js        |  4 ++--
+ tests/javascript/gtype-signal.js             |  4 ++--
+ tests/javascript/gtype.js                    | 19 +++++++++----------
+ tests/javascript/namespace-exception-test.js |  7 ++-----
+ tests/javascript/native-closure-exception.js |  5 +++--
+ tests/javascript/native-closure.js           |  5 +++--
+ tests/javascript/out-test.js                 |  8 +++++---
+ tests/javascript/sqlite.js                   |  7 +++++--
+ tests/javascript/struct-union-enumerate.js   |  4 ++--
+ tests/javascript/type-conversion.js          |  4 ++--
+ tools/jslint.js                              |  2 +-
+ tools/run-lint.js                            | 13 ++++++++-----
  16 files changed, 51 insertions(+), 43 deletions(-)
 
 commit 28e2f4b5a4ff54b41a050151db7b59542776766d
@@ -14860,8 +16224,8 @@ Date:   Sun Jan 25 08:32:37 2009 +0000
     
     svn path=/trunk/; revision=800
 
- tools/jslint.js   |   13 ++++++++-----
- tools/run-lint.js |   29 +++++++++++++++++++++--------
+ tools/jslint.js   | 13 ++++++++-----
+ tools/run-lint.js | 29 +++++++++++++++++++++--------
  2 files changed, 29 insertions(+), 13 deletions(-)
 
 commit 2fb87cd53851a5911232a08ed2eae49cd157173e
@@ -14887,7 +16251,7 @@ Date:   Sun Jan 25 06:54:45 2009 +0000
     
     svn path=/trunk/; revision=798
 
- tests/javascript/struct-union-enumerate.js |    4 ++++
+ tests/javascript/struct-union-enumerate.js | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 53fa1e5748714c7eb80b573c9a2cd09f7ae3d797
@@ -14898,7 +16262,7 @@ Date:   Sat Jan 24 07:26:26 2009 +0000
     
     svn path=/trunk/; revision=797
 
- opengl-glib/Makefile.am |    2 ++
+ opengl-glib/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 854792aadc904de5d467aae2df4394e76d3083d3
@@ -14909,7 +16273,7 @@ Date:   Sat Jan 24 05:07:48 2009 +0000
     
     svn path=/trunk/; revision=796
 
- doc/runtime.html.in |   13 +++++++++++++
+ doc/runtime.html.in | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit daebaab56ab46b671ef6741a296f07841d6db88d
@@ -14920,7 +16284,7 @@ Date:   Sat Jan 24 04:41:10 2009 +0000
     
     svn path=/trunk/; revision=795
 
- opengl-glib/GLTypes-1.0.gir |    5 ++++-
+ opengl-glib/GLTypes-1.0.gir | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 042f978212e1bddb697554fd1f1f9216dfc28fff
@@ -14931,7 +16295,7 @@ Date:   Sat Jan 24 04:34:02 2009 +0000
     
     svn path=/trunk/; revision=794
 
- opengl-glib/GLTypes-1.0.gir |    1 +
+ opengl-glib/GLTypes-1.0.gir | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1603397a4fc2b7422951e7812fdeec1c19d2dea5
@@ -14943,9 +16307,9 @@ Date:   Thu Jan 22 06:28:09 2009 +0000
     
     svn path=/trunk/; revision=793
 
- config.h.in             |    4 ++--
- configure.ac            |   18 ++++++++++++++++--
- opengl-glib/Makefile.am |    6 ++++--
+ config.h.in             |  4 ++--
+ configure.ac            | 18 ++++++++++++++++--
+ opengl-glib/Makefile.am |  6 ++++--
  3 files changed, 22 insertions(+), 6 deletions(-)
 
 commit 98a1fb3b4b260d9eb0ee3f8aefd4112885e01704
@@ -14956,8 +16320,8 @@ Date:   Thu Jan 22 06:09:44 2009 +0000
     
     svn path=/trunk/; revision=792
 
- config.h.in  |    4 ++--
- configure.ac |   19 +++++++++++--------
+ config.h.in  |  4 ++--
+ configure.ac | 19 +++++++++++--------
  2 files changed, 13 insertions(+), 10 deletions(-)
 
 commit 80d6e089b998cebe211e5fd266a700ac2644513a
@@ -14969,7 +16333,7 @@ Date:   Thu Jan 22 05:31:45 2009 +0000
     
     svn path=/trunk/; revision=791
 
- configure.ac |   16 ++++++++--------
+ configure.ac | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit 8aa3f7ff569a55f1309d3efafe14048ff9b2c556
@@ -14980,9 +16344,9 @@ Date:   Wed Jan 21 03:15:51 2009 +0000
     
     svn path=/trunk/; revision=790
 
- examples/opengl/glut-teapot.js    |    2 +-
- examples/opengl/seed-gears.js     |    2 +-
- examples/opengl/triangle-actor.js |    2 +-
+ examples/opengl/glut-teapot.js    | 2 +-
+ examples/opengl/seed-gears.js     | 2 +-
+ examples/opengl/triangle-actor.js | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 64dde3d62ed1b0d60cd6296125f33a341626400e
@@ -14993,8 +16357,8 @@ Date:   Wed Jan 21 02:39:55 2009 +0000
     
     svn path=/trunk/; revision=789
 
- examples/twitter/twitter.js |   47 ++++++++++++++++++++++++-------------------
- libseed/seed-closure.c      |    2 ++
+ examples/twitter/twitter.js | 47 +++++++++++++++++++++++++--------------------
+ libseed/seed-closure.c      |  2 ++
  2 files changed, 28 insertions(+), 21 deletions(-)
 
 commit 450b7453a0ca59b3a76d78fe5bf5557e31347148
@@ -15005,7 +16369,7 @@ Date:   Wed Jan 21 02:26:41 2009 +0000
     
     svn path=/trunk/; revision=788
 
- examples/twitter/twitter.js |   35 +++++++++++++++++++++++++++++++++--
+ examples/twitter/twitter.js | 35 +++++++++++++++++++++++++++++++++--
  1 file changed, 33 insertions(+), 2 deletions(-)
 
 commit 0f70c22abbf80d0ae655fd73fc4223fda63c57de
@@ -15016,7 +16380,7 @@ Date:   Wed Jan 21 02:26:31 2009 +0000
     
     svn path=/trunk/; revision=787
 
- opengl-glib/Makefile.am |    2 +-
+ opengl-glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 02396b746524b884f41c99ef39903245618e5066
@@ -15028,10 +16392,10 @@ Date:   Wed Jan 21 02:19:18 2009 +0000
     
     svn path=/trunk/; revision=786
 
- examples/browser/BrowserStatusbar.js |   10 ----------
- examples/browser/BrowserToolbar.js   |    6 ++++++
- examples/browser/BrowserView.js      |    8 ++------
- examples/browser/main.js             |    9 +++++++++
+ examples/browser/BrowserStatusbar.js | 10 ----------
+ examples/browser/BrowserToolbar.js   |  6 ++++++
+ examples/browser/BrowserView.js      |  8 ++------
+ examples/browser/main.js             |  9 +++++++++
  4 files changed, 17 insertions(+), 16 deletions(-)
 
 commit 21f0422e0467d45eca0b712f548fd09ca1a2f6a4
@@ -15042,8 +16406,8 @@ Date:   Tue Jan 20 23:25:51 2009 +0000
     
     svn path=/trunk/; revision=785
 
- examples/gdkpixbufloader.js |    1 +
- examples/twitter/twitter.js |    2 --
+ examples/gdkpixbufloader.js | 1 +
+ examples/twitter/twitter.js | 2 --
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 commit 8176518d07d83d99cdbe33e0b638eebd3a916a2f
@@ -15054,8 +16418,8 @@ Date:   Tue Jan 20 22:37:09 2009 +0000
     
     svn path=/trunk/; revision=784
 
- examples/Makefile.am        |    2 ++
- examples/gdkpixbufloader.js |   33 +++++++++++++++++++++++++++++++++
+ examples/Makefile.am        |  2 ++
+ examples/gdkpixbufloader.js | 33 +++++++++++++++++++++++++++++++++
  2 files changed, 35 insertions(+)
 
 commit 24636958e0d684ae9c9957a7fcd85cd04aefa25d
@@ -15066,7 +16430,7 @@ Date:   Tue Jan 20 20:49:46 2009 +0000
     
     svn path=/trunk/; revision=783
 
- examples/twitter/Makefile.am |   10 ++++++++++
+ examples/twitter/Makefile.am | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit b9af715325e6b63ec184c9a9eea519ef6b9fc1e4
@@ -15077,7 +16441,7 @@ Date:   Tue Jan 20 20:15:46 2009 +0000
     
     svn path=/trunk/; revision=782
 
- examples/opengl/seed-gears.js |    6 +++---
+ examples/opengl/seed-gears.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit d1e30c1ec50cfa6520aba5b9272b2184724e0a7a
@@ -15088,7 +16452,7 @@ Date:   Tue Jan 20 20:13:26 2009 +0000
     
     svn path=/trunk/; revision=781
 
- examples/opengl/seed-gears.js |   16 ++++++++--------
+ examples/opengl/seed-gears.js | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit 336522af5e45b8baae32dc362191ef373f036816
@@ -15099,8 +16463,8 @@ Date:   Tue Jan 20 19:56:29 2009 +0000
     
     svn path=/trunk/; revision=780
 
- examples/opengl/Makefile.am   |    5 +-
- examples/opengl/seed-gears.js |  232 +++++++++++++++++++++++++++++++++++++++++
+ examples/opengl/Makefile.am   |   5 +-
+ examples/opengl/seed-gears.js | 232 ++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 235 insertions(+), 2 deletions(-)
 
 commit ece29c6c5c472cad8f6c27a46f6ae6de224ed365
@@ -15111,7 +16475,7 @@ Date:   Tue Jan 20 19:29:00 2009 +0000
     
     svn path=/trunk/; revision=779
 
- opengl-glib/GLU-1.0.gir |   12 +++++++++---
+ opengl-glib/GLU-1.0.gir | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit 2c1d7c4c3b53336ebfb81c6da67ed08b6abab9e7
@@ -15134,7 +16498,7 @@ Date:   Tue Jan 20 18:54:55 2009 +0000
     
     svn path=/trunk/; revision=777
 
- opengl-glib/Makefile.am |    2 +-
+ opengl-glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e7716bc111bc6d3a86792a0ca85c1113b03b8b14
@@ -15145,10 +16509,10 @@ Date:   Tue Jan 20 18:52:32 2009 +0000
     
     svn path=/trunk/; revision=776
 
- configure.ac                |    1 +
- examples/Makefile.am        |    1 +
- examples/twitter/pretty.js  |   36 +++++++++++++++
- examples/twitter/twitter.js |  101 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac                |   1 +
+ examples/Makefile.am        |   1 +
+ examples/twitter/pretty.js  |  36 ++++++++++++++++
+ examples/twitter/twitter.js | 101 ++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 139 insertions(+)
 
 commit c8fc42141a1db727869242cca15547779b9563ad
@@ -15159,8 +16523,8 @@ Date:   Tue Jan 20 18:33:57 2009 +0000
     
     svn path=/trunk/; revision=775
 
- examples/Makefile.am    |    2 ++
- examples/async-quine.js |   19 +++++++++++++++++++
+ examples/Makefile.am    |  2 ++
+ examples/async-quine.js | 19 +++++++++++++++++++
  2 files changed, 21 insertions(+)
 
 commit 746a6fda68d41acf83d1771ce9b1325bb294107b
@@ -15171,7 +16535,7 @@ Date:   Mon Jan 19 21:12:54 2009 +0000
     
     svn path=/trunk/; revision=774
 
- examples/browser/Makefile.am |    2 ++
+ examples/browser/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 08804c861e01b38737faee7eabf706e168d26edb
@@ -15182,11 +16546,11 @@ Date:   Mon Jan 19 21:08:57 2009 +0000
     
     svn path=/trunk/; revision=773
 
- configure.ac                      |    1 +
- examples/Makefile.am              |    1 +
- examples/opengl/Makefile.am       |   10 +++++++
- examples/opengl/glut-teapot.js    |   53 +++++++++++++++++++++++++++++++++++++
- examples/opengl/triangle-actor.js |   36 +++++++++++++++++++++++++
+ configure.ac                      |  1 +
+ examples/Makefile.am              |  1 +
+ examples/opengl/Makefile.am       | 10 ++++++++
+ examples/opengl/glut-teapot.js    | 53 +++++++++++++++++++++++++++++++++++++++
+ examples/opengl/triangle-actor.js | 36 ++++++++++++++++++++++++++
  5 files changed, 101 insertions(+)
 
 commit 07a8d245a36ab3d6c51d310ed8f394a56674865f
@@ -15197,7 +16561,7 @@ Date:   Mon Jan 19 21:07:58 2009 +0000
     
     svn path=/trunk/; revision=772
 
- modules/readline/Makefile.am |    4 ++--
+ modules/readline/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 399856d1499739483763f51cd39a32f0c6b4cf53
@@ -15225,7 +16589,7 @@ Date:   Mon Jan 19 16:43:04 2009 +0000
     
     svn path=/trunk/; revision=770
 
- libseed/seed-types.c |   32 ++++++++++++++++++++++++++++----
+ libseed/seed-types.c | 32 ++++++++++++++++++++++++++++----
  1 file changed, 28 insertions(+), 4 deletions(-)
 
 commit ad748ed9b3891a1f817a5454067812065d6154e2
@@ -15236,7 +16600,7 @@ Date:   Mon Jan 19 16:35:44 2009 +0000
     
     svn path=/trunk/; revision=769
 
- libseed/seed-types.c |   15 +++++++++------
+ libseed/seed-types.c | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 commit 5e057df2da37d6887bccbc61140dd6b8b179b1a2
@@ -15247,7 +16611,7 @@ Date:   Mon Jan 19 09:43:55 2009 +0000
     
     svn path=/trunk/; revision=768
 
- examples/browser/BrowserStatusbar.js |    8 ++++----
+ examples/browser/BrowserStatusbar.js | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 5c19464537eb9f569b201813702a4d2668cebd8c
@@ -15258,12 +16622,12 @@ Date:   Mon Jan 19 09:24:59 2009 +0000
     
     svn path=/trunk/; revision=767
 
- examples/browser/BrowserSettings.js  |    1 +
- examples/browser/BrowserStatusbar.js |   28 ++++++++++++++++++++++++++++
- examples/browser/BrowserTab.js       |    9 +++++++++
- examples/browser/BrowserView.js      |   34 ++++++++++++++++++++++++++++++++--
- examples/browser/TabbedBrowser.js    |   12 +++++-------
- examples/browser/main.js             |    1 +
+ examples/browser/BrowserSettings.js  |  1 +
+ examples/browser/BrowserStatusbar.js | 28 ++++++++++++++++++++++++++++
+ examples/browser/BrowserTab.js       |  9 +++++++++
+ examples/browser/BrowserView.js      | 34 ++++++++++++++++++++++++++++++++--
+ examples/browser/TabbedBrowser.js    | 12 +++++-------
+ examples/browser/main.js             |  1 +
  6 files changed, 76 insertions(+), 9 deletions(-)
 
 commit 4514de67e56f25f00b81c40687625d7c5dea919f
@@ -15275,9 +16639,9 @@ Date:   Mon Jan 19 08:38:46 2009 +0000
     
     svn path=/trunk/; revision=766
 
- examples/browser/BrowserTab.js    |   36 +++++++++++++++++-------------------
- examples/browser/BrowserView.js   |   19 +++++++------------
- examples/browser/TabbedBrowser.js |    7 ++++---
+ examples/browser/BrowserTab.js    | 36 +++++++++++++++++-------------------
+ examples/browser/BrowserView.js   | 19 +++++++------------
+ examples/browser/TabbedBrowser.js |  7 ++++---
  3 files changed, 28 insertions(+), 34 deletions(-)
 
 commit 938e5f1e45cc8ca643bb6f0812d7159133302f2f
@@ -15288,7 +16652,7 @@ Date:   Mon Jan 19 04:59:36 2009 +0000
     
     svn path=/trunk/; revision=765
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit aed1e08bf8be16d8a39693e003524d0d99aaae5e
@@ -15299,7 +16663,7 @@ Date:   Mon Jan 19 00:33:15 2009 +0000
     
     svn path=/trunk/; revision=764
 
- libseed/Makefile.am |    5 ++---
+ libseed/Makefile.am | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit aa37ad7a9922d01c163c0ed7054c567d38a1532c
@@ -15310,7 +16674,7 @@ Date:   Sun Jan 18 20:55:42 2009 +0000
     
     svn path=/trunk/; revision=763
 
- libseed/Makefile.am |    5 +++--
+ libseed/Makefile.am | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 98f897f23c057170b3b179432b95769343cea359
@@ -15321,7 +16685,7 @@ Date:   Sun Jan 18 20:23:32 2009 +0000
     
     svn path=/trunk/; revision=762
 
- libseed/seed-types.c |   23 +++++++++++++++++++++--
+ libseed/seed-types.c | 23 +++++++++++++++++++++--
  1 file changed, 21 insertions(+), 2 deletions(-)
 
 commit 2213021a23c545d9e3c50333505e3ce6a177600e
@@ -15332,7 +16696,7 @@ Date:   Sun Jan 18 20:22:08 2009 +0000
     
     svn path=/trunk/; revision=761
 
- examples/clutter-shader/main.js |    2 +-
+ examples/clutter-shader/main.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c2d6a40e978263fc99c262ef558618a9d3c028b3
@@ -15343,7 +16707,7 @@ Date:   Sun Jan 18 04:46:32 2009 +0000
     
     svn path=/trunk/; revision=760
 
- examples/pong/pong.js |  103 ++++++++++++++++++++++++++++++++++++++++++++-----
+ examples/pong/pong.js | 103 +++++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 94 insertions(+), 9 deletions(-)
 
 commit 3dde79645a0ece4a2181e82bfa03ce5f95e3f647
@@ -15354,8 +16718,8 @@ Date:   Sun Jan 18 04:15:33 2009 +0000
     
     svn path=/trunk/; revision=759
 
- examples/pong/midline.png |  Bin 779 -> 4741 bytes
- examples/pong/pong.js     |  109 ++++++++++++++++++++++++++++-----------------
+ examples/pong/midline.png | Bin 779 -> 4741 bytes
+ examples/pong/pong.js     | 109 ++++++++++++++++++++++++++++------------------
  2 files changed, 67 insertions(+), 42 deletions(-)
 
 commit 0f105450045cbc870e93df96e81b1f6ef7374b61
@@ -15367,12 +16731,12 @@ Date:   Sun Jan 18 03:33:18 2009 +0000
     
     svn path=/trunk/; revision=758
 
- examples/pong.js          |  223 -------------------------------------------
- examples/pong/ball.png    |  Bin 0 -> 1570 bytes
- examples/pong/midline.png |  Bin 0 -> 779 bytes
- examples/pong/player.png  |  Bin 0 -> 1671 bytes
- examples/pong/player2.png |  Bin 0 -> 1491 bytes
- examples/pong/pong.js     |  230 +++++++++++++++++++++++++++++++++++++++++++++
+ examples/pong.js          | 223 --------------------------------------------
+ examples/pong/ball.png    | Bin 0 -> 1570 bytes
+ examples/pong/midline.png | Bin 0 -> 779 bytes
+ examples/pong/player.png  | Bin 0 -> 1671 bytes
+ examples/pong/player2.png | Bin 0 -> 1491 bytes
+ examples/pong/pong.js     | 230 ++++++++++++++++++++++++++++++++++++++++++++++
  6 files changed, 230 insertions(+), 223 deletions(-)
 
 commit 46503837e0184709757a87bf00892e7a7839d35c
@@ -15383,7 +16747,7 @@ Date:   Sun Jan 18 02:45:07 2009 +0000
     
     svn path=/trunk/; revision=757
 
- examples/pong.js |  225 +++++++++++++++++++++++++++++++-----------------------
+ examples/pong.js | 225 ++++++++++++++++++++++++++++++++-----------------------
  1 file changed, 130 insertions(+), 95 deletions(-)
 
 commit 8ae71288b45d3114266c0d8aaa72899b098dd987
@@ -15395,11 +16759,11 @@ Date:   Sun Jan 18 00:57:13 2009 +0000
     
     svn path=/trunk/; revision=756
 
- examples/accelgroup.js    |    3 ++-
- examples/actions.js       |    2 +-
- examples/clutter-cairo.js |    5 +++--
- examples/clutter-cogl.js  |   38 +++++++++++++++-----------------------
- examples/clutter.js       |    7 ++++---
+ examples/accelgroup.js    |  3 ++-
+ examples/actions.js       |  2 +-
+ examples/clutter-cairo.js |  5 +++--
+ examples/clutter-cogl.js  | 38 +++++++++++++++-----------------------
+ examples/clutter.js       |  7 ++++---
  5 files changed, 25 insertions(+), 30 deletions(-)
 
 commit e60e9ab2e2ed6855e087e8fdd4c921378dbee022
@@ -15411,7 +16775,7 @@ Date:   Sat Jan 17 07:09:47 2009 +0000
     
     svn path=/trunk/; revision=755
 
- examples/pong.js |  188 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/pong.js | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 188 insertions(+)
 
 commit a54fc08a9351988880f7d56c7a3929cbdcb22154
@@ -15422,11 +16786,11 @@ Date:   Thu Jan 15 23:03:56 2009 +0000
     
     svn path=/trunk/; revision=754
 
- configure.ac                                 |    8 ++++++
- examples/broken/browser/browser-bookmarks.js |    2 +-
- examples/broken/browser/browser-find.js      |    4 +--
- examples/broken/browser/browser-main.js      |    2 +-
- examples/broken/browser/browser-tab.js       |   34 +++++++++-----------------
+ configure.ac                                 |  8 +++++++
+ examples/broken/browser/browser-bookmarks.js |  2 +-
+ examples/broken/browser/browser-find.js      |  4 ++--
+ examples/broken/browser/browser-main.js      |  2 +-
+ examples/broken/browser/browser-tab.js       | 34 +++++++++-------------------
  5 files changed, 23 insertions(+), 27 deletions(-)
 
 commit 8d394a5ea13683ce201093408d34cf8081966107
@@ -15438,7 +16802,7 @@ Date:   Thu Jan 15 04:10:34 2009 +0000
     
     svn path=/trunk/; revision=753
 
- libseed/seed-gtype.c |   18 +++++++-----------
+ libseed/seed-gtype.c | 18 +++++++-----------
  1 file changed, 7 insertions(+), 11 deletions(-)
 
 commit 562c16f175a90cb646983939b51e9e487685e4ba
@@ -15449,10 +16813,10 @@ Date:   Thu Jan 15 01:06:22 2009 +0000
     
     svn path=/trunk/; revision=752
 
- examples/browser/BrowserTab.js    |    5 ++++-
- examples/browser/BrowserView.js   |    4 ----
- examples/browser/TabbedBrowser.js |    6 ++++--
- examples/browser/main.js          |    2 +-
+ examples/browser/BrowserTab.js    | 5 ++++-
+ examples/browser/BrowserView.js   | 4 ----
+ examples/browser/TabbedBrowser.js | 6 ++++--
+ examples/browser/main.js          | 2 +-
  4 files changed, 9 insertions(+), 8 deletions(-)
 
 commit 07119eeff05eb224ca841fca3fbdfd54f0a19a07
@@ -15463,10 +16827,10 @@ Date:   Thu Jan 15 00:33:15 2009 +0000
     
     svn path=/trunk/; revision=751
 
- examples/browser/BrowserTab.js    |   30 +++++++++++++++++++++++++-----
- examples/browser/BrowserView.js   |   30 +++++++++++++++++++++++++++---
- examples/browser/Makefile.am      |   14 ++++++++++++--
- examples/browser/TabbedBrowser.js |   13 ++++++++++---
+ examples/browser/BrowserTab.js    | 30 +++++++++++++++++++++++++-----
+ examples/browser/BrowserView.js   | 30 +++++++++++++++++++++++++++---
+ examples/browser/Makefile.am      | 14 ++++++++++++--
+ examples/browser/TabbedBrowser.js | 13 ++++++++++---
  4 files changed, 74 insertions(+), 13 deletions(-)
 
 commit 1104483ab9ce4392b5e3d93aed0785e12bade467
@@ -15477,13 +16841,13 @@ Date:   Wed Jan 14 23:03:06 2009 +0000
     
     svn path=/trunk/; revision=750
 
- examples/browser/BrowserSettings.js |    1 +
- examples/browser/BrowserTab.js      |   45 +++++++
- examples/browser/BrowserToolbar.js  |   60 ++++++++++
- examples/browser/BrowserView.js     |   50 ++++++++
- examples/browser/TabbedBrowser.js   |   47 ++++++++
- examples/browser/browser.js         |  223 -----------------------------------
- examples/browser/main.js            |  119 ++-----------------
+ examples/browser/BrowserSettings.js |   1 +
+ examples/browser/BrowserTab.js      |  45 ++++++++
+ examples/browser/BrowserToolbar.js  |  60 ++++++++++
+ examples/browser/BrowserView.js     |  50 ++++++++
+ examples/browser/TabbedBrowser.js   |  47 ++++++++
+ examples/browser/browser.js         | 223 ------------------------------------
+ examples/browser/main.js            | 119 ++-----------------
  7 files changed, 214 insertions(+), 331 deletions(-)
 
 commit 4ce906b79545727014196fb74a539c777b7a04f8
@@ -15494,7 +16858,7 @@ Date:   Wed Jan 14 21:43:19 2009 +0000
     
     svn path=/trunk/; revision=749
 
- libseed/seed-types.c |    7 ++++++-
+ libseed/seed-types.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 8e8565fa0cd43a2a7d6676166984753ac7e06d38
@@ -15505,7 +16869,7 @@ Date:   Wed Jan 14 21:37:34 2009 +0000
     
     svn path=/trunk/; revision=748
 
- INSTALL.osx |    4 ++++
+ INSTALL.osx | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit b00ed356174f278bbe07a1c0112ccb87277782ce
@@ -15516,7 +16880,7 @@ Date:   Wed Jan 14 21:35:27 2009 +0000
     
     svn path=/trunk/; revision=747
 
- INSTALL.osx |   35 +++++++++++++++++++++++++++++++----
+ INSTALL.osx | 35 +++++++++++++++++++++++++++++++----
  1 file changed, 31 insertions(+), 4 deletions(-)
 
 commit e7c09f6d69896e1747aee049e5e458abdf794c1f
@@ -15527,7 +16891,7 @@ Date:   Wed Jan 14 21:25:59 2009 +0000
     
     svn path=/trunk/; revision=746
 
- tests/c/Makefile.am |    3 +++
+ tests/c/Makefile.am | 3 +++
  1 file changed, 3 insertions(+)
 
 commit e65a64b72f603c8cf0bb810599a3a1e151531e62
@@ -15538,7 +16902,7 @@ Date:   Wed Jan 14 21:20:46 2009 +0000
     
     svn path=/trunk/; revision=745
 
- tests/javascript/struct-offsets.js |    2 +-
+ tests/javascript/struct-offsets.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit de266cfd088544b86f67c4bdbb25d9217389d86b
@@ -15549,7 +16913,7 @@ Date:   Wed Jan 14 21:19:47 2009 +0000
     
     svn path=/trunk/; revision=744
 
- examples/vte-test.js |    4 ++--
+ examples/vte-test.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 24e3e2574b17e462b01859088d92d1d7be6dfe10
@@ -15560,17 +16924,17 @@ Date:   Wed Jan 14 21:15:56 2009 +0000
     
     svn path=/trunk/; revision=743
 
- doc/tutorial-standalone/1.js                   |    2 +-
- doc/tutorial-standalone/2.js                   |    6 +++---
- doc/tutorial-standalone/3.js                   |    8 ++++----
- doc/tutorial-standalone/tutorial.html.in       |   14 +++++++-------
- examples/browser/browser.js                    |    8 ++++----
- libseed/seed-gtype.c                           |    2 +-
- tests/javascript/gtype-class-init-exception.js |    2 +-
- tests/javascript/gtype-property.js             |    2 +-
- tests/javascript/gtype-signal-exception.js     |    2 +-
- tests/javascript/gtype-signal.js               |    2 +-
- tests/javascript/gtype.js                      |    2 +-
+ doc/tutorial-standalone/1.js                   |  2 +-
+ doc/tutorial-standalone/2.js                   |  6 +++---
+ doc/tutorial-standalone/3.js                   |  8 ++++----
+ doc/tutorial-standalone/tutorial.html.in       | 14 +++++++-------
+ examples/browser/browser.js                    |  8 ++++----
+ libseed/seed-gtype.c                           |  2 +-
+ tests/javascript/gtype-class-init-exception.js |  2 +-
+ tests/javascript/gtype-property.js             |  2 +-
+ tests/javascript/gtype-signal-exception.js     |  2 +-
+ tests/javascript/gtype-signal.js               |  2 +-
+ tests/javascript/gtype.js                      |  2 +-
  11 files changed, 25 insertions(+), 25 deletions(-)
 
 commit 893a184f418b4565a437ca09f8ffe26f83baaeca
@@ -15582,10 +16946,10 @@ Date:   Wed Jan 14 21:05:41 2009 +0000
     
     svn path=/trunk/; revision=742
 
- doc/tutorial-standalone/2.js             |    4 ++--
- doc/tutorial-standalone/3.js             |    8 ++++----
- doc/tutorial-standalone/tutorial.html.in |    4 ++--
- examples/browser/browser.js              |    8 ++++----
+ doc/tutorial-standalone/2.js             | 4 ++--
+ doc/tutorial-standalone/3.js             | 8 ++++----
+ doc/tutorial-standalone/tutorial.html.in | 4 ++--
+ examples/browser/browser.js              | 8 ++++----
  4 files changed, 12 insertions(+), 12 deletions(-)
 
 commit c2688501ca53ebbb7f10947d61f0a874e867ac8f
@@ -15597,8 +16961,8 @@ Date:   Wed Jan 14 21:01:51 2009 +0000
     
     svn path=/trunk/; revision=741
 
- examples/soup.js      |    3 ++-
- libseed/seed-engine.c |    2 +-
+ examples/soup.js      | 3 ++-
+ libseed/seed-engine.c | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 274c341fe84c8720876a0b594de7583b0ca49991
@@ -15609,7 +16973,7 @@ Date:   Wed Jan 14 20:58:41 2009 +0000
     
     svn path=/trunk/; revision=740
 
- examples/browser/Makefile.am |   20 ++------------------
+ examples/browser/Makefile.am | 20 ++------------------
  1 file changed, 2 insertions(+), 18 deletions(-)
 
 commit eb1284ac3b6eab9a0afdc4cccb578c0f56f3ce25
@@ -15620,8 +16984,8 @@ Date:   Wed Jan 14 20:57:00 2009 +0000
     
     svn path=/trunk/; revision=739
 
- examples/clutter-shader/ShaderView.js |    4 ++--
- examples/clutter-transitions/main.js  |    4 ++--
+ examples/clutter-shader/ShaderView.js | 4 ++--
+ examples/clutter-transitions/main.js  | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit d7fbcedafacdd6d000b648e0970f42519959269f
@@ -15632,17 +16996,17 @@ Date:   Wed Jan 14 20:56:35 2009 +0000
     
     svn path=/trunk/; revision=738
 
- examples/broken/browser/COPYING              |  339 +++++++++++++++++++++++++
- examples/broken/browser/Makefile.am          |   27 ++
- examples/broken/browser/browser-actions.js   |  347 ++++++++++++++++++++++++++
- examples/broken/browser/browser-bookmarks.js |   54 ++++
- examples/broken/browser/browser-find.js      |   39 +++
- examples/broken/browser/browser-main.js      |   24 ++
- examples/broken/browser/browser-menu.js      |  148 +++++++++++
- examples/broken/browser/browser-tab.js       |  160 ++++++++++++
- examples/broken/browser/browser-toolbar.js   |   25 ++
- examples/broken/browser/main.js              |  119 +++++++++
- examples/browser/browser.js                  |  223 +++++++++++++++++
+ examples/broken/browser/COPYING              | 339 ++++++++++++++++++++++++++
+ examples/broken/browser/Makefile.am          |  27 +++
+ examples/broken/browser/browser-actions.js   | 347 +++++++++++++++++++++++++++
+ examples/broken/browser/browser-bookmarks.js |  54 +++++
+ examples/broken/browser/browser-find.js      |  39 +++
+ examples/broken/browser/browser-main.js      |  24 ++
+ examples/broken/browser/browser-menu.js      | 148 ++++++++++++
+ examples/broken/browser/browser-tab.js       | 160 ++++++++++++
+ examples/broken/browser/browser-toolbar.js   |  25 ++
+ examples/broken/browser/main.js              | 119 +++++++++
+ examples/browser/browser.js                  | 223 +++++++++++++++++
  11 files changed, 1505 insertions(+)
 
 commit 3f0b6211aa5710e2e9ac7630fcde4f3903f8a91d
@@ -15653,8 +17017,8 @@ Date:   Wed Jan 14 20:53:01 2009 +0000
     
     svn path=/trunk/; revision=737
 
- examples/poppler.js |    8 ++++----
- examples/video.js   |    2 +-
+ examples/poppler.js | 8 ++++----
+ examples/video.js   | 2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 95011255fde16ee241810c602362d8cc2361337b
@@ -15665,10 +17029,10 @@ Date:   Wed Jan 14 20:48:52 2009 +0000
     
     svn path=/trunk/; revision=736
 
- examples/Gnio-server.js  |    4 ++--
- examples/clutter-cogl.js |    2 +-
- examples/json-packing.js |    4 ++--
- examples/n-oscillator.js |    4 ++--
+ examples/Gnio-server.js  | 4 ++--
+ examples/clutter-cogl.js | 2 +-
+ examples/json-packing.js | 4 ++--
+ examples/n-oscillator.js | 4 ++--
  4 files changed, 7 insertions(+), 7 deletions(-)
 
 commit 9a8378ec3a370e75b7c647e6f1e2d7e330f8a17b
@@ -15679,10 +17043,10 @@ Date:   Wed Jan 14 20:45:40 2009 +0000
     
     svn path=/trunk/; revision=735
 
- extensions/Gtk.js                     |    2 +-
- tests/javascript/enum.js              |    4 ++--
- tests/javascript/gtype-property.js    |    2 +-
- tests/javascript/struct-nested-set.js |    2 +-
+ extensions/Gtk.js                     | 2 +-
+ tests/javascript/enum.js              | 4 ++--
+ tests/javascript/gtype-property.js    | 2 +-
+ tests/javascript/struct-nested-set.js | 2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 9f8e5cebfad7d33b29405216b61734be1fbfb168
@@ -15693,7 +17057,7 @@ Date:   Wed Jan 14 20:43:03 2009 +0000
     
     svn path=/trunk/; revision=734
 
- libseed/seed-engine.c |    4 +---
+ libseed/seed-engine.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit d4982ea6205e03409e018fdba6c9e219d46fcdcd
@@ -15704,7 +17068,7 @@ Date:   Wed Jan 14 20:40:52 2009 +0000
     
     svn path=/trunk/; revision=733
 
- m4/gtk-doc.m4 |    1 -
+ m4/gtk-doc.m4 | 1 -
  1 file changed, 1 deletion(-)
 
 commit dbfdc8652601fac785f3ec59cb1dd6d1d0914c8f
@@ -15716,10 +17080,13 @@ Date:   Wed Jan 14 20:37:13 2009 +0000
     
     svn path=/trunk/; revision=732
 
- INSTALL       |    1 -
- ltmain.sh     | 7880 ---------------------------------------------------------
- mkinstalldirs |  111 -
- 3 files changed, 7992 deletions(-)
+ INSTALL             |    1 -
+ intltool-extract.in |    0
+ intltool-merge.in   |    0
+ intltool-update.in  |    0
+ ltmain.sh           | 7880 ---------------------------------------------------
+ mkinstalldirs       |  111 -
+ 6 files changed, 7992 deletions(-)
 
 commit 73992484499e0e4ef085c953fd64368027084534
 Author: Tim Horton <hortont@src.gnome.org>
@@ -15729,8 +17096,8 @@ Date:   Wed Jan 14 20:17:07 2009 +0000
     
     svn path=/trunk/; revision=731
 
- configure.ac  |    1 +
- m4/gtk-doc.m4 |    2 +-
+ configure.ac  | 1 +
+ m4/gtk-doc.m4 | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit d1b6904fdd1f49102d614107342e19bdf6194aa6
@@ -15741,8 +17108,8 @@ Date:   Wed Jan 14 20:14:11 2009 +0000
     
     svn path=/trunk/; revision=730
 
- examples/Makefile.am                     |    3 +--
- examples/clutter-transitions/Makefile.am |   15 +++++++++++++++
+ examples/Makefile.am                     |  3 +--
+ examples/clutter-transitions/Makefile.am | 15 +++++++++++++++
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 commit 7f0fd6fe455b761061076525c0a8ca9dca53a879
@@ -15753,8 +17120,8 @@ Date:   Wed Jan 14 20:12:36 2009 +0000
     
     svn path=/trunk/; revision=729
 
- libseed/seed-types.c |    3 +++
- m4/gtk-doc.m4        |    2 +-
+ libseed/seed-types.c | 3 +++
+ m4/gtk-doc.m4        | 2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 91df8bc1dfb3692435da859d8e8ede39dd8b8dbd
@@ -15765,13 +17132,13 @@ Date:   Wed Jan 14 20:07:57 2009 +0000
     
     svn path=/trunk/; revision=728
 
- Makefile.am                         |    7 ++-----
- configure.ac                        |    2 +-
- examples/Makefile.am                |    3 +++
- examples/browser/Makefile.am        |    3 +++
- examples/clutter-shader/Makefile.am |    3 +++
- examples/glib/Makefile.am           |    3 +++
- examples/turtle/Makefile.am         |    2 ++
+ Makefile.am                         | 7 ++-----
+ configure.ac                        | 2 +-
+ examples/Makefile.am                | 3 +++
+ examples/browser/Makefile.am        | 3 +++
+ examples/clutter-shader/Makefile.am | 3 +++
+ examples/glib/Makefile.am           | 3 +++
+ examples/turtle/Makefile.am         | 2 ++
  7 files changed, 17 insertions(+), 6 deletions(-)
 
 commit 0e482b58f10f3e873148c576af164d268c09f23c
@@ -15783,8 +17150,8 @@ Date:   Wed Jan 14 07:13:28 2009 +0000
     
     svn path=/trunk/; revision=727
 
- libseed/seed-builtins.c                     |    2 +-
- tests/javascript/builtin-argument-length.js |   11 +++++++++++
+ libseed/seed-builtins.c                     |  2 +-
+ tests/javascript/builtin-argument-length.js | 11 +++++++++++
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 4cd744975090036f3afbd1622777875bb31cf5da
@@ -15796,7 +17163,7 @@ Date:   Wed Jan 14 07:02:29 2009 +0000
     
     svn path=/trunk/; revision=726
 
- tests/javascript/gtype-signal-args.js |   33 +++++++++++++++++++++++++++++++++
+ tests/javascript/gtype-signal-args.js | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
 commit 01038fe9cdaf8a693bc6cb69808e04c50825ca67
@@ -15807,7 +17174,7 @@ Date:   Wed Jan 14 05:35:40 2009 +0000
     
     svn path=/trunk/; revision=725
 
- examples/turtle/Makefile.am |    6 +++---
+ examples/turtle/Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 0ef653f2f0042bea741250a20303b2df38901782
@@ -15819,22 +17186,22 @@ Date:   Wed Jan 14 05:10:40 2009 +0000
     
     svn path=/trunk/; revision=724
 
- libseed/indent.sh                |    8 +-
- libseed/seed-api.c               |    9 +-
- libseed/seed-builtins.c          |   22 +-
- libseed/seed-closure.c           |   14 +-
- libseed/seed-engine.c            |   86 ++---
- libseed/seed-gtype.c             |  141 +++----
- libseed/seed-signals.c           |   20 +-
- libseed/seed-structs.c           |   69 ++--
- libseed/seed-structs.h           |    6 +-
- libseed/seed-types.c             |  172 ++++-----
- libseed/seed-types.h             |    5 +-
- libseed/seed.h                   |   10 +-
- modules/Multiprocessing/multi.c  |  128 +++----
- modules/canvas/seed-canvas.c     |  770 +++++++++++++++++++-------------------
- modules/readline/seed-readline.c |   53 ++-
- modules/sqlite/seed-sqlite.c     |  106 +++---
+ libseed/indent.sh                |   8 +-
+ libseed/seed-api.c               |   9 +-
+ libseed/seed-builtins.c          |  22 +-
+ libseed/seed-closure.c           |  14 +-
+ libseed/seed-engine.c            |  86 +++--
+ libseed/seed-gtype.c             | 141 ++++---
+ libseed/seed-signals.c           |  20 +-
+ libseed/seed-structs.c           |  69 ++--
+ libseed/seed-structs.h           |   6 +-
+ libseed/seed-types.c             | 172 ++++-----
+ libseed/seed-types.h             |   5 +-
+ libseed/seed.h                   |  10 +-
+ modules/Multiprocessing/multi.c  | 128 +++----
+ modules/canvas/seed-canvas.c     | 770 ++++++++++++++++++++-------------------
+ modules/readline/seed-readline.c |  53 ++-
+ modules/sqlite/seed-sqlite.c     | 106 +++---
  16 files changed, 784 insertions(+), 835 deletions(-)
 
 commit 6a292aeca8573e5d0162bf92be42ecbb34a527e7
@@ -15846,7 +17213,7 @@ Date:   Wed Jan 14 04:54:45 2009 +0000
     
     svn path=/trunk/; revision=723
 
- configure.ac |   23 +++++++++++++++++------
+ configure.ac | 23 +++++++++++++++++------
  1 file changed, 17 insertions(+), 6 deletions(-)
 
 commit 06faf0220eaf65ac0c8c857156996d052f6b5ca1
@@ -15857,7 +17224,7 @@ Date:   Wed Jan 14 04:25:37 2009 +0000
     
     svn path=/trunk/; revision=722
 
- configure.ac |    6 +++---
+ configure.ac | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6eaa449c59adca7b759e7140d077964fa50eaad6
@@ -15868,7 +17235,7 @@ Date:   Wed Jan 14 04:20:33 2009 +0000
     
     svn path=/trunk/; revision=721
 
- configure.ac |    8 ++++++++
+ configure.ac | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 836514c57ad9feda216d3d5b8749351016b88204
@@ -15880,10 +17247,10 @@ Date:   Wed Jan 14 04:16:21 2009 +0000
     
     svn path=/trunk/; revision=720
 
- configure.ac                        |  161 ++++++++++++++++++++++-------------
- modules/Multiprocessing/Makefile.am |    4 +
- modules/example/Makefile.am         |    4 +
- modules/sqlite/Makefile.am          |    2 +-
+ configure.ac                        | 161 +++++++++++++++++++++++-------------
+ modules/Multiprocessing/Makefile.am |   4 +
+ modules/example/Makefile.am         |   4 +
+ modules/sqlite/Makefile.am          |   2 +-
  4 files changed, 113 insertions(+), 58 deletions(-)
 
 commit 59255eb73d6a8d7bcdcfdc05ca03e0430200d4f7
@@ -15894,8 +17261,8 @@ Date:   Wed Jan 14 03:22:26 2009 +0000
     
     svn path=/trunk/; revision=719
 
- INSTALL.osx |    4 ++++
- README      |    5 -----
+ INSTALL.osx | 4 ++++
+ README      | 5 -----
  2 files changed, 4 insertions(+), 5 deletions(-)
 
 commit e1b1a8eb63635c7f315f4d111b71dfef003bed2a
@@ -15906,7 +17273,7 @@ Date:   Wed Jan 14 03:18:27 2009 +0000
     
     svn path=/trunk/; revision=718
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 126040f7b6b0370a53c830f0348fbdd4b6a6c2cd
@@ -15917,7 +17284,7 @@ Date:   Tue Jan 13 21:23:59 2009 +0000
     
     svn path=/trunk/; revision=717
 
- configure.ac |    8 +++++++-
+ configure.ac | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 571467b157c6da2b4f3bd42748971fc42780268b
@@ -15928,7 +17295,7 @@ Date:   Tue Jan 13 04:47:58 2009 +0000
     
     svn path=/trunk/; revision=716
 
- README |    5 +++--
+ README | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 4efd1a892cbc2e8cd8eeabc90cbfcb433584861c
@@ -15939,8 +17306,8 @@ Date:   Tue Jan 13 04:45:39 2009 +0000
     
     svn path=/trunk/; revision=715
 
- config.h.in  |    3 +++
- configure.ac |    7 +++++--
+ config.h.in  | 3 +++
+ configure.ac | 7 +++++--
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 commit 66e0824ddf4714a417b9dcbaaa5826906a8c73b8
@@ -15951,10 +17318,10 @@ Date:   Mon Jan 12 00:41:53 2009 +0000
     
     svn path=/trunk/; revision=714
 
- config.h.in   |    4 +
- configure.ac  |   19 +-
- ltmain.sh     |12738 +++++++++++++++++++++++++++++++--------------------------
- m4/gtk-doc.m4 |    2 +-
+ config.h.in   |     4 +
+ configure.ac  |    19 +-
+ ltmain.sh     | 12738 ++++++++++++++++++++++++++++++--------------------------
+ m4/gtk-doc.m4 |     2 +-
  4 files changed, 6848 insertions(+), 5915 deletions(-)
 
 commit db215d4d8d061455af601b4882cbc04a0639323a
@@ -15965,8 +17332,8 @@ Date:   Mon Jan 12 00:26:55 2009 +0000
     
     svn path=/trunk/; revision=713
 
- configure.ac                |    8 ++++++++
- examples/turtle/Makefile.am |    4 ++++
+ configure.ac                | 8 ++++++++
+ examples/turtle/Makefile.am | 4 ++++
  2 files changed, 12 insertions(+)
 
 commit 620caae2f2028ec8c1ced7cfb9477ac0c24fbd00
@@ -15977,13 +17344,13 @@ Date:   Mon Jan 12 00:18:30 2009 +0000
     
     svn path=/trunk/; revision=712
 
- INSTALL                |    2 +-
- config.h.in            |    4 -
- libseed/Makefile.am    |    3 +-
- libseed/seed-closure.c |    2 +
- libseed/seed-closure.h |    2 +-
- ltmain.sh              |12698 ++++++++++++++++++++++--------------------------
- m4/gtk-doc.m4          |    2 +-
+ INSTALL                |     2 +-
+ config.h.in            |     4 -
+ libseed/Makefile.am    |     3 +-
+ libseed/seed-closure.c |     2 +
+ libseed/seed-closure.h |     2 +-
+ ltmain.sh              | 12698 ++++++++++++++++++++++-------------------------
+ m4/gtk-doc.m4          |     2 +-
  7 files changed, 5893 insertions(+), 6820 deletions(-)
 
 commit e744e9bb60312298d30bdd968525081bcbf254e4
@@ -15995,9 +17362,9 @@ Date:   Sun Jan 11 22:48:30 2009 +0000
     
     svn path=/trunk/; revision=711
 
- configure.ac          |   16 ++++++++++++++--
- libseed/Makefile.am   |   24 ++++++++----------------
- libseed/seed-engine.c |    2 +-
+ configure.ac          | 16 ++++++++++++++--
+ libseed/Makefile.am   | 24 ++++++++----------------
+ libseed/seed-engine.c |  2 +-
  3 files changed, 23 insertions(+), 19 deletions(-)
 
 commit 38f8e0c55ba02f0ad7b389d342298153ffecf92e
@@ -16008,9 +17375,9 @@ Date:   Sun Jan 11 20:54:15 2009 +0000
     
     svn path=/trunk/; revision=710
 
- README       |   27 +++++++++++++++++++++++++++
- README.in    |   27 ---------------------------
- configure.ac |    1 -
+ README       | 27 +++++++++++++++++++++++++++
+ README.in    | 27 ---------------------------
+ configure.ac |  1 -
  3 files changed, 27 insertions(+), 28 deletions(-)
 
 commit f70a3b03b979b38a4b48061502437fc3378d2442
@@ -16022,10 +17389,10 @@ Date:   Sun Jan 11 07:10:22 2009 +0000
     
     svn path=/trunk/; revision=709
 
- README       |   27 ---------------------------
- README.in    |   27 +++++++++++++++++++++++++++
- autogen.sh   |    8 ++++----
- configure.ac |    1 +
+ README       | 27 ---------------------------
+ README.in    | 27 +++++++++++++++++++++++++++
+ autogen.sh   |  8 ++++----
+ configure.ac |  1 +
  4 files changed, 32 insertions(+), 31 deletions(-)
 
 commit 131503f39289d5ca9bd316f1cf769170026dbe0f
@@ -16036,8 +17403,8 @@ Date:   Sun Jan 11 06:32:10 2009 +0000
     
     svn path=/trunk/; revision=708
 
- README     |    4 ++++
- autogen.sh |    5 +++--
+ README     | 4 ++++
+ autogen.sh | 5 +++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 83e37eb24beec26d54e29de3027765bbdd26c04c
@@ -16048,7 +17415,7 @@ Date:   Sat Jan 10 03:51:39 2009 +0000
     
     svn path=/trunk/; revision=707
 
- README |    2 +-
+ README | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e4f17114e3b1cc5deb395182df10ea16b0810a43
@@ -16059,7 +17426,7 @@ Date:   Sat Jan 10 03:30:57 2009 +0000
     
     svn path=/trunk/; revision=706
 
- README.in |   23 -----------------------
+ README.in | 23 -----------------------
  1 file changed, 23 deletions(-)
 
 commit 9b62a582ab2242c9d8121d169e47e1c416fed0bc
@@ -16071,8 +17438,8 @@ Date:   Sat Jan 10 03:26:39 2009 +0000
     
     svn path=/trunk/; revision=705
 
- README       |   23 +++++++++++++++++++++++
- configure.ac |    1 -
+ README       | 23 +++++++++++++++++++++++
+ configure.ac |  1 -
  2 files changed, 23 insertions(+), 1 deletion(-)
 
 commit bb8379dee1bdde0aa00bb609941e08aa649c9aa4
@@ -16084,7 +17451,7 @@ Date:   Sat Jan 10 03:16:14 2009 +0000
     
     svn path=/trunk/; revision=704
 
- configure.ac |   10 +++++++---
+ configure.ac | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 commit 3308c85b8e6275bb46c6989bb17b050300a6e620
@@ -16095,21 +17462,21 @@ Date:   Sat Jan 10 02:44:14 2009 +0000
     
     svn path=/trunk/; revision=703
 
- configure.ac                             |    9 +
- doc/conventions.html                     |   30 ---
- doc/conventions.html.in                  |   30 +++
- doc/modules/canvas.html                  |   34 ---
- doc/modules/canvas.html.in               |   34 +++
- doc/modules/multiprocessing.html         |   23 --
- doc/modules/multiprocessing.html.in      |   23 ++
- doc/modules/readline.html                |   41 ---
- doc/modules/readline.html.in             |   41 +++
- doc/modules/sqlite.html                  |   68 -----
- doc/modules/sqlite.html.in               |   68 +++++
- doc/runtime.html                         |  299 ----------------------
- doc/runtime.html.in                      |  299 ++++++++++++++++++++++
- doc/tutorial-standalone/tutorial.html    |  402 ------------------------------
- doc/tutorial-standalone/tutorial.html.in |  402 ++++++++++++++++++++++++++++++
+ configure.ac                             |   9 +
+ doc/conventions.html                     |  30 ---
+ doc/conventions.html.in                  |  30 +++
+ doc/modules/canvas.html                  |  34 ---
+ doc/modules/canvas.html.in               |  34 +++
+ doc/modules/multiprocessing.html         |  23 --
+ doc/modules/multiprocessing.html.in      |  23 ++
+ doc/modules/readline.html                |  41 ----
+ doc/modules/readline.html.in             |  41 ++++
+ doc/modules/sqlite.html                  |  68 ------
+ doc/modules/sqlite.html.in               |  68 ++++++
+ doc/runtime.html                         | 299 -----------------------
+ doc/runtime.html.in                      | 299 +++++++++++++++++++++++
+ doc/tutorial-standalone/tutorial.html    | 402 -------------------------------
+ doc/tutorial-standalone/tutorial.html.in | 402 +++++++++++++++++++++++++++++++
  15 files changed, 906 insertions(+), 897 deletions(-)
 
 commit 62fcb64a0ec5fe8aed6acc3f99e95e7d6c1f88a8
@@ -16120,11 +17487,11 @@ Date:   Sat Jan 10 02:36:10 2009 +0000
     
     svn path=/trunk/; revision=702
 
- Makefile.am  |    3 ---
- README       |   23 -----------------------
- README.in    |   23 +++++++++++++++++++++++
- configure.ac |    1 +
- ltmain.sh    |    4 ++--
+ Makefile.am  |  3 ---
+ README       | 23 -----------------------
+ README.in    | 23 +++++++++++++++++++++++
+ configure.ac |  1 +
+ ltmain.sh    |  4 ++--
  5 files changed, 26 insertions(+), 28 deletions(-)
 
 commit e9bdcfbb8a4b3662020b41ac86ce638a3428afb9
@@ -16135,7 +17502,7 @@ Date:   Fri Jan 9 23:28:33 2009 +0000
     
     svn path=/trunk/; revision=701
 
- tests/javascript/list-test.js |    3 ++-
+ tests/javascript/list-test.js | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 0f580d722664b4aaf7eb8a70c9d3c19f5ea75db6
@@ -16146,7 +17513,7 @@ Date:   Fri Jan 9 13:53:20 2009 +0000
     
     svn path=/trunk/; revision=700
 
- libseed/seed-engine.c |    2 ++
+ libseed/seed-engine.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 205819a35d8999383d28154c588b887a721f4253
@@ -16157,8 +17524,8 @@ Date:   Fri Jan 9 13:42:11 2009 +0000
     
     svn path=/trunk/; revision=699
 
- libseed/seed-builtins.c |    9 +++++++--
- ltmain.sh               |    4 ++--
+ libseed/seed-builtins.c | 9 +++++++--
+ ltmain.sh               | 4 ++--
  2 files changed, 9 insertions(+), 4 deletions(-)
 
 commit 9a2fe843832f27597a5b59e589df9e75e99e723b
@@ -16169,7 +17536,7 @@ Date:   Fri Jan 9 08:15:37 2009 +0000
     
     svn path=/trunk/; revision=698
 
- tests/javascript/everything.js |   24 +++++++++++++++++++++++-
+ tests/javascript/everything.js | 24 +++++++++++++++++++++++-
  1 file changed, 23 insertions(+), 1 deletion(-)
 
 commit 2fc02fe66894cb32eafe85e8677f1f4a26ce4c9f
@@ -16180,7 +17547,7 @@ Date:   Fri Jan 9 07:09:26 2009 +0000
     
     svn path=/trunk/; revision=697
 
- libseed/seed-types.c |   14 ++++++++++++--
+ libseed/seed-types.c | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 644a29e92c71337e0a397c3aacf8ada76cd97a2e
@@ -16191,7 +17558,7 @@ Date:   Fri Jan 9 06:42:50 2009 +0000
     
     svn path=/trunk/; revision=696
 
- libseed/seed-types.c |    3 ++-
+ libseed/seed-types.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 5f813da44c1cfe64e5ffa5ab83852b4f54c9b012
@@ -16202,7 +17569,7 @@ Date:   Fri Jan 9 06:41:08 2009 +0000
     
     svn path=/trunk/; revision=695
 
- tests/javascript/everything.js |   14 +++++++-------
+ tests/javascript/everything.js | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 89ab2277fee4c32182a6b032ccb65d2675213726
@@ -16213,9 +17580,9 @@ Date:   Fri Jan 9 06:37:33 2009 +0000
     
     svn path=/trunk/; revision=694
 
- libseed/seed-types.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-types.h |    8 ++++++++
- libseed/seed.h       |    8 ++++++++
+ libseed/seed-types.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-types.h |  8 ++++++++
+ libseed/seed.h       |  8 ++++++++
  3 files changed, 65 insertions(+)
 
 commit 6f8afdac6de0d7ee8e202220a1855984ea35d211
@@ -16227,7 +17594,7 @@ Date:   Fri Jan 9 06:09:59 2009 +0000
     
     svn path=/trunk/; revision=693
 
- libseed/seed-types.c |    4 ++--
+ libseed/seed-types.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 2e295e3b875f850edab9b5b027dbd681f86ddec6
@@ -16238,7 +17605,7 @@ Date:   Fri Jan 9 06:05:05 2009 +0000
     
     svn path=/trunk/; revision=692
 
- libseed/seed-types.c |    5 +++++
+ libseed/seed-types.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit e8bdfe02a937da8d01d671092acebc20f277298f
@@ -16249,8 +17616,8 @@ Date:   Fri Jan 9 05:58:40 2009 +0000
     
     svn path=/trunk/; revision=691
 
- tests/javascript/Makefile.am   |    3 ++-
- tests/javascript/everything.js |   45 ++++++++++++++++++++++++++++++++++++++++
+ tests/javascript/Makefile.am   |  3 ++-
+ tests/javascript/everything.js | 45 ++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 47 insertions(+), 1 deletion(-)
 
 commit 0c09bc84809ce3fb7106ad3bcc755ebacbd66707
@@ -16261,7 +17628,7 @@ Date:   Fri Jan 9 04:52:29 2009 +0000
     
     svn path=/trunk/; revision=690
 
- examples/clutter-shader/ShaderView.js |    2 +-
+ examples/clutter-shader/ShaderView.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0d932542de9174ff68a90e956e5e0ac8d0e06127
@@ -16272,7 +17639,7 @@ Date:   Fri Jan 9 03:40:22 2009 +0000
     
     svn path=/trunk/; revision=689
 
- libseed/seed-types.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ libseed/seed-types.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 54 insertions(+), 2 deletions(-)
 
 commit 0099a854f575fbd1c62bf86f40683aee98afcdc0
@@ -16283,11 +17650,11 @@ Date:   Fri Jan 9 02:04:22 2009 +0000
     
     svn path=/trunk/; revision=688
 
- tests/c/Makefile.am   |    3 ++-
- tests/c/api-closure.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
- tests/c/api-types.c   |   26 ++++++++++++--------------
- tests/c/main.c        |    4 ++++
- tests/c/test-common.h |    8 ++++----
+ tests/c/Makefile.am   |  3 ++-
+ tests/c/api-closure.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ tests/c/api-types.c   | 26 ++++++++++++--------------
+ tests/c/main.c        |  4 ++++
+ tests/c/test-common.h |  8 ++++----
  5 files changed, 68 insertions(+), 19 deletions(-)
 
 commit acfdef8f1bc6aa1ba3c27f72cf52312597e5f8e3
@@ -16299,10 +17666,10 @@ Date:   Thu Jan 8 23:23:02 2009 +0000
     
     svn path=/trunk/; revision=687
 
- tests/c/Makefile.am   |    3 ++-
- tests/c/api-types.c   |   69 +++++++++++++++++++++++++++++++++++++++++++++++++
- tests/c/main.c        |    2 ++
- tests/c/test-common.h |    1 +
+ tests/c/Makefile.am   |  3 ++-
+ tests/c/api-types.c   | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/c/main.c        |  2 ++
+ tests/c/test-common.h |  1 +
  4 files changed, 74 insertions(+), 1 deletion(-)
 
 commit 75c2dfa25e370a09cebb837758ffb99f388cebaa
@@ -16314,7 +17681,7 @@ Date:   Thu Jan 8 20:56:50 2009 +0000
     
     svn path=/trunk/; revision=686
 
- examples/json-reddit.js |    4 +++-
+ examples/json-reddit.js | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit a723546d379d41294a7fdc1239de5b3b576ae471
@@ -16325,8 +17692,8 @@ Date:   Thu Jan 8 09:15:48 2009 +0000
     
     svn path=/trunk/; revision=685
 
- tests/c/basic.c |    6 +-----
- tests/c/main.c  |   17 +++--------------
+ tests/c/basic.c |  6 +-----
+ tests/c/main.c  | 17 +++--------------
  2 files changed, 4 insertions(+), 19 deletions(-)
 
 commit e1563b228c7dec9f8ee4d790543dfd96c4eebf87
@@ -16337,11 +17704,11 @@ Date:   Thu Jan 8 09:08:23 2009 +0000
     
     svn path=/trunk/; revision=684
 
- examples/clutter-cogl.js |    2 +-
- libseed/seed-builtins.c  |   23 +++++++++++++++--------
- tests/c/basic.c          |    7 +++++--
- tests/c/main.c           |    5 +++--
- tests/run-tests.py       |   19 +++++++++++++++++--
+ examples/clutter-cogl.js |  2 +-
+ libseed/seed-builtins.c  | 23 +++++++++++++++--------
+ tests/c/basic.c          |  7 +++++--
+ tests/c/main.c           |  5 +++--
+ tests/run-tests.py       | 19 +++++++++++++++++--
  5 files changed, 41 insertions(+), 15 deletions(-)
 
 commit 98cdd0f9b3fedc3705ee19c8d641389b3fcf33cf
@@ -16352,7 +17719,7 @@ Date:   Thu Jan 8 08:35:43 2009 +0000
     
     svn path=/trunk/; revision=683
 
- examples/json-reddit.js |   18 ++++++++++++++++++
+ examples/json-reddit.js | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit b4ceba49caeef340ba7edea374f0e1af45ec835c
@@ -16363,12 +17730,12 @@ Date:   Thu Jan 8 08:28:13 2009 +0000
     
     svn path=/trunk/; revision=682
 
- tests/c/Makefile.am  |   18 +++----------
- tests/c/basic.c      |    9 +++++++
- tests/c/main.c       |   56 ++++++++++++++++++++++++++++++++++++++
- tests/c/test-main.c  |   73 --------------------------------------------------
- tests/c/test-tests.c |   10 -------
- tests/run-tests.py   |    3 ++-
+ tests/c/Makefile.am  | 18 +++----------
+ tests/c/basic.c      |  9 +++++++
+ tests/c/main.c       | 56 ++++++++++++++++++++++++++++++++++++++++
+ tests/c/test-main.c  | 73 ----------------------------------------------------
+ tests/c/test-tests.c | 10 -------
+ tests/run-tests.py   |  3 ++-
  6 files changed, 71 insertions(+), 98 deletions(-)
 
 commit f25190c74bec2b2a46b3e1b283146b5ea8bfddd3
@@ -16379,7 +17746,7 @@ Date:   Thu Jan 8 08:00:57 2009 +0000
     
     svn path=/trunk/; revision=681
 
- tests/c/Makefile.am |   14 ++------------
+ tests/c/Makefile.am | 14 ++------------
  1 file changed, 2 insertions(+), 12 deletions(-)
 
 commit d37b68ba2ecf8598002b41afc81c83a178135603
@@ -16391,14 +17758,14 @@ Date:   Thu Jan 8 07:53:34 2009 +0000
     
     svn path=/trunk/; revision=680
 
- configure.ac          |    1 +
- libseed/seed.h        |   20 +-------------
- ltmain.sh             |    4 +--
- tests/Makefile.am     |    2 +-
- tests/c/Makefile.am   |   32 ++++++++++++++++++++++
- tests/c/test-common.h |   20 ++++++++++++++
- tests/c/test-main.c   |   73 +++++++++++++++++++++++++++++++++++++++++++++++++
- tests/c/test-tests.c  |   10 +++++++
+ configure.ac          |  1 +
+ libseed/seed.h        | 20 +-------------
+ ltmain.sh             |  4 +--
+ tests/Makefile.am     |  2 +-
+ tests/c/Makefile.am   | 32 ++++++++++++++++++++++
+ tests/c/test-common.h | 20 ++++++++++++++
+ tests/c/test-main.c   | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/c/test-tests.c  | 10 +++++++
  8 files changed, 140 insertions(+), 22 deletions(-)
 
 commit 968d94019a8dc8ed2a692c39f5d032373d988c58
@@ -16411,8 +17778,8 @@ Date:   Thu Jan 8 05:04:41 2009 +0000
     
     svn path=/trunk/; revision=679
 
- libseed/seed-engine.c  |    1 +
- libseed/seed-structs.c |    4 ++++
+ libseed/seed-engine.c  | 1 +
+ libseed/seed-structs.c | 4 ++++
  2 files changed, 5 insertions(+)
 
 commit c18eae11c80d511b0ca4bd1607f47eb29b8d629e
@@ -16423,8 +17790,8 @@ Date:   Thu Jan 8 04:48:40 2009 +0000
     
     svn path=/trunk/; revision=678
 
- libseed/seed-engine.c  |    6 +++++-
- libseed/seed-structs.c |   24 +++++++++++++++++-------
+ libseed/seed-engine.c  |  6 +++++-
+ libseed/seed-structs.c | 24 +++++++++++++++++-------
  2 files changed, 22 insertions(+), 8 deletions(-)
 
 commit 24aef6ffc0c33a71c7dab1ceffea6f225d31365d
@@ -16435,9 +17802,9 @@ Date:   Thu Jan 8 04:12:10 2009 +0000
     
     svn path=/trunk/; revision=677
 
- examples/clutter-transitions/clutter.js            |  704 --------------------
- examples/clutter-transitions/main.js               |   74 ++
- examples/clutter-transitions/transition-library.js |  662 ++++++++++++++++++
+ examples/clutter-transitions/clutter.js            | 704 ---------------------
+ examples/clutter-transitions/main.js               |  74 +++
+ examples/clutter-transitions/transition-library.js | 662 +++++++++++++++++++
  3 files changed, 736 insertions(+), 704 deletions(-)
 
 commit 219b35d662af91d15e541617aea52a9877ae7eeb
@@ -16449,8 +17816,8 @@ Date:   Thu Jan 8 01:09:59 2009 +0000
     
     svn path=/trunk/; revision=676
 
- examples/HACKING                        |    8 +-
- examples/clutter-transitions/clutter.js |  183 +++++++++++++++----------------
+ examples/HACKING                        |   8 +-
+ examples/clutter-transitions/clutter.js | 183 ++++++++++++++++----------------
  2 files changed, 94 insertions(+), 97 deletions(-)
 
 commit f60ce28e5e858330545696a4594e009bc3cebbca
@@ -16462,9 +17829,9 @@ Date:   Wed Jan 7 23:49:09 2009 +0000
     
     svn path=/trunk/; revision=675
 
- examples/clutter-transitions/clutter.js |  709 +++++++++++++++++++++++++++++++
- examples/clutter-transitions/one.jpg    |  Bin 0 -> 379735 bytes
- examples/clutter-transitions/two.jpg    |  Bin 0 -> 218469 bytes
+ examples/clutter-transitions/clutter.js | 709 ++++++++++++++++++++++++++++++++
+ examples/clutter-transitions/one.jpg    | Bin 0 -> 379735 bytes
+ examples/clutter-transitions/two.jpg    | Bin 0 -> 218469 bytes
  3 files changed, 709 insertions(+)
 
 commit 43327909f6424380cff3a0d72924cb845eae9785
@@ -16475,9 +17842,9 @@ Date:   Wed Jan 7 10:47:56 2009 +0000
     
     svn path=/trunk/; revision=674
 
- examples/accelgroup.js |    4 ++--
- examples/clutter.js    |    6 +-----
- examples/soup.js       |    1 +
+ examples/accelgroup.js | 4 ++--
+ examples/clutter.js    | 6 +-----
+ examples/soup.js       | 1 +
  3 files changed, 4 insertions(+), 7 deletions(-)
 
 commit c0ded92b71d2ee4430767a61dc021475c7cd8d69
@@ -16488,7 +17855,7 @@ Date:   Wed Jan 7 10:41:24 2009 +0000
     
     svn path=/trunk/; revision=673
 
- examples/clutter-cogl.js |    5 ++---
+ examples/clutter-cogl.js | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 0a072a9fe9e0f931db65ed3c5218ac18aea7af18
@@ -16499,7 +17866,7 @@ Date:   Wed Jan 7 10:25:29 2009 +0000
     
     svn path=/trunk/; revision=672
 
- examples/Makefile.am |    2 ++
+ examples/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 4e8678f176e308124d8ad71ebcc2eabe7e785f70
@@ -16510,8 +17877,8 @@ Date:   Wed Jan 7 10:25:26 2009 +0000
     
     svn path=/trunk/; revision=671
 
- examples/clutter-cogl.js |   42 ++++++++++++++++++++++++++++++++++--------
- examples/clutter.js      |   46 ++++++++++++++++++++++------------------------
+ examples/clutter-cogl.js | 42 ++++++++++++++++++++++++++++++++++--------
+ examples/clutter.js      | 46 ++++++++++++++++++++++------------------------
  2 files changed, 56 insertions(+), 32 deletions(-)
 
 commit a4e02ef26c3ed651cf252998ac68129421203ff5
@@ -16522,7 +17889,7 @@ Date:   Wed Jan 7 10:10:58 2009 +0000
     
     svn path=/trunk/; revision=670
 
- examples/clutter-cogl.js |  116 ++++++++++++++++++++++++++++++++++++++++++++++
+ examples/clutter-cogl.js | 116 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 116 insertions(+)
 
 commit a3ad4fd24c83d9e643bd0df960cdf5a31d57ffb9
@@ -16533,7 +17900,7 @@ Date:   Tue Jan 6 11:43:47 2009 +0000
     
     svn path=/trunk/; revision=669
 
- libseed/seed-gtype.c |    2 +-
+ libseed/seed-gtype.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 57cff0d5b952c8b78ea59badda7fe5b642a859ea
@@ -16545,8 +17912,8 @@ Date:   Tue Jan 6 10:48:05 2009 +0000
     
     svn path=/trunk/; revision=668
 
- libseed/seed-gtype.c |    5 ++++-
- ltmain.sh            |    4 ++--
+ libseed/seed-gtype.c | 5 ++++-
+ ltmain.sh            | 4 ++--
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit d40b67b4003d45683f35edd5cb7e933aa4fddb64
@@ -16557,8 +17924,8 @@ Date:   Tue Jan 6 07:34:27 2009 +0000
     
     svn path=/trunk/; revision=667
 
- Makefile.am  |    8 +++++++-
- configure.ac |   12 ++++++++++++
+ Makefile.am  |  8 +++++++-
+ configure.ac | 12 ++++++++++++
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 commit 635848d36c5ca81965addbd6f2888de6a1190bca
@@ -16569,34 +17936,34 @@ Date:   Tue Jan 6 03:21:09 2009 +0000
     
     svn path=/trunk/; revision=666
 
- configure.ac                           |    1 -
- examples/Makefile.am                   |    2 +-
- examples/gtktreeview.js                |    8 +-
- examples/lightsoff/0.svg               |  209 --------------------
- examples/lightsoff/1.svg               |  177 -----------------
- examples/lightsoff/2.svg               |  187 ------------------
- examples/lightsoff/3.svg               |  207 -------------------
- examples/lightsoff/4.svg               |  165 ----------------
- examples/lightsoff/5.svg               |  187 ------------------
- examples/lightsoff/6.svg               |  209 --------------------
- examples/lightsoff/7.svg               |  187 ------------------
- examples/lightsoff/8.svg               |  227 ---------------------
- examples/lightsoff/9.svg               |  209 --------------------
- examples/lightsoff/COPYING             |  339 --------------------------------
- examples/lightsoff/Makefile.am         |   49 -----
- examples/lightsoff/arrow-l.svg         |  174 ----------------
- examples/lightsoff/arrow-r.svg         |  191 ------------------
- examples/lightsoff/arrow.js            |   38 ----
- examples/lightsoff/board.js            |  224 ---------------------
- examples/lightsoff/lcd-back.svg        |  117 -----------
- examples/lightsoff/lcd-front.svg       |  113 -----------
- examples/lightsoff/lcd-off.svg         |  228 ---------------------
- examples/lightsoff/legacy/lightsoff.js |  268 -------------------------
- examples/lightsoff/light-off.svg       |  228 ---------------------
- examples/lightsoff/light-on.svg        |  204 -------------------
- examples/lightsoff/light.js            |   93 ---------
- examples/lightsoff/main.js             |   61 ------
- examples/lightsoff/score.js            |  113 -----------
+ configure.ac                           |   1 -
+ examples/Makefile.am                   |   2 +-
+ examples/gtktreeview.js                |   8 +-
+ examples/lightsoff/0.svg               | 209 --------------------
+ examples/lightsoff/1.svg               | 177 -----------------
+ examples/lightsoff/2.svg               | 187 ------------------
+ examples/lightsoff/3.svg               | 207 --------------------
+ examples/lightsoff/4.svg               | 165 ----------------
+ examples/lightsoff/5.svg               | 187 ------------------
+ examples/lightsoff/6.svg               | 209 --------------------
+ examples/lightsoff/7.svg               | 187 ------------------
+ examples/lightsoff/8.svg               | 227 ----------------------
+ examples/lightsoff/9.svg               | 209 --------------------
+ examples/lightsoff/COPYING             | 339 ---------------------------------
+ examples/lightsoff/Makefile.am         |  49 -----
+ examples/lightsoff/arrow-l.svg         | 174 -----------------
+ examples/lightsoff/arrow-r.svg         | 191 -------------------
+ examples/lightsoff/arrow.js            |  38 ----
+ examples/lightsoff/board.js            | 224 ----------------------
+ examples/lightsoff/lcd-back.svg        | 117 ------------
+ examples/lightsoff/lcd-front.svg       | 113 -----------
+ examples/lightsoff/lcd-off.svg         | 228 ----------------------
+ examples/lightsoff/legacy/lightsoff.js | 268 --------------------------
+ examples/lightsoff/light-off.svg       | 228 ----------------------
+ examples/lightsoff/light-on.svg        | 204 --------------------
+ examples/lightsoff/light.js            |  93 ---------
+ examples/lightsoff/main.js             |  61 ------
+ examples/lightsoff/score.js            | 113 -----------
  28 files changed, 5 insertions(+), 4410 deletions(-)
 
 commit 04ae59fcf7fcccf11e517fdfb8a55219b6d59a34
@@ -16608,7 +17975,7 @@ Date:   Mon Jan 5 14:23:37 2009 +0000
     
     svn path=/trunk/; revision=665
 
- libseed/seed-gtype.c |    4 ++--
+ libseed/seed-gtype.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 44c024d8eaecc06cd62ae9077e4a4f22fd5ea2b9
@@ -16620,9 +17987,9 @@ Date:   Mon Jan 5 11:06:14 2009 +0000
     
     svn path=/trunk/; revision=664
 
- examples/Makefile.am    |    2 ++
- examples/gtktreeview.js |   35 +++++++++++++++++++++++++++++++++++
- libseed/seed-types.c    |    2 +-
+ examples/Makefile.am    |  2 ++
+ examples/gtktreeview.js | 35 +++++++++++++++++++++++++++++++++++
+ libseed/seed-types.c    |  2 +-
  3 files changed, 38 insertions(+), 1 deletion(-)
 
 commit 4d5fb5d70b7769e815518b6550ee372b34592501
@@ -16635,9 +18002,9 @@ Date:   Mon Jan 5 11:06:10 2009 +0000
     
     svn path=/trunk/; revision=663
 
- libseed/seed-types.c                |   80 ++++++++++++++++++++++++++++++++++-
- tests/javascript/Makefile.am        |    2 +
- tests/javascript/gvalue-argument.js |   16 +++++++
+ libseed/seed-types.c                | 80 ++++++++++++++++++++++++++++++++++++-
+ tests/javascript/Makefile.am        |  2 +
+ tests/javascript/gvalue-argument.js | 16 ++++++++
  3 files changed, 97 insertions(+), 1 deletion(-)
 
 commit a264f55c0f304a16472b05e60db44fe9f616cc0b
@@ -16648,7 +18015,7 @@ Date:   Mon Jan 5 11:06:05 2009 +0000
     
     svn path=/trunk/; revision=662
 
- tests/javascript/array-gtype.js |   12 ++++++++++++
+ tests/javascript/array-gtype.js | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 102ac5c6b8526efbb566031e846ed8e9016cd426
@@ -16659,7 +18026,7 @@ Date:   Mon Jan 5 09:18:05 2009 +0000
     
     svn path=/trunk/; revision=661
 
- libseed/seed-gtype.c |  121 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-gtype.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 119 insertions(+), 2 deletions(-)
 
 commit cf6fb11e16db5fa5df2dc47c035a44bdcb629ae0
@@ -16670,7 +18037,7 @@ Date:   Mon Jan 5 08:41:17 2009 +0000
     
     svn path=/trunk/; revision=660
 
- examples/lightsoff/score.js |    2 ++
+ examples/lightsoff/score.js | 2 ++
  1 file changed, 2 insertions(+)
 
 commit b946a2f692e3174c3a36a076adc89822a8a59996
@@ -16681,7 +18048,7 @@ Date:   Mon Jan 5 08:28:39 2009 +0000
     
     svn path=/trunk/; revision=659
 
- libseed/seed-engine.c |    1 +
+ libseed/seed-engine.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 93e07616edeff98cc47c65e99d613a0eccd0a42f
@@ -16692,8 +18059,8 @@ Date:   Mon Jan 5 08:20:38 2009 +0000
     
     svn path=/trunk/; revision=658
 
- modules/Multiprocessing/bi.js   |    7 +++++--
- modules/Multiprocessing/fork.js |    3 ++-
+ modules/Multiprocessing/bi.js   | 7 +++++--
+ modules/Multiprocessing/fork.js | 3 ++-
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 992223aa8e804e61d0a85852c8b94b451afcd63f
@@ -16704,7 +18071,7 @@ Date:   Mon Jan 5 08:16:47 2009 +0000
     
     svn path=/trunk/; revision=657
 
- tests/javascript/Makefile.am |   70 ++++++++++++++++++++++--------------------
+ tests/javascript/Makefile.am | 70 +++++++++++++++++++++++---------------------
  1 file changed, 37 insertions(+), 33 deletions(-)
 
 commit bcd002ee85a149d519552e138f7ffd7d973aa9ed
@@ -16715,7 +18082,7 @@ Date:   Mon Jan 5 08:16:10 2009 +0000
     
     svn path=/trunk/; revision=656
 
- libseed/seed-engine.c |    1 +
+ libseed/seed-engine.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit a5e11bc54f3a76c93a9cfe112624359d65654c6a
@@ -16726,7 +18093,7 @@ Date:   Mon Jan 5 08:13:42 2009 +0000
     
     svn path=/trunk/; revision=655
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6dd4716d8ec27d64034a3223e9a0b7da6a41e041
@@ -16737,122 +18104,122 @@ Date:   Mon Jan 5 08:13:17 2009 +0000
     
     svn path=/trunk/; revision=654
 
- tests/Makefile.am                              |   54 +---------------------
- tests/argv.js                                  |    6 ---
- tests/builtin-argument-length.js               |   54 ----------------------
- tests/c-module.js                              |    6 ---
- tests/check-syntax.js                          |   12 -----
- tests/closure-finalization.js                  |   23 ----------
- tests/compare.js                               |   15 ------
- tests/constructor-args.js                      |   34 --------------
- tests/constructor-prototype.js                 |   12 -----
- tests/enum.js                                  |   15 ------
- tests/fork.js                                  |   16 -------
- tests/function-info.js                         |   11 -----
- tests/gdk-event.js                             |   28 ------------
- tests/gerror.js                                |   18 --------
- tests/gobject-scope.js                         |   15 ------
- tests/gtype-class-init-exception.js            |   22 ---------
- tests/gtype-property.js                        |   36 ---------------
- tests/gtype-signal-exception.js                |   46 -------------------
- tests/gtype-signal.js                          |   34 --------------
- tests/gtype-typerror.js                        |   16 -------
- tests/gtype.js                                 |   34 --------------
- tests/include-syntax.js                        |    6 ---
- tests/include.js                               |    7 ---
- tests/introspect.js                            |   10 ----
- tests/javascript/COPYING                       |    1 +
- tests/javascript/Makefile.am                   |   58 ++++++++++++++++++++++++
- tests/javascript/argv.js                       |    6 +++
- tests/javascript/builtin-argument-length.js    |   54 ++++++++++++++++++++++
- tests/javascript/c-module.js                   |    6 +++
- tests/javascript/check-syntax.js               |   12 +++++
- tests/javascript/closure-finalization.js       |   23 ++++++++++
- tests/javascript/compare.js                    |   15 ++++++
- tests/javascript/constructor-args.js           |   34 ++++++++++++++
- tests/javascript/constructor-prototype.js      |   12 +++++
- tests/javascript/enum.js                       |   15 ++++++
- tests/javascript/fork.js                       |   16 +++++++
- tests/javascript/function-info.js              |   11 +++++
- tests/javascript/gdk-event.js                  |   28 ++++++++++++
- tests/javascript/gerror.js                     |   18 ++++++++
- tests/javascript/gobject-scope.js              |   15 ++++++
- tests/javascript/gtype-class-init-exception.js |   22 +++++++++
- tests/javascript/gtype-property.js             |   36 +++++++++++++++
- tests/javascript/gtype-signal-exception.js     |   46 +++++++++++++++++++
- tests/javascript/gtype-signal.js               |   34 ++++++++++++++
- tests/javascript/gtype-typerror.js             |   16 +++++++
- tests/javascript/gtype.js                      |   34 ++++++++++++++
- tests/javascript/include-syntax.js             |    6 +++
- tests/javascript/include.js                    |    7 +++
- tests/javascript/introspect.js                 |   10 ++++
- tests/javascript/json-constructor.js           |   15 ++++++
- tests/javascript/json.js                       |   14 ++++++
- tests/javascript/list-test.js                  |   19 ++++++++
- tests/javascript/namespace-exception-test.js   |   26 +++++++++++
- tests/javascript/native-closure-exception.js   |   17 +++++++
- tests/javascript/native-closure.js             |   18 ++++++++
- tests/javascript/object-info.js                |   20 ++++++++
- tests/javascript/out-test.js                   |   13 ++++++
- tests/javascript/print.js                      |    7 +++
- tests/javascript/printf.js                     |   11 +++++
- tests/javascript/printprint.js                 |    6 +++
- tests/javascript/property-benchmark.js         |   17 +++++++
- tests/javascript/property-glib-exception.js    |   11 +++++
- tests/javascript/quit.js                       |    7 +++
- tests/javascript/quit2.js                      |    7 +++
- tests/javascript/readline.js                   |    8 ++++
- tests/javascript/readline_bind.js              |    9 ++++
- tests/javascript/signal-connect.js             |   21 +++++++++
- tests/javascript/signal-exception.js           |   12 +++++
- tests/javascript/signal-expects.js             |   17 +++++++
- tests/javascript/signal-userdata.js            |   17 +++++++
- tests/javascript/signal.js                     |   18 ++++++++
- tests/javascript/spawn.js                      |    8 ++++
- tests/javascript/sqlite.js                     |   24 ++++++++++
- tests/javascript/struct-constructor.js         |   12 +++++
- tests/javascript/struct-enumerate.js           |   12 +++++
- tests/javascript/struct-functions.js           |   10 ++++
- tests/javascript/struct-nested-set.js          |   17 +++++++
- tests/javascript/struct-offsets.js             |   16 +++++++
- tests/javascript/struct-set-member.js          |   15 ++++++
- tests/javascript/struct-union-enumerate.js     |   21 +++++++++
- tests/javascript/syntax-test.js                |    7 +++
- tests/javascript/type-conversion.js            |   28 ++++++++++++
- tests/json-constructor.js                      |   15 ------
- tests/json.js                                  |   14 ------
- tests/list-test.js                             |   19 --------
- tests/namespace-exception-test.js              |   26 -----------
- tests/native-closure-exception.js              |   17 -------
- tests/native-closure.js                        |   18 --------
- tests/object-info.js                           |   20 --------
- tests/out-test.js                              |   13 ------
- tests/print.js                                 |    7 ---
- tests/printf.js                                |   11 -----
- tests/printprint.js                            |    6 ---
- tests/property-benchmark.js                    |   17 -------
- tests/property-glib-exception.js               |   11 -----
- tests/quit.js                                  |    7 ---
- tests/quit2.js                                 |    7 ---
- tests/readline.js                              |    8 ----
- tests/readline_bind.js                         |    9 ----
- tests/run-tests.py                             |   36 +++++----------
- tests/signal-connect.js                        |   21 ---------
- tests/signal-exception.js                      |   12 -----
- tests/signal-expects.js                        |   17 -------
- tests/signal-userdata.js                       |   17 -------
- tests/signal.js                                |   18 --------
- tests/spawn.js                                 |    8 ----
- tests/sqlite.js                                |   24 ----------
- tests/struct-constructor.js                    |   12 -----
- tests/struct-enumerate.js                      |   12 -----
- tests/struct-functions.js                      |   10 ----
- tests/struct-nested-set.js                     |   17 -------
- tests/struct-offsets.js                        |   16 -------
- tests/struct-set-member.js                     |   15 ------
- tests/struct-union-enumerate.js                |   21 ---------
- tests/syntax-test.js                           |    7 ---
- tests/type-conversion.js                       |   28 ------------
+ tests/Makefile.am                              | 54 +-----------------------
+ tests/argv.js                                  |  6 ---
+ tests/builtin-argument-length.js               | 54 ------------------------
+ tests/c-module.js                              |  6 ---
+ tests/check-syntax.js                          | 12 ------
+ tests/closure-finalization.js                  | 23 ----------
+ tests/compare.js                               | 15 -------
+ tests/constructor-args.js                      | 34 ---------------
+ tests/constructor-prototype.js                 | 12 ------
+ tests/enum.js                                  | 15 -------
+ tests/fork.js                                  | 16 -------
+ tests/function-info.js                         | 11 -----
+ tests/gdk-event.js                             | 28 -------------
+ tests/gerror.js                                | 18 --------
+ tests/gobject-scope.js                         | 15 -------
+ tests/gtype-class-init-exception.js            | 22 ----------
+ tests/gtype-property.js                        | 36 ----------------
+ tests/gtype-signal-exception.js                | 46 --------------------
+ tests/gtype-signal.js                          | 34 ---------------
+ tests/gtype-typerror.js                        | 16 -------
+ tests/gtype.js                                 | 34 ---------------
+ tests/include-syntax.js                        |  6 ---
+ tests/include.js                               |  7 ----
+ tests/introspect.js                            | 10 -----
+ tests/javascript/COPYING                       |  1 +
+ tests/javascript/Makefile.am                   | 58 ++++++++++++++++++++++++++
+ tests/javascript/argv.js                       |  6 +++
+ tests/javascript/builtin-argument-length.js    | 54 ++++++++++++++++++++++++
+ tests/javascript/c-module.js                   |  6 +++
+ tests/javascript/check-syntax.js               | 12 ++++++
+ tests/javascript/closure-finalization.js       | 23 ++++++++++
+ tests/javascript/compare.js                    | 15 +++++++
+ tests/javascript/constructor-args.js           | 34 +++++++++++++++
+ tests/javascript/constructor-prototype.js      | 12 ++++++
+ tests/javascript/enum.js                       | 15 +++++++
+ tests/javascript/fork.js                       | 16 +++++++
+ tests/javascript/function-info.js              | 11 +++++
+ tests/javascript/gdk-event.js                  | 28 +++++++++++++
+ tests/javascript/gerror.js                     | 18 ++++++++
+ tests/javascript/gobject-scope.js              | 15 +++++++
+ tests/javascript/gtype-class-init-exception.js | 22 ++++++++++
+ tests/javascript/gtype-property.js             | 36 ++++++++++++++++
+ tests/javascript/gtype-signal-exception.js     | 46 ++++++++++++++++++++
+ tests/javascript/gtype-signal.js               | 34 +++++++++++++++
+ tests/javascript/gtype-typerror.js             | 16 +++++++
+ tests/javascript/gtype.js                      | 34 +++++++++++++++
+ tests/javascript/include-syntax.js             |  6 +++
+ tests/javascript/include.js                    |  7 ++++
+ tests/javascript/introspect.js                 | 10 +++++
+ tests/javascript/json-constructor.js           | 15 +++++++
+ tests/javascript/json.js                       | 14 +++++++
+ tests/javascript/list-test.js                  | 19 +++++++++
+ tests/javascript/namespace-exception-test.js   | 26 ++++++++++++
+ tests/javascript/native-closure-exception.js   | 17 ++++++++
+ tests/javascript/native-closure.js             | 18 ++++++++
+ tests/javascript/object-info.js                | 20 +++++++++
+ tests/javascript/out-test.js                   | 13 ++++++
+ tests/javascript/print.js                      |  7 ++++
+ tests/javascript/printf.js                     | 11 +++++
+ tests/javascript/printprint.js                 |  6 +++
+ tests/javascript/property-benchmark.js         | 17 ++++++++
+ tests/javascript/property-glib-exception.js    | 11 +++++
+ tests/javascript/quit.js                       |  7 ++++
+ tests/javascript/quit2.js                      |  7 ++++
+ tests/javascript/readline.js                   |  8 ++++
+ tests/javascript/readline_bind.js              |  9 ++++
+ tests/javascript/signal-connect.js             | 21 ++++++++++
+ tests/javascript/signal-exception.js           | 12 ++++++
+ tests/javascript/signal-expects.js             | 17 ++++++++
+ tests/javascript/signal-userdata.js            | 17 ++++++++
+ tests/javascript/signal.js                     | 18 ++++++++
+ tests/javascript/spawn.js                      |  8 ++++
+ tests/javascript/sqlite.js                     | 24 +++++++++++
+ tests/javascript/struct-constructor.js         | 12 ++++++
+ tests/javascript/struct-enumerate.js           | 12 ++++++
+ tests/javascript/struct-functions.js           | 10 +++++
+ tests/javascript/struct-nested-set.js          | 17 ++++++++
+ tests/javascript/struct-offsets.js             | 16 +++++++
+ tests/javascript/struct-set-member.js          | 15 +++++++
+ tests/javascript/struct-union-enumerate.js     | 21 ++++++++++
+ tests/javascript/syntax-test.js                |  7 ++++
+ tests/javascript/type-conversion.js            | 28 +++++++++++++
+ tests/json-constructor.js                      | 15 -------
+ tests/json.js                                  | 14 -------
+ tests/list-test.js                             | 19 ---------
+ tests/namespace-exception-test.js              | 26 ------------
+ tests/native-closure-exception.js              | 17 --------
+ tests/native-closure.js                        | 18 --------
+ tests/object-info.js                           | 20 ---------
+ tests/out-test.js                              | 13 ------
+ tests/print.js                                 |  7 ----
+ tests/printf.js                                | 11 -----
+ tests/printprint.js                            |  6 ---
+ tests/property-benchmark.js                    | 17 --------
+ tests/property-glib-exception.js               | 11 -----
+ tests/quit.js                                  |  7 ----
+ tests/quit2.js                                 |  7 ----
+ tests/readline.js                              |  8 ----
+ tests/readline_bind.js                         |  9 ----
+ tests/run-tests.py                             | 36 +++++-----------
+ tests/signal-connect.js                        | 21 ----------
+ tests/signal-exception.js                      | 12 ------
+ tests/signal-expects.js                        | 17 --------
+ tests/signal-userdata.js                       | 17 --------
+ tests/signal.js                                | 18 --------
+ tests/spawn.js                                 |  8 ----
+ tests/sqlite.js                                | 24 -----------
+ tests/struct-constructor.js                    | 12 ------
+ tests/struct-enumerate.js                      | 12 ------
+ tests/struct-functions.js                      | 10 -----
+ tests/struct-nested-set.js                     | 17 --------
+ tests/struct-offsets.js                        | 16 -------
+ tests/struct-set-member.js                     | 15 -------
+ tests/struct-union-enumerate.js                | 21 ----------
+ tests/syntax-test.js                           |  7 ----
+ tests/type-conversion.js                       | 28 -------------
  116 files changed, 1027 insertions(+), 1034 deletions(-)
 
 commit 85ac9057c1d76c280eb5f7fd4a8638b25b21a57c
@@ -16863,7 +18230,7 @@ Date:   Mon Jan 5 07:14:10 2009 +0000
     
     svn path=/trunk/; revision=653
 
- tests/readline_bind.js |    9 +++++++++
+ tests/readline_bind.js | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 45def7a61a347e330f9f6feb2135607d56ef2b5d
@@ -16874,7 +18241,7 @@ Date:   Mon Jan 5 06:40:08 2009 +0000
     
     svn path=/trunk/; revision=652
 
- modules/sqlite/seed-sqlite.c |    2 ++
+ modules/sqlite/seed-sqlite.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 8509a7eade45bc7fc223fe0bd6541141bf554fad
@@ -16888,16 +18255,16 @@ Date:   Mon Jan 5 06:34:54 2009 +0000
     
     svn path=/trunk/; revision=651
 
- Makefile.am                         |   15 ++++++++++++++-
- ltmain.sh                           |    4 ++--
- modules/Multiprocessing/Makefile.am |    5 ++++-
- modules/canvas/Makefile.am          |    7 +++++--
- modules/example/Makefile.am         |    5 ++++-
- modules/readline/Makefile.am        |    5 ++++-
- modules/sqlite/Makefile.am          |    7 +++++--
- modules/sqlite/example.js           |    4 ++--
- tests/quit2.js                      |    7 +++++++
- tests/sqlite.js                     |   24 ++++++++++++++++++++++++
+ Makefile.am                         | 15 ++++++++++++++-
+ ltmain.sh                           |  4 ++--
+ modules/Multiprocessing/Makefile.am |  5 ++++-
+ modules/canvas/Makefile.am          |  7 +++++--
+ modules/example/Makefile.am         |  5 ++++-
+ modules/readline/Makefile.am        |  5 ++++-
+ modules/sqlite/Makefile.am          |  7 +++++--
+ modules/sqlite/example.js           |  4 ++--
+ tests/quit2.js                      |  7 +++++++
+ tests/sqlite.js                     | 24 ++++++++++++++++++++++++
  10 files changed, 71 insertions(+), 12 deletions(-)
 
 commit 52a2be6734b46db2a20ebae2817a72765b0b1e4a
@@ -16908,9 +18275,9 @@ Date:   Mon Jan 5 05:10:41 2009 +0000
     
     svn path=/trunk/; revision=650
 
- extensions/GObject.js |    1 -
- libseed/seed-api.c    |   11 +++++++++++
- libseed/seed.h        |    1 +
+ extensions/GObject.js |  1 -
+ libseed/seed-api.c    | 11 +++++++++++
+ libseed/seed.h        |  1 +
  3 files changed, 12 insertions(+), 1 deletion(-)
 
 commit f268515bd526de4541b694461e218b3343b20c3b
@@ -16922,11 +18289,11 @@ Date:   Mon Jan 5 05:10:34 2009 +0000
     
     svn path=/trunk/; revision=649
 
- libseed/seed-engine.c   |    8 +++++++-
- libseed/seed-gtype.c    |   33 +++++++++++++++++++++++++--------
- tests/function-info.js  |    1 +
- tests/gtype-property.js |    2 +-
- tests/object-info.js    |    1 +
+ libseed/seed-engine.c   |  8 +++++++-
+ libseed/seed-gtype.c    | 33 +++++++++++++++++++++++++--------
+ tests/function-info.js  |  1 +
+ tests/gtype-property.js |  2 +-
+ tests/object-info.js    |  1 +
  5 files changed, 35 insertions(+), 10 deletions(-)
 
 commit 33d060733d6d47f2dd5ba7364bfbf3b1a576b730
@@ -16937,7 +18304,7 @@ Date:   Mon Jan 5 03:55:05 2009 +0000
     
     svn path=/trunk/; revision=648
 
- doc/modules/canvas.html |   17 -----------------
+ doc/modules/canvas.html | 17 -----------------
  1 file changed, 17 deletions(-)
 
 commit afe1fb97dc7e9b6a99d948cb61c5e7a4aae855af
@@ -16948,7 +18315,7 @@ Date:   Mon Jan 5 03:38:24 2009 +0000
     
     svn path=/trunk/; revision=647
 
- doc/modules/canvas.html |   28 ++++++++++++++++++++++++++++
+ doc/modules/canvas.html | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 commit 8924332373ac18113d6aa02adeaa4d7492d11289
@@ -16959,8 +18326,8 @@ Date:   Mon Jan 5 02:40:33 2009 +0000
     
     svn path=/trunk/; revision=646
 
- doc/modules/sqlite.html   |   23 +++++++++++++++++++++++
- modules/sqlite/example.js |    2 ++
+ doc/modules/sqlite.html   | 23 +++++++++++++++++++++++
+ modules/sqlite/example.js |  2 ++
  2 files changed, 25 insertions(+)
 
 commit 059ed78df0f30514ad7578cb4f9d5d4bcb7f0da4
@@ -16971,8 +18338,8 @@ Date:   Mon Jan 5 01:52:03 2009 +0000
     
     svn path=/trunk/; revision=645
 
- doc/modules/example.html |   23 -----------------------
- doc/modules/sqlite.html  |   22 ++++++++++++++++++++++
+ doc/modules/example.html | 23 -----------------------
+ doc/modules/sqlite.html  | 22 ++++++++++++++++++++++
  2 files changed, 22 insertions(+), 23 deletions(-)
 
 commit 80879ea1bcefab29e333ba08cad5fa471a70654f
@@ -16984,10 +18351,10 @@ Date:   Sun Jan 4 23:09:12 2009 +0000
     
     svn path=/trunk/; revision=644
 
- doc/modules/canvas.html          |   23 +++++++++++++++++++++++
- doc/modules/example.html         |   23 +++++++++++++++++++++++
- doc/modules/multiprocessing.html |   23 +++++++++++++++++++++++
- doc/modules/sqlite.html          |   23 +++++++++++++++++++++++
+ doc/modules/canvas.html          | 23 +++++++++++++++++++++++
+ doc/modules/example.html         | 23 +++++++++++++++++++++++
+ doc/modules/multiprocessing.html | 23 +++++++++++++++++++++++
+ doc/modules/sqlite.html          | 23 +++++++++++++++++++++++
  4 files changed, 92 insertions(+)
 
 commit 095eabb458a7db60e58db11e54ae3d5f6ca20290
@@ -16998,9 +18365,9 @@ Date:   Sun Jan 4 15:47:33 2009 +0000
     
     svn path=/trunk/; revision=643
 
- libseed/seed-gtype.c    |   43 +++++++++++++++++++++++++++++++++++++++++++
- tests/Makefile.am       |    1 +
- tests/gtype-property.js |   36 ++++++++++++++++++++++++++++++++++++
+ libseed/seed-gtype.c    | 43 +++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am       |  1 +
+ tests/gtype-property.js | 36 ++++++++++++++++++++++++++++++++++++
  3 files changed, 80 insertions(+)
 
 commit a4cd8a300337fec67d7dca228c9d0168cba0b1a5
@@ -17014,7 +18381,7 @@ Date:   Sun Jan 4 10:10:42 2009 +0000
     
     svn path=/trunk/; revision=642
 
- libseed/seed-engine.c |   22 ++++++++++++++++++----
+ libseed/seed-engine.c | 22 ++++++++++++++++++----
  1 file changed, 18 insertions(+), 4 deletions(-)
 
 commit 75b40661f590133bbef2bc2f4be40b45d0e81069
@@ -17025,9 +18392,9 @@ Date:   Sun Jan 4 10:03:51 2009 +0000
     
     svn path=/trunk/; revision=641
 
- libseed/seed-engine.c  |   12 +++++
- libseed/seed-structs.c |  133 +++++++++++++++++++++++++++++++++++++-----------
- libseed/seed-structs.h |    5 ++
+ libseed/seed-engine.c  |  12 +++++
+ libseed/seed-structs.c | 133 ++++++++++++++++++++++++++++++++++++++-----------
+ libseed/seed-structs.h |   5 ++
  3 files changed, 120 insertions(+), 30 deletions(-)
 
 commit 8ca643f741783ea890ca73f8cdbb3cd517d30007
@@ -17038,7 +18405,7 @@ Date:   Sun Jan 4 08:14:02 2009 +0000
     
     svn path=/trunk/; revision=640
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 71929c80a57376228ce680aaf884aa99d97fff38
@@ -17049,12 +18416,12 @@ Date:   Sun Jan 4 07:11:35 2009 +0000
     
     svn path=/trunk/; revision=639
 
- examples/Gnio.js          |    6 +++---
- examples/clutter-cairo.js |    2 +-
- examples/clutter.js       |    2 +-
- examples/gtkplug.js       |    2 +-
- examples/soup.js          |    2 +-
- extensions/Gio.js         |    6 +++---
+ examples/Gnio.js          | 6 +++---
+ examples/clutter-cairo.js | 2 +-
+ examples/clutter.js       | 2 +-
+ examples/gtkplug.js       | 2 +-
+ examples/soup.js          | 2 +-
+ extensions/Gio.js         | 6 +++---
  6 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 7890df05a047a5a05958d4ffd1c8ca7f028edb19
@@ -17065,12 +18432,12 @@ Date:   Sun Jan 4 07:07:13 2009 +0000
     
     svn path=/trunk/; revision=638
 
- examples/lightsoff/arrow.js |    2 +-
- examples/lightsoff/board.js |    4 ++--
- examples/lightsoff/light.js |    9 +++++----
- examples/lightsoff/score.js |    8 ++++----
- examples/poppler.js         |    4 ++--
- libseed/seed-engine.c       |    2 ++
+ examples/lightsoff/arrow.js | 2 +-
+ examples/lightsoff/board.js | 4 ++--
+ examples/lightsoff/light.js | 9 +++++----
+ examples/lightsoff/score.js | 8 ++++----
+ examples/poppler.js         | 4 ++--
+ libseed/seed-engine.c       | 2 ++
  6 files changed, 16 insertions(+), 13 deletions(-)
 
 commit 24458d76663c0cc3bf354d1b11d9e4568ace55d2
@@ -17082,7 +18449,7 @@ Date:   Sun Jan 4 07:07:08 2009 +0000
     
     svn path=/trunk/; revision=637
 
- libseed/seed-engine.c |   21 +++++++++++++++++++--
+ libseed/seed-engine.c | 21 +++++++++++++++++++--
  1 file changed, 19 insertions(+), 2 deletions(-)
 
 commit 4b47956675997f4370bf53540e3bafb3f2d305e4
@@ -17093,7 +18460,7 @@ Date:   Sun Jan 4 07:07:04 2009 +0000
     
     svn path=/trunk/; revision=636
 
- libseed/seed-engine.c |   36 ++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c | 36 ++++++++++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)
 
 commit 31d38e14e2a59c3cd03a27f7be6647d270b50265
@@ -17104,18 +18471,18 @@ Date:   Sun Jan 4 06:33:40 2009 +0000
     
     svn path=/trunk/; revision=635
 
- libseed/Makefile.am           |    2 +-
- libseed/seed-api.c            |   12 ++++++------
- libseed/seed-builtins.c       |    1 +
- libseed/seed-closure.c        |    2 +-
- libseed/seed-engine.c         |   12 ++++--------
- libseed/seed-exceptions.c     |    1 +
- libseed/seed-gtype.c          |   18 +++++++-----------
- libseed/seed-signals.c        |   11 ++++++-----
- libseed/seed-structs.c        |   20 ++++++--------------
- libseed/seed-types.c          |   10 +++++-----
- ltmain.sh                     |    4 ++--
- modules/Multiprocessing/bi.js |    8 +++++---
+ libseed/Makefile.am           |  2 +-
+ libseed/seed-api.c            | 12 ++++++------
+ libseed/seed-builtins.c       |  1 +
+ libseed/seed-closure.c        |  2 +-
+ libseed/seed-engine.c         | 12 ++++--------
+ libseed/seed-exceptions.c     |  1 +
+ libseed/seed-gtype.c          | 18 +++++++-----------
+ libseed/seed-signals.c        | 11 ++++++-----
+ libseed/seed-structs.c        | 20 ++++++--------------
+ libseed/seed-types.c          | 10 +++++-----
+ ltmain.sh                     |  4 ++--
+ modules/Multiprocessing/bi.js |  8 +++++---
  12 files changed, 45 insertions(+), 56 deletions(-)
 
 commit c5eed8064d55df4f289e99503c2c7e605df01cea
@@ -17126,7 +18493,7 @@ Date:   Sun Jan 4 00:40:57 2009 +0000
     
     svn path=/trunk/; revision=634
 
- examples/lightsoff/arrow.js |    1 -
+ examples/lightsoff/arrow.js | 1 -
  1 file changed, 1 deletion(-)
 
 commit 40c7b3bf409b6fbe2df652058f08cb6d850c0e7b
@@ -17137,7 +18504,7 @@ Date:   Sun Jan 4 00:39:59 2009 +0000
     
     svn path=/trunk/; revision=633
 
- examples/lightsoff/arrow.js |    1 +
+ examples/lightsoff/arrow.js | 1 +
  1 file changed, 1 insertion(+)
 
 commit b392f4737fdaa4d13da41f34bf765ab195a4243f
@@ -17148,7 +18515,7 @@ Date:   Sun Jan 4 00:37:18 2009 +0000
     
     svn path=/trunk/; revision=632
 
- examples/lightsoff/arrow.js |    1 +
+ examples/lightsoff/arrow.js | 1 +
  1 file changed, 1 insertion(+)
 
 commit c5476609b89caf4c39a71d152eb1ce864ef63b59
@@ -17159,11 +18526,11 @@ Date:   Sat Jan 3 14:01:39 2009 +0000
     
     svn path=/trunk/; revision=631
 
- examples/lightsoff/arrow.js |   49 ++++++++++++---------------------
- examples/lightsoff/board.js |   64 ++++++++++++++++++++-----------------------
- examples/lightsoff/light.js |   32 +++++++++++++++++-----
- examples/lightsoff/main.js  |   14 ----------
- examples/lightsoff/score.js |   32 ++++++++++++++++------
+ examples/lightsoff/arrow.js | 49 ++++++++++++----------------------
+ examples/lightsoff/board.js | 64 ++++++++++++++++++++-------------------------
+ examples/lightsoff/light.js | 32 ++++++++++++++++++-----
+ examples/lightsoff/main.js  | 14 ----------
+ examples/lightsoff/score.js | 32 +++++++++++++++++------
  5 files changed, 95 insertions(+), 96 deletions(-)
 
 commit 2a8cc90743421114e73f093e10da362d5e9fc8de
@@ -17174,7 +18541,7 @@ Date:   Fri Jan 2 22:02:28 2009 +0000
     
     svn path=/trunk/; revision=629
 
- libseed/seed-structs.c |   14 ++++++++------
+ libseed/seed-structs.c | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit f51398ab00e8cc8d799b33883646de238ee02ae1
@@ -17185,8 +18552,8 @@ Date:   Fri Jan 2 21:22:24 2009 +0000
     
     svn path=/trunk/; revision=628
 
- examples/Gnio-server.js |    2 +-
- libseed/seed-structs.c  |    7 +++++--
+ examples/Gnio-server.js | 2 +-
+ libseed/seed-structs.c  | 7 +++++--
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 8a756fc253f3d25b82837ebb83ecf134d28e5d3d
@@ -17197,7 +18564,7 @@ Date:   Thu Jan 1 23:42:26 2009 +0000
     
     svn path=/trunk/; revision=625
 
- libseed/seed-gtype.c |    6 +++---
+ libseed/seed-gtype.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 05ed8ea1164994eb59e9fc3fa8416d05b1e39bb3
@@ -17208,7 +18575,7 @@ Date:   Thu Jan 1 23:20:15 2009 +0000
     
     svn path=/trunk/; revision=624
 
- libseed/seed-signals.c |    8 ++++----
+ libseed/seed-signals.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 58e59c52c3f6d6a829c193e097652514a6f90d24
@@ -17219,7 +18586,7 @@ Date:   Thu Jan 1 23:13:36 2009 +0000
     
     svn path=/trunk/; revision=623
 
- doc/tutorial-standalone/tutorial.html |    2 +-
+ doc/tutorial-standalone/tutorial.html | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dd62dfada32c8b0b34f7822de6f7a3b87d070a3d
@@ -17230,7 +18597,7 @@ Date:   Thu Jan 1 21:53:57 2009 +0000
     
     svn path=/trunk/; revision=622
 
- libseed/seed-engine.c |    4 ++--
+ libseed/seed-engine.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 2a5fb9ce050c76a79934ea27abc4bb2990441be1
@@ -17241,8 +18608,8 @@ Date:   Thu Jan 1 21:32:38 2009 +0000
     
     svn path=/trunk/; revision=621
 
- configure.ac |    4 ++--
- ltmain.sh    |    4 ++--
+ configure.ac | 4 ++--
+ ltmain.sh    | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 0c5a324c9995df61f31daa91eed68e16c1a1d4f0
@@ -17253,7 +18620,7 @@ Date:   Thu Jan 1 11:49:17 2009 +0000
     
     svn path=/trunk/; revision=620
 
- libseed/seed-builtins.c |   10 +++++-----
+ libseed/seed-builtins.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 3bc64bc628700f5ae7986c7326789254bfcb7981
@@ -17265,8 +18632,8 @@ Date:   Thu Jan 1 10:57:52 2009 +0000
     
     svn path=/trunk/; revision=618
 
- libseed/seed-closure.c |    5 +----
- ltmain.sh              |    4 ++--
+ libseed/seed-closure.c | 5 +----
+ ltmain.sh              | 4 ++--
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 commit 966168c861d75bc57c323b3d87c0823d8ba80815
@@ -17277,7 +18644,7 @@ Date:   Thu Jan 1 05:40:17 2009 +0000
     
     svn path=/trunk/; revision=616
 
- modules/readline/Makefile.am |    3 ++-
+ modules/readline/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit e9e0f887b00445dd177a40ffb136571f056b4165
@@ -17288,7 +18655,7 @@ Date:   Thu Jan 1 05:37:43 2009 +0000
     
     svn path=/trunk/; revision=615
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6090567f694a86b7d2363a91554fb8326baaa6e5
@@ -17299,7 +18666,7 @@ Date:   Wed Dec 31 10:55:54 2008 +0000
     
     svn path=/trunk/; revision=613
 
- libseed/seed-engine.c |    4 ++--
+ libseed/seed-engine.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 79018e9bbc061727918ce75aece682a304f5ff60
@@ -17310,7 +18677,7 @@ Date:   Wed Dec 31 10:15:21 2008 +0000
     
     svn path=/trunk/; revision=612
 
- ChangeLog |   26 +++++++++++++++++++++-----
+ ChangeLog | 26 +++++++++++++++++++++-----
  1 file changed, 21 insertions(+), 5 deletions(-)
 
 commit f82d4f05300de954db3af03dfcb89ef1c46ad67a
@@ -17322,9 +18689,9 @@ Date:   Wed Dec 31 09:37:39 2008 +0000
     
     svn path=/trunk/; revision=611
 
- libseed/seed-engine.c  |   16 +++-------------
- libseed/seed-signals.c |    4 ++--
- libseed/seed-structs.c |   46 +++++++++++++++++++++++++++-------------------
+ libseed/seed-engine.c  | 16 +++-------------
+ libseed/seed-signals.c |  4 ++--
+ libseed/seed-structs.c | 46 +++++++++++++++++++++++++++-------------------
  3 files changed, 32 insertions(+), 34 deletions(-)
 
 commit 12533e957828a09a48098b7b42acf01639830cb3
@@ -17335,7 +18702,7 @@ Date:   Wed Dec 31 08:58:47 2008 +0000
     
     svn path=/trunk/; revision=610
 
- libseed/seed-closure.c |    2 +-
+ libseed/seed-closure.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c1d58f9ec1ff07a5cbaacf58e0592c5216e6084e
@@ -17346,7 +18713,7 @@ Date:   Wed Dec 31 08:38:01 2008 +0000
     
     svn path=/trunk/; revision=609
 
- libseed/seed-types.c |    1 +
+ libseed/seed-types.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 172d14ad5ca466033bbe3984e3cc88c53f1de824
@@ -17357,8 +18724,8 @@ Date:   Wed Dec 31 08:34:06 2008 +0000
     
     svn path=/trunk/; revision=608
 
- libseed/seed-closure.c |    3 +++
- libseed/seed-engine.c  |    2 ++
+ libseed/seed-closure.c | 3 +++
+ libseed/seed-engine.c  | 2 ++
  2 files changed, 5 insertions(+)
 
 commit 0659f523c2d129261927ced1cfd542d4040ca023
@@ -17369,7 +18736,7 @@ Date:   Wed Dec 31 08:24:58 2008 +0000
     
     svn path=/trunk/; revision=607
 
- libseed/seed-closure.c |    9 ++++++++-
+ libseed/seed-closure.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 06e53a2b732d0a4ff7cbd3762da3ffc7693ebef8
@@ -17381,7 +18748,7 @@ Date:   Wed Dec 31 06:27:51 2008 +0000
     
     svn path=/trunk/; revision=606
 
- libseed/seed-signals.c |   16 ++++++++++------
+ libseed/seed-signals.c | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 commit 89e8c322c82aec5eff323d51ce08a45405451707
@@ -17392,8 +18759,8 @@ Date:   Wed Dec 31 06:08:32 2008 +0000
     
     svn path=/trunk/; revision=605
 
- libseed/seed-engine.c |    7 +++----
- ltmain.sh             |    4 ++--
+ libseed/seed-engine.c | 7 +++----
+ ltmain.sh             | 4 ++--
  2 files changed, 5 insertions(+), 6 deletions(-)
 
 commit 8f1a5f169d9304a5479275c2b388f20e16016cbd
@@ -17404,7 +18771,7 @@ Date:   Wed Dec 31 06:08:19 2008 +0000
     
     svn path=/trunk/; revision=604
 
- libseed/seed-signals.c |   20 ++++++++++++++++++--
+ libseed/seed-signals.c | 20 ++++++++++++++++++--
  1 file changed, 18 insertions(+), 2 deletions(-)
 
 commit 2bda9e40074f55391d855dccae5856c35970d212
@@ -17417,7 +18784,7 @@ Date:   Wed Dec 31 05:47:00 2008 +0000
     
     svn path=/trunk/; revision=603
 
- libseed/seed-signals.c |    2 ++
+ libseed/seed-signals.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit c93095552d8b5d9456c6765864b9ad1323ca44e1
@@ -17429,8 +18796,8 @@ Date:   Wed Dec 31 05:40:59 2008 +0000
     
     svn path=/trunk/; revision=602
 
- examples/lightsoff/arrow.js |    2 +-
- examples/lightsoff/score.js |    5 +++++
+ examples/lightsoff/arrow.js | 2 +-
+ examples/lightsoff/score.js | 5 +++++
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit df0037faffa373471b87f0eb0d8bffc025d3d31a
@@ -17442,8 +18809,8 @@ Date:   Wed Dec 31 05:28:16 2008 +0000
     
     svn path=/trunk/; revision=601
 
- tests/Makefile.am      |    1 -
- tests/gtype-signal2.js |   34 ----------------------------------
+ tests/Makefile.am      |  1 -
+ tests/gtype-signal2.js | 34 ----------------------------------
  2 files changed, 35 deletions(-)
 
 commit bf9b6691df7063c65d8bb7dbca989329f0a5167d
@@ -17454,7 +18821,7 @@ Date:   Wed Dec 31 05:23:21 2008 +0000
     
     svn path=/trunk/; revision=600
 
- libseed/seed-engine.c |   16 +++++++++-------
+ libseed/seed-engine.c | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 commit ce6f12fe2c1378c80efbfe64e1c8804071c8befb
@@ -17465,9 +18832,9 @@ Date:   Wed Dec 31 04:47:11 2008 +0000
     
     svn path=/trunk/; revision=599
 
- libseed/seed-engine.c  |    1 -
- ltmain.sh              |    4 ++--
- tests/gtype-signal2.js |    4 ++--
+ libseed/seed-engine.c  | 1 -
+ ltmain.sh              | 4 ++--
+ tests/gtype-signal2.js | 4 ++--
  3 files changed, 4 insertions(+), 5 deletions(-)
 
 commit d4df240d43fe5af8162e61df3fed680e6358784e
@@ -17478,8 +18845,8 @@ Date:   Wed Dec 31 04:23:09 2008 +0000
     
     svn path=/trunk/; revision=598
 
- ChangeLog    |    6 +++---
- configure.ac |    2 +-
+ ChangeLog    | 6 +++---
+ configure.ac | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 2879ccbdc3977b8b943bbf6a29cfb17d3e9565f8
@@ -17490,7 +18857,7 @@ Date:   Wed Dec 31 04:19:09 2008 +0000
     
     svn path=/trunk/; revision=597
 
- ChangeLog |    6 +++---
+ ChangeLog | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 5bab00848ed1c0e852caa01a768514cf44db1f41
@@ -17501,8 +18868,8 @@ Date:   Wed Dec 31 04:16:07 2008 +0000
     
     svn path=/trunk/; revision=596
 
- ChangeLog                    |   53 ++++++++++++++++++++++++++++++++++++++++++
- doc/reference/tmpl/seed.sgml |    2 +-
+ ChangeLog                    | 53 ++++++++++++++++++++++++++++++++++++++++++++
+ doc/reference/tmpl/seed.sgml |  2 +-
  2 files changed, 54 insertions(+), 1 deletion(-)
 
 commit 5530077fe3ad29cf5bb705c200c100416ecfe410
@@ -17513,7 +18880,7 @@ Date:   Wed Dec 31 04:01:45 2008 +0000
     
     svn path=/trunk/; revision=595
 
- examples/HACKING |   20 +++++++++++---------
+ examples/HACKING | 20 +++++++++++---------
  1 file changed, 11 insertions(+), 9 deletions(-)
 
 commit ed21cb5e568b5621f0fee373033646ee9704c43d
@@ -17524,9 +18891,9 @@ Date:   Wed Dec 31 03:51:24 2008 +0000
     
     svn path=/trunk/; revision=594
 
- examples/turtle/turtle.c |    3 ++-
- examples/vte-test.js     |    1 +
- tests/spawn.js           |    8 ++++++++
+ examples/turtle/turtle.c | 3 ++-
+ examples/vte-test.js     | 1 +
+ tests/spawn.js           | 8 ++++++++
  3 files changed, 11 insertions(+), 1 deletion(-)
 
 commit ea8339c9c831dbb4c26fcb1495a168fa43a7708a
@@ -17537,7 +18904,7 @@ Date:   Wed Dec 31 03:37:13 2008 +0000
     
     svn path=/trunk/; revision=593
 
- examples/lightsoff/Makefile.am |    2 --
+ examples/lightsoff/Makefile.am | 2 --
  1 file changed, 2 deletions(-)
 
 commit 732e65fc86346e9ed315b5a9b7bf8d885312220e
@@ -17548,9 +18915,9 @@ Date:   Wed Dec 31 03:30:00 2008 +0000
     
     svn path=/trunk/; revision=592
 
- examples/lightsoff/board.js |   88 ++++++++++++++++++++++++-------------------
- examples/lightsoff/main.js  |    6 ++-
- examples/lightsoff/score.js |    3 ++
+ examples/lightsoff/board.js | 88 +++++++++++++++++++++++++--------------------
+ examples/lightsoff/main.js  |  6 ++--
+ examples/lightsoff/score.js |  3 ++
  3 files changed, 57 insertions(+), 40 deletions(-)
 
 commit 25eb72797fea5df1c2302b253643130a07fb4cdc
@@ -17561,12 +18928,12 @@ Date:   Wed Dec 31 03:14:32 2008 +0000
     
     svn path=/trunk/; revision=591
 
- examples/lightsoff/arrow.js |    6 +--
- examples/lightsoff/board.js |   12 +++---
- examples/lightsoff/light.js |   41 +++++++++++--------
- examples/lightsoff/main.js  |    4 +-
- examples/lightsoff/menu.js  |   43 --------------------
- examples/lightsoff/score.js |   91 +++++++++++++++++++++++--------------------
+ examples/lightsoff/arrow.js |  6 +--
+ examples/lightsoff/board.js | 12 +++---
+ examples/lightsoff/light.js | 41 +++++++++++---------
+ examples/lightsoff/main.js  |  4 +-
+ examples/lightsoff/menu.js  | 43 ---------------------
+ examples/lightsoff/score.js | 91 ++++++++++++++++++++++++---------------------
  6 files changed, 83 insertions(+), 114 deletions(-)
 
 commit a4ef4990c8a672dfb51d615e1bc03069bb45d76f
@@ -17577,9 +18944,9 @@ Date:   Wed Dec 31 02:23:46 2008 +0000
     
     svn path=/trunk/; revision=590
 
- examples/lightsoff/arrow.js |    2 --
- examples/lightsoff/board.js |   18 +++++++++---------
- examples/lightsoff/light.js |   28 ++++++++++++++--------------
+ examples/lightsoff/arrow.js |  2 --
+ examples/lightsoff/board.js | 18 +++++++++---------
+ examples/lightsoff/light.js | 28 ++++++++++++++--------------
  3 files changed, 23 insertions(+), 25 deletions(-)
 
 commit 9d36c136c2007bdb74c04942f23415cb985677e8
@@ -17590,11 +18957,11 @@ Date:   Wed Dec 31 02:10:13 2008 +0000
     
     svn path=/trunk/; revision=589
 
- examples/lightsoff/arrow.js |   91 ++++++++++++++++++++-----------------------
- examples/lightsoff/board.js |   22 +++++------
- examples/lightsoff/light.js |   26 ++++++-------
- examples/lightsoff/menu.js  |   68 ++++++++++++++++----------------
- examples/lightsoff/score.js |   24 ++++++------
+ examples/lightsoff/arrow.js | 91 +++++++++++++++++++++------------------------
+ examples/lightsoff/board.js | 22 +++++------
+ examples/lightsoff/light.js | 26 ++++++-------
+ examples/lightsoff/menu.js  | 68 ++++++++++++++++-----------------
+ examples/lightsoff/score.js | 24 ++++++------
  5 files changed, 113 insertions(+), 118 deletions(-)
 
 commit 787acbb6c11c955a091a6a0d2ab13792c7d89288
@@ -17605,8 +18972,8 @@ Date:   Wed Dec 31 01:53:52 2008 +0000
     
     svn path=/trunk/; revision=588
 
- examples/video.js    |    3 ---
- examples/vte-test.js |    6 +++---
+ examples/video.js    | 3 ---
+ examples/vte-test.js | 6 +++---
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 commit 31a7cefe68f0913455d7ee6fb179213f9eaa4358
@@ -17617,12 +18984,12 @@ Date:   Wed Dec 31 01:48:35 2008 +0000
     
     svn path=/trunk/; revision=587
 
- examples/ls.js            |    8 +-
- examples/n-oscillator.js  |    7 +-
- examples/poppler.js       |  179 +++++++++++++++++++++++----------------------
- examples/soup.js          |   13 ++--
- examples/threaded-repl.js |    4 +-
- extensions/Seed.js        |   22 +++++-
+ examples/ls.js            |   8 ++-
+ examples/n-oscillator.js  |   7 +-
+ examples/poppler.js       | 179 +++++++++++++++++++++++-----------------------
+ examples/soup.js          |  13 ++--
+ examples/threaded-repl.js |   4 +-
+ extensions/Seed.js        |  22 +++++-
  6 files changed, 127 insertions(+), 106 deletions(-)
 
 commit 13f250e876e863090b3dc54edb1f4c413a0d0417
@@ -17633,9 +19000,9 @@ Date:   Wed Dec 31 01:27:15 2008 +0000
     
     svn path=/trunk/; revision=586
 
- examples/gtkplug.js      |    5 ++++-
- examples/introspect.js   |   11 +++++++----
- examples/json-packing.js |   36 ++++++++++++++++++++++--------------
+ examples/gtkplug.js      |  5 ++++-
+ examples/introspect.js   | 11 +++++++----
+ examples/json-packing.js | 36 ++++++++++++++++++++++--------------
  3 files changed, 33 insertions(+), 19 deletions(-)
 
 commit cdfaea341519fe692c8f20fca3846f04a138fb7e
@@ -17646,8 +19013,8 @@ Date:   Wed Dec 31 01:18:55 2008 +0000
     
     svn path=/trunk/; revision=585
 
- examples/clutter-cairo.js |    1 +
- examples/clutter.js       |  103 ++++++++++++++++++++++-----------------------
+ examples/clutter-cairo.js |   1 +
+ examples/clutter.js       | 103 ++++++++++++++++++++++------------------------
  2 files changed, 51 insertions(+), 53 deletions(-)
 
 commit 9bfc55f818d482aff043103a1dfaa2972e33df34
@@ -17658,7 +19025,7 @@ Date:   Wed Dec 31 01:05:56 2008 +0000
     
     svn path=/trunk/; revision=584
 
- examples/actions.js |   42 ++++++++++++++++++++----------------------
+ examples/actions.js | 42 ++++++++++++++++++++----------------------
  1 file changed, 20 insertions(+), 22 deletions(-)
 
 commit 1b081c61dbe59d6926c40d2c904bcb182a647a5e
@@ -17669,7 +19036,7 @@ Date:   Wed Dec 31 01:02:14 2008 +0000
     
     svn path=/trunk/; revision=583
 
- examples/accelgroup.js |   25 +++++++++++++------------
+ examples/accelgroup.js | 25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
 
 commit fcfce7ae3c3c3e82900aa11b0b0308879672f4e3
@@ -17680,9 +19047,11 @@ Date:   Wed Dec 31 00:14:29 2008 +0000
     
     svn path=/trunk/; revision=582
 
- doc/Makefile.am           |    8 ++++++--
- doc/reference/Makefile.am |    3 +--
- 2 files changed, 7 insertions(+), 4 deletions(-)
+ doc/Makefile.am               | 8 ++++++--
+ doc/reference/Makefile.am     | 3 +--
+ doc/reference/html/index.html | 0
+ doc/reference/xml/index.xml   | 0
+ 4 files changed, 7 insertions(+), 4 deletions(-)
 
 commit 26d57b25a2b9511bc9a1bc42d2d339dce5de0474
 Author: Tim Horton <hortont@src.gnome.org>
@@ -17692,7 +19061,7 @@ Date:   Tue Dec 30 23:30:40 2008 +0000
     
     svn path=/trunk/; revision=581
 
- README |   24 +++++++++++++++++++++++-
+ README | 24 +++++++++++++++++++++++-
  1 file changed, 23 insertions(+), 1 deletion(-)
 
 commit 074913c36993b5dea6f033cd91d702bb7e38ebb4
@@ -17703,22 +19072,22 @@ Date:   Tue Dec 30 08:36:02 2008 +0000
     
     svn path=/trunk/; revision=580
 
- libseed/seed-api.c        |   39 +++---
- libseed/seed-builtins.c   |   53 ++++-----
- libseed/seed-closure.c    |   28 ++---
- libseed/seed-closure.h    |    2 +-
- libseed/seed-engine.c     |  161 +++++++++++--------------
- libseed/seed-engine.h     |    2 +-
- libseed/seed-exceptions.c |   21 ++--
- libseed/seed-gtype.c      |   55 ++++-----
- libseed/seed-private.h    |    2 +-
- libseed/seed-signals.c    |   93 +++++++--------
- libseed/seed-signals.h    |    2 +-
- libseed/seed-structs.c    |  174 ++++++++++++---------------
- libseed/seed-structs.h    |   19 ++-
- libseed/seed-types.c      |  291 ++++++++++++++++++---------------------------
- libseed/seed-types.h      |   85 +++++--------
- libseed/seed.h            |  223 +++++++++++++++-------------------
+ libseed/seed-api.c        |  39 +++----
+ libseed/seed-builtins.c   |  53 ++++-----
+ libseed/seed-closure.c    |  28 ++---
+ libseed/seed-closure.h    |   2 +-
+ libseed/seed-engine.c     | 161 ++++++++++++-------------
+ libseed/seed-engine.h     |   2 +-
+ libseed/seed-exceptions.c |  21 ++--
+ libseed/seed-gtype.c      |  55 ++++-----
+ libseed/seed-private.h    |   2 +-
+ libseed/seed-signals.c    |  93 +++++++--------
+ libseed/seed-signals.h    |   2 +-
+ libseed/seed-structs.c    | 174 ++++++++++++---------------
+ libseed/seed-structs.h    |  19 ++-
+ libseed/seed-types.c      | 291 +++++++++++++++++++---------------------------
+ libseed/seed-types.h      |  85 +++++---------
+ libseed/seed.h            | 223 +++++++++++++++--------------------
  16 files changed, 525 insertions(+), 725 deletions(-)
 
 commit 10595d67fbd52a86500fe8847145eeb0adb5a552
@@ -17730,7 +19099,7 @@ Date:   Tue Dec 30 08:15:07 2008 +0000
     
     svn path=/trunk/; revision=579
 
- doc/tutorial-standalone/tutorial.html |   92 ++++++++++++++++-----------------
+ doc/tutorial-standalone/tutorial.html | 92 +++++++++++++++++------------------
  1 file changed, 45 insertions(+), 47 deletions(-)
 
 commit 40d5fc9696085050db55debe972f5d7f877ca3ed
@@ -17741,7 +19110,7 @@ Date:   Tue Dec 30 06:50:01 2008 +0000
     
     svn path=/trunk/; revision=578
 
- doc/tutorial-standalone/tutorial.html |   65 ++++++++++++++++++++++++++++++++-
+ doc/tutorial-standalone/tutorial.html | 65 ++++++++++++++++++++++++++++++++++-
  1 file changed, 64 insertions(+), 1 deletion(-)
 
 commit 93ff82868333fae764a9b442750c5f693455f9cd
@@ -17752,7 +19121,7 @@ Date:   Tue Dec 30 06:21:00 2008 +0000
     
     svn path=/trunk/; revision=577
 
- doc/tutorial-standalone/tutorial.html |   36 ++++++++++++++++++---------------
+ doc/tutorial-standalone/tutorial.html | 36 +++++++++++++++++++----------------
  1 file changed, 20 insertions(+), 16 deletions(-)
 
 commit e89b6e6bb25c409be97fc069bf6533a117cb9504
@@ -17763,7 +19132,7 @@ Date:   Tue Dec 30 05:26:02 2008 +0000
     
     svn path=/trunk/; revision=576
 
- doc/tutorial-standalone/tutorial.html |   51 +++++++++++++++++----------------
+ doc/tutorial-standalone/tutorial.html | 51 ++++++++++++++++++-----------------
  1 file changed, 26 insertions(+), 25 deletions(-)
 
 commit 4c1c6c67cf9ff1278f7bcd9fccfac1b1d69d88c1
@@ -17775,9 +19144,9 @@ Date:   Tue Dec 30 04:22:56 2008 +0000
     
     svn path=/trunk/; revision=575
 
- doc/sh.css                            |    2 +-
- doc/style.css                         |    5 -----
- doc/tutorial-standalone/tutorial.html |   28 +++++++++++++++++-----------
+ doc/sh.css                            |  2 +-
+ doc/style.css                         |  5 -----
+ doc/tutorial-standalone/tutorial.html | 28 +++++++++++++++++-----------
  3 files changed, 18 insertions(+), 17 deletions(-)
 
 commit ebf64c4d51022ed7ced9e71348c2816aa96f499b
@@ -17788,9 +19157,9 @@ Date:   Mon Dec 29 11:26:31 2008 +0000
     
     svn path=/trunk/; revision=574
 
- doc/tutorial-standalone/packing.png   |  Bin 8794 -> 14227 bytes
- doc/tutorial-standalone/packing.svg   |   57 ++++++++++++++++++--------
- doc/tutorial-standalone/tutorial.html |   71 +++++++++++++++++++++++----------
+ doc/tutorial-standalone/packing.png   | Bin 8794 -> 14227 bytes
+ doc/tutorial-standalone/packing.svg   |  57 +++++++++++++++++++--------
+ doc/tutorial-standalone/tutorial.html |  71 +++++++++++++++++++++++-----------
  3 files changed, 89 insertions(+), 39 deletions(-)
 
 commit dc9671239cd814725083deb4e09457c28f5c88f4
@@ -17801,9 +19170,9 @@ Date:   Mon Dec 29 11:08:40 2008 +0000
     
     svn path=/trunk/; revision=573
 
- doc/sh.css                            |    2 +-
- doc/style.css                         |    7 +--
- doc/tutorial-standalone/tutorial.html |   89 ++++++++++++++++-----------------
+ doc/sh.css                            |  2 +-
+ doc/style.css                         |  7 +--
+ doc/tutorial-standalone/tutorial.html | 89 +++++++++++++++++------------------
  3 files changed, 48 insertions(+), 50 deletions(-)
 
 commit 529fa2f0dd9ec564205c9ff98b14914257b0db05
@@ -17814,8 +19183,8 @@ Date:   Mon Dec 29 10:37:53 2008 +0000
     
     svn path=/trunk/; revision=572
 
- doc/conventions.html                  |   30 +++++++++++++
- doc/tutorial-standalone/tutorial.html |   76 ++++++++++++++-------------------
+ doc/conventions.html                  | 30 ++++++++++++++
+ doc/tutorial-standalone/tutorial.html | 76 +++++++++++++++--------------------
  2 files changed, 62 insertions(+), 44 deletions(-)
 
 commit f9d72afbf96c527f341cff663800ff0893e070b1
@@ -17827,8 +19196,8 @@ Date:   Sun Dec 28 22:22:53 2008 +0000
     
     svn path=/trunk/; revision=571
 
- doc/tutorial-standalone/2.js |    1 +
- doc/tutorial-standalone/3.js |    1 +
+ doc/tutorial-standalone/2.js | 1 +
+ doc/tutorial-standalone/3.js | 1 +
  2 files changed, 2 insertions(+)
 
 commit ec442b7b315b0333f991450c40c51bc52794abb3
@@ -17839,7 +19208,7 @@ Date:   Sun Dec 28 22:19:50 2008 +0000
     
     svn path=/trunk/; revision=570
 
- autogen.sh |    8 +++++++-
+ autogen.sh | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 70e353dfa047a2d0a9200d9b8bbd0426bfd7bd56
@@ -17850,7 +19219,7 @@ Date:   Sun Dec 28 04:16:08 2008 +0000
     
     svn path=/trunk/; revision=569
 
- doc/tutorial-standalone/1.js |   21 ++++++++++++---------
+ doc/tutorial-standalone/1.js | 21 ++++++++++++---------
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 commit f9e64fcca84e040dd98d2572b7ddfdd5f421d44e
@@ -17861,8 +19230,8 @@ Date:   Sun Dec 28 04:12:54 2008 +0000
     
     svn path=/trunk/; revision=568
 
- doc/tutorial-standalone/2.js |   99 ++-------------
- doc/tutorial-standalone/3.js |  285 +++++++++++++++++++++++++++++++-----------
+ doc/tutorial-standalone/2.js |  99 ++-------------
+ doc/tutorial-standalone/3.js | 285 ++++++++++++++++++++++++++++++++-----------
  2 files changed, 222 insertions(+), 162 deletions(-)
 
 commit 7a282eadc71315a3e8e6a3744ee1c202bfffd497
@@ -17873,7 +19242,7 @@ Date:   Sun Dec 28 04:03:42 2008 +0000
     
     svn path=/trunk/; revision=567
 
- doc/tutorial-standalone/2.js |   77 ++++++++++++++++++++++++------------------
+ doc/tutorial-standalone/2.js | 77 +++++++++++++++++++++++++-------------------
  1 file changed, 44 insertions(+), 33 deletions(-)
 
 commit de2706df74f3bea3e5dfbf77210016143eaabaa1
@@ -17884,7 +19253,7 @@ Date:   Sun Dec 28 03:40:53 2008 +0000
     
     svn path=/trunk/; revision=566
 
- doc/tutorial-standalone/2.js |    9 +++++----
+ doc/tutorial-standalone/2.js | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit da7c6138503d2e649a5135175b600641744fc8e3
@@ -17895,7 +19264,7 @@ Date:   Sun Dec 28 03:24:30 2008 +0000
     
     svn path=/trunk/; revision=565
 
- doc/tutorial-standalone/2.js |  236 ++++++++++++++++++++++++++++++------------
+ doc/tutorial-standalone/2.js | 236 ++++++++++++++++++++++++++++++-------------
  1 file changed, 168 insertions(+), 68 deletions(-)
 
 commit 7df3f25986088d93114c1f9ba192cacc2d61cecd
@@ -17906,7 +19275,7 @@ Date:   Sat Dec 27 23:41:39 2008 +0000
     
     svn path=/trunk/; revision=564
 
- doc/sh.css |   67 +-----------------------------------------------------------
+ doc/sh.css | 67 +-------------------------------------------------------------
  1 file changed, 1 insertion(+), 66 deletions(-)
 
 commit dd89b495f7167a7a311f870602545607eb4a4d9d
@@ -17920,12 +19289,12 @@ Date:   Sat Dec 27 23:39:39 2008 +0000
     
     svn path=/trunk/; revision=563
 
- doc/modules/readline.html             |   11 +-
- doc/runtime.html                      |   39 ++--
- doc/sh.css                            |   66 +++++++
- doc/sh.js                             |    4 +
- doc/sh_js.js                          |  347 +++++++++++++++++++++++++++++++++
- doc/tutorial-standalone/tutorial.html |   51 ++---
+ doc/modules/readline.html             |  11 +-
+ doc/runtime.html                      |  39 ++--
+ doc/sh.css                            |  66 +++++++
+ doc/sh.js                             |   4 +
+ doc/sh_js.js                          | 347 ++++++++++++++++++++++++++++++++++
+ doc/tutorial-standalone/tutorial.html |  51 ++---
  6 files changed, 472 insertions(+), 46 deletions(-)
 
 commit 4b577ec9555131d0a649afe57016fbff42b77f85
@@ -17936,7 +19305,7 @@ Date:   Wed Dec 24 08:17:07 2008 +0000
     
     svn path=/trunk/; revision=562
 
- doc/tutorial-standalone/2.js |   39 ++++++++++++++++++++++++++++-----------
+ doc/tutorial-standalone/2.js | 39 ++++++++++++++++++++++++++++-----------
  1 file changed, 28 insertions(+), 11 deletions(-)
 
 commit b8f1d1a2fd27d3d641ce7353a9142b01802c4a09
@@ -17948,7 +19317,7 @@ Date:   Wed Dec 24 07:53:29 2008 +0000
     
     svn path=/trunk/; revision=561
 
- libseed/seed-gtype.c |    2 ++
+ libseed/seed-gtype.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 7cd511a3d5ce42b5c4497148f0079bae93aa47a6
@@ -17959,8 +19328,8 @@ Date:   Wed Dec 24 07:38:21 2008 +0000
     
     svn path=/trunk/; revision=560
 
- doc/tutorial-standalone/1.js |   18 +++----
- doc/tutorial-standalone/2.js |  108 +++++++++++++++++++++---------------------
+ doc/tutorial-standalone/1.js |  18 ++++----
+ doc/tutorial-standalone/2.js | 108 ++++++++++++++++++++++---------------------
  2 files changed, 64 insertions(+), 62 deletions(-)
 
 commit 8edc465bb69ad101e278ec0fc37553fb8e5d38d1
@@ -17971,20 +19340,20 @@ Date:   Wed Dec 24 07:03:07 2008 +0000
     
     svn path=/trunk/; revision=559
 
- tests/c-module.js               |    2 +-
- tests/closure-finalization.js   |    2 +-
- tests/constructor-prototype.js  |    2 +-
- tests/function-info.js          |    2 +-
- tests/gtype-typerror.js         |    2 +-
- tests/include-syntax.js         |    2 +-
- tests/object-info.js            |    2 +-
- tests/signal-exception.js       |    2 +-
- tests/struct-constructor.js     |    2 +-
- tests/struct-enumerate.js       |    2 +-
- tests/struct-nested-set.js      |    2 +-
- tests/struct-offsets.js         |    2 +-
- tests/struct-set-member.js      |    2 +-
- tests/struct-union-enumerate.js |    2 +-
+ tests/c-module.js               | 2 +-
+ tests/closure-finalization.js   | 2 +-
+ tests/constructor-prototype.js  | 2 +-
+ tests/function-info.js          | 2 +-
+ tests/gtype-typerror.js         | 2 +-
+ tests/include-syntax.js         | 2 +-
+ tests/object-info.js            | 2 +-
+ tests/signal-exception.js       | 2 +-
+ tests/struct-constructor.js     | 2 +-
+ tests/struct-enumerate.js       | 2 +-
+ tests/struct-nested-set.js      | 2 +-
+ tests/struct-offsets.js         | 2 +-
+ tests/struct-set-member.js      | 2 +-
+ tests/struct-union-enumerate.js | 2 +-
  14 files changed, 14 insertions(+), 14 deletions(-)
 
 commit ae285ed2845947f9843de4334a1533b80dd914e8
@@ -17995,7 +19364,7 @@ Date:   Wed Dec 24 02:06:16 2008 +0000
     
     svn path=/trunk/; revision=558
 
- doc/tutorial-standalone/2.js |   20 +++++++++++++++-----
+ doc/tutorial-standalone/2.js | 20 +++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 commit 56ccba4dadf39af820a4a95f3354532ecd98ca6e
@@ -18006,8 +19375,8 @@ Date:   Wed Dec 24 01:47:27 2008 +0000
     
     svn path=/trunk/; revision=557
 
- doc/tutorial-standalone/1.js |   24 ++++++++++++------------
- doc/tutorial-standalone/2.js |   28 ++++++++++++++--------------
+ doc/tutorial-standalone/1.js | 24 ++++++++++++------------
+ doc/tutorial-standalone/2.js | 28 ++++++++++++++--------------
  2 files changed, 26 insertions(+), 26 deletions(-)
 
 commit d197c9eeb9f3724a9b46fbdea92b2c50b5016b52
@@ -18018,7 +19387,7 @@ Date:   Wed Dec 24 01:41:25 2008 +0000
     
     svn path=/trunk/; revision=556
 
- doc/tutorial-standalone/2.js |    5 ++++-
+ doc/tutorial-standalone/2.js | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit f08e886d140f6bb50c36e8ee09175b03ad8d8986
@@ -18029,7 +19398,7 @@ Date:   Wed Dec 24 01:30:21 2008 +0000
     
     svn path=/trunk/; revision=555
 
- doc/tutorial-standalone/2.js |  129 ++++++++++++++++++++++--------------------
+ doc/tutorial-standalone/2.js | 129 +++++++++++++++++++++++--------------------
  1 file changed, 69 insertions(+), 60 deletions(-)
 
 commit 46168cfed54bc3f5d017371ee3c552002d46f262
@@ -18040,8 +19409,8 @@ Date:   Tue Dec 23 09:55:10 2008 +0000
     
     svn path=/trunk/; revision=554
 
- doc/runtime.html             |   32 ++++++++++++++++----------------
- doc/tutorial-standalone/1.js |    5 ++---
+ doc/runtime.html             | 32 ++++++++++++++++----------------
+ doc/tutorial-standalone/1.js |  5 ++---
  2 files changed, 18 insertions(+), 19 deletions(-)
 
 commit fc44f920ee7548830d677cc85a0e407314802424
@@ -18052,7 +19421,7 @@ Date:   Tue Dec 23 09:40:05 2008 +0000
     
     svn path=/trunk/; revision=553
 
- doc/tutorial-standalone/1.js |   35 ++++++++++++++++++++---------------
+ doc/tutorial-standalone/1.js | 35 ++++++++++++++++++++---------------
  1 file changed, 20 insertions(+), 15 deletions(-)
 
 commit f1ebe6a4dae2cff1b9f05f26fccebe7c4a0a1b72
@@ -18063,7 +19432,7 @@ Date:   Tue Dec 23 09:34:21 2008 +0000
     
     svn path=/trunk/; revision=552
 
- doc/tutorial-standalone/1.js |   70 ++++++++++++++++++++----------------------
+ doc/tutorial-standalone/1.js | 70 +++++++++++++++++++++-----------------------
  1 file changed, 33 insertions(+), 37 deletions(-)
 
 commit b6298c7ba9802b87cbc2e10db6f28564cf79af1a
@@ -18074,7 +19443,7 @@ Date:   Tue Dec 23 09:26:20 2008 +0000
     
     svn path=/trunk/; revision=551
 
- doc/tutorial-standalone/1.js |   63 ++++++++++++++++++------------------------
+ doc/tutorial-standalone/1.js | 63 +++++++++++++++++++-------------------------
  1 file changed, 27 insertions(+), 36 deletions(-)
 
 commit 8dca91ea19628f08744392b4b2cf9e08c6526237
@@ -18086,7 +19455,7 @@ Date:   Tue Dec 23 09:14:48 2008 +0000
     
     svn path=/trunk/; revision=550
 
- doc/runtime.html |   10 +++++-----
+ doc/runtime.html | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit ceeef72a77a0328add877a8efdb618343d9efdf1
@@ -18097,7 +19466,7 @@ Date:   Tue Dec 23 09:08:14 2008 +0000
     
     svn path=/trunk/; revision=549
 
- doc/runtime.html |    5 +++--
+ doc/runtime.html | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 0bba37441603d724962e33d66887686d498de001
@@ -18108,9 +19477,9 @@ Date:   Tue Dec 23 09:06:24 2008 +0000
     
     svn path=/trunk/; revision=548
 
- doc/modules/readline.html             |    2 +-
- doc/runtime.html                      |   15 ++++++++++-----
- doc/tutorial-standalone/tutorial.html |    7 +++++++
+ doc/modules/readline.html             |  2 +-
+ doc/runtime.html                      | 15 ++++++++++-----
+ doc/tutorial-standalone/tutorial.html |  7 +++++++
  3 files changed, 18 insertions(+), 6 deletions(-)
 
 commit ecaaa7e4b7aa68afb436e452bd85e2c7008185f8
@@ -18121,10 +19490,10 @@ Date:   Tue Dec 23 08:56:20 2008 +0000
     
     svn path=/trunk/; revision=547
 
- doc/modules/readline.html             |   66 +--------------------------------
- doc/runtime.html                      |    2 +-
- doc/style.css                         |    2 +-
- doc/tutorial-standalone/tutorial.html |    2 +-
+ doc/modules/readline.html             | 66 ++---------------------------------
+ doc/runtime.html                      |  2 +-
+ doc/style.css                         |  2 +-
+ doc/tutorial-standalone/tutorial.html |  2 +-
  4 files changed, 5 insertions(+), 67 deletions(-)
 
 commit 95064e7665fcb6fde79f407b2349129b925cbd90
@@ -18135,7 +19504,7 @@ Date:   Tue Dec 23 08:52:31 2008 +0000
     
     svn path=/trunk/; revision=546
 
- doc/Makefile.am |    4 +++-
+ doc/Makefile.am | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit cb07ca1351e7349c9ad5cd8401b6d03b57e33341
@@ -18146,9 +19515,9 @@ Date:   Tue Dec 23 08:51:58 2008 +0000
     
     svn path=/trunk/; revision=545
 
- doc/runtime.html                      |   64 +-------------------------------
- doc/style.css                         |   61 +++++++++++++++++++++++++++++++
- doc/tutorial-standalone/tutorial.html |   65 +--------------------------------
+ doc/runtime.html                      | 64 +---------------------------------
+ doc/style.css                         | 61 ++++++++++++++++++++++++++++++++
+ doc/tutorial-standalone/tutorial.html | 65 +----------------------------------
  3 files changed, 63 insertions(+), 127 deletions(-)
 
 commit def3ab4c9231738f218a8859e5b44b256b31d5dc
@@ -18159,7 +19528,7 @@ Date:   Tue Dec 23 08:00:39 2008 +0000
     
     svn path=/trunk/; revision=544
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 710f8e11529e65eef2ebbbab1c8734e7ebbb91c2
@@ -18170,7 +19539,7 @@ Date:   Tue Dec 23 07:38:26 2008 +0000
     
     svn path=/trunk/; revision=543
 
- examples/turtle/turtle.c |    2 +-
+ examples/turtle/turtle.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d8bf94ed57428a84e9e315533dd0b0fbc74272bc
@@ -18181,7 +19550,7 @@ Date:   Tue Dec 23 07:26:44 2008 +0000
     
     svn path=/trunk/; revision=542
 
- examples/browser/Makefile.am |    2 +-
+ examples/browser/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ea3d3b17b73a52a68cf1760efb257ed1eecd9a44
@@ -18192,8 +19561,8 @@ Date:   Tue Dec 23 07:22:16 2008 +0000
     
     svn path=/trunk/; revision=541
 
- examples/browser/COPYING   |  344 ++++++++++++++++++++++++++++++++++++++++++--
- examples/lightsoff/COPYING |  344 ++++++++++++++++++++++++++++++++++++++++++--
+ examples/browser/COPYING   | 344 +++++++++++++++++++++++++++++++++++++++++++--
+ examples/lightsoff/COPYING | 344 +++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 672 insertions(+), 16 deletions(-)
 
 commit df4a8308f6808803ce09348c3ebd037e2e1acbc0
@@ -18204,8 +19573,8 @@ Date:   Tue Dec 23 07:18:17 2008 +0000
     
     svn path=/trunk/; revision=540
 
- examples/lightsoff/arrow.js |   25 ++++++++++++++-----------
- examples/lightsoff/main.js  |    8 +++++---
+ examples/lightsoff/arrow.js | 25 ++++++++++++++-----------
+ examples/lightsoff/main.js  |  8 +++++---
  2 files changed, 19 insertions(+), 14 deletions(-)
 
 commit d7ecdc35bb6a24a10b2042f70fbab44ae53543f1
@@ -18216,10 +19585,10 @@ Date:   Tue Dec 23 06:56:58 2008 +0000
     
     svn path=/trunk/; revision=539
 
- examples/lightsoff/arrow.js |   10 +++++++++-
- examples/lightsoff/board.js |   11 ++++++++++-
- examples/lightsoff/main.js  |   11 +++++++++++
- examples/lightsoff/score.js |    2 +-
+ examples/lightsoff/arrow.js | 10 +++++++++-
+ examples/lightsoff/board.js | 11 ++++++++++-
+ examples/lightsoff/main.js  | 11 +++++++++++
+ examples/lightsoff/score.js |  2 +-
  4 files changed, 31 insertions(+), 3 deletions(-)
 
 commit a11ce10fc58ea67a137b3c254b6bc37267d3f99b
@@ -18230,11 +19599,11 @@ Date:   Tue Dec 23 06:23:55 2008 +0000
     
     svn path=/trunk/; revision=538
 
- examples/browser/browser-actions.js |   23 +++++++++++++++++++++++
- examples/browser/browser-find.js    |    6 +++---
- examples/browser/browser-menu.js    |   20 +++++++++++++++++++-
- examples/browser/browser-tab.js     |    4 ++++
- examples/browser/main.js            |    9 ++++++++-
+ examples/browser/browser-actions.js | 23 +++++++++++++++++++++++
+ examples/browser/browser-find.js    |  6 +++---
+ examples/browser/browser-menu.js    | 20 +++++++++++++++++++-
+ examples/browser/browser-tab.js     |  4 ++++
+ examples/browser/main.js            |  9 ++++++++-
  5 files changed, 57 insertions(+), 5 deletions(-)
 
 commit ae90a8a55854022788173c801f08aef314465518
@@ -18245,7 +19614,7 @@ Date:   Tue Dec 23 03:37:54 2008 +0000
     
     svn path=/trunk/; revision=537
 
- libseed/seed-types.c |  102 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ libseed/seed-types.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 98 insertions(+), 4 deletions(-)
 
 commit 3c59d38d38b7fa6b06eadf37d9a2fe377ab25cdd
@@ -18278,7 +19647,7 @@ Date:   Mon Dec 22 23:18:48 2008 +0000
     
     svn path=/trunk/; revision=535
 
- doc/tutorial-standalone/tutorial.html |   11 +++++++----
+ doc/tutorial-standalone/tutorial.html | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit dc13976c8aaf658299f6f2b89d4e146df458ed72
@@ -18289,7 +19658,7 @@ Date:   Mon Dec 22 23:12:36 2008 +0000
     
     svn path=/trunk/; revision=534
 
- doc/runtime.html |    4 ++--
+ doc/runtime.html | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c541885f8027a5067d7441ebca4b92c7df4c3d3f
@@ -18301,7 +19670,7 @@ Date:   Sun Dec 21 21:18:27 2008 +0000
     
     svn path=/trunk/; revision=533
 
- examples/browser/Makefile.am~ |   51 -----------------------------------------
+ examples/browser/Makefile.am~ | 51 -------------------------------------------
  1 file changed, 51 deletions(-)
 
 commit 07cde4b0b037353c1446112242ff478dbb20b657
@@ -18312,7 +19681,7 @@ Date:   Sun Dec 21 07:00:45 2008 +0000
     
     svn path=/trunk/; revision=532
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit c5c02377e99bad264484d4eef6c5812f1d32c4cf
@@ -18324,22 +19693,22 @@ Date:   Sun Dec 21 06:19:17 2008 +0000
     
     svn path=/trunk/; revision=531
 
- examples/COPYING                      |    6 +
- examples/Makefile.am                  |    2 +
- examples/browser/COPYING              |   11 ++
- examples/browser/Makefile.am          |   24 +++
- examples/browser/Makefile.am~         |   51 ++++++
- examples/browser/browser-actions.js   |  324 +++++++++++++++++++++++++++++++++
- examples/browser/browser-bookmarks.js |   54 ++++++
- examples/browser/browser-find.js      |   39 ++++
- examples/browser/browser-main.js      |   24 +++
- examples/browser/browser-menu.js      |  130 +++++++++++++
- examples/browser/browser-tab.js       |  156 ++++++++++++++++
- examples/browser/browser-toolbar.js   |   25 +++
- examples/browser/main.js              |  112 ++++++++++++
- examples/lightsoff/COPYING            |   11 ++
- tests/COPYING                         |    1 +
- tests/Makefile.am                     |    1 +
+ examples/COPYING                      |   6 +
+ examples/Makefile.am                  |   2 +
+ examples/browser/COPYING              |  11 ++
+ examples/browser/Makefile.am          |  24 +++
+ examples/browser/Makefile.am~         |  51 ++++++
+ examples/browser/browser-actions.js   | 324 ++++++++++++++++++++++++++++++++++
+ examples/browser/browser-bookmarks.js |  54 ++++++
+ examples/browser/browser-find.js      |  39 ++++
+ examples/browser/browser-main.js      |  24 +++
+ examples/browser/browser-menu.js      | 130 ++++++++++++++
+ examples/browser/browser-tab.js       | 156 ++++++++++++++++
+ examples/browser/browser-toolbar.js   |  25 +++
+ examples/browser/main.js              | 112 ++++++++++++
+ examples/lightsoff/COPYING            |  11 ++
+ tests/COPYING                         |   1 +
+ tests/Makefile.am                     |   1 +
  16 files changed, 971 insertions(+)
 
 commit 8c41fa486f28b84acfe79a2fbdd07cdf3a89e6e8
@@ -18351,16 +19720,16 @@ Date:   Sun Dec 21 06:09:04 2008 +0000
     
     svn path=/trunk/; revision=530
 
- COPYING                 |  826 +++++++++--------------------------------------
- libseed/seed-api.c      |   17 +
- libseed/seed-builtins.c |   36 ++-
- libseed/seed-closure.c  |   36 ++-
- libseed/seed-engine.c   |   33 +-
- libseed/seed-gtype.c    |   33 +-
- libseed/seed-signals.c  |   33 +-
- libseed/seed-structs.c  |   33 +-
- libseed/seed-types.c    |   36 ++-
- libseed/seed.h          |   32 +-
+ COPYING                 | 826 +++++++++---------------------------------------
+ libseed/seed-api.c      |  17 +
+ libseed/seed-builtins.c |  36 ++-
+ libseed/seed-closure.c  |  36 ++-
+ libseed/seed-engine.c   |  33 +-
+ libseed/seed-gtype.c    |  33 +-
+ libseed/seed-signals.c  |  33 +-
+ libseed/seed-structs.c  |  33 +-
+ libseed/seed-types.c    |  36 ++-
+ libseed/seed.h          |  32 +-
  10 files changed, 311 insertions(+), 804 deletions(-)
 
 commit 32f5403a4a53676880574792812b8bf4c34d4192
@@ -18372,9 +19741,9 @@ Date:   Sun Dec 21 06:00:43 2008 +0000
     
     svn path=/trunk/; revision=529
 
- examples/lightsoff/board.js |    1 -
- examples/lightsoff/light.js |    4 +---
- libseed/seed-engine.c       |    7 +++----
+ examples/lightsoff/board.js | 1 -
+ examples/lightsoff/light.js | 4 +---
+ libseed/seed-engine.c       | 7 +++----
  3 files changed, 4 insertions(+), 8 deletions(-)
 
 commit 7bb1e61260e291b7c14dbe3296e6fbdb3e985011
@@ -18385,7 +19754,7 @@ Date:   Sun Dec 21 01:51:23 2008 +0000
     
     svn path=/trunk/; revision=528
 
- libseed/seed-engine.c |    1 -
+ libseed/seed-engine.c | 1 -
  1 file changed, 1 deletion(-)
 
 commit 83a92b200c960b78c3b8206428991411eb6b853e
@@ -18396,8 +19765,8 @@ Date:   Sun Dec 21 01:46:56 2008 +0000
     
     svn path=/trunk/; revision=527
 
- examples/lightsoff/board.js |    3 +++
- examples/lightsoff/light.js |    2 ++
+ examples/lightsoff/board.js | 3 +++
+ examples/lightsoff/light.js | 2 ++
  2 files changed, 5 insertions(+)
 
 commit d27966433d282d8ce91e1c9eca3367ec237a38d0
@@ -18408,8 +19777,8 @@ Date:   Sun Dec 21 01:46:48 2008 +0000
     
     svn path=/trunk/; revision=526
 
- libseed/seed-engine.c  |    8 ++++++--
- libseed/seed-signals.c |    4 ++--
+ libseed/seed-engine.c  | 8 ++++++--
+ libseed/seed-signals.c | 4 ++--
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit f3dfa0bb79ff4fca5e1964a8fe830a74e5d6e660
@@ -18420,9 +19789,9 @@ Date:   Sat Dec 20 21:31:06 2008 +0000
     
     svn path=/trunk/; revision=525
 
- examples/actions.js      |    2 +-
- examples/json-packing.js |    2 +-
- examples/poppler.js      |    2 +-
+ examples/actions.js      | 2 +-
+ examples/json-packing.js | 2 +-
+ examples/poppler.js      | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 71773fc6ee1a2dd956e57bb9610e0a72617a0721
@@ -18433,16 +19802,16 @@ Date:   Sat Dec 20 21:24:43 2008 +0000
     
     svn path=/trunk/; revision=524
 
- examples/Gnio-server.js   |    2 +-
- examples/Gnio.js          |    2 +-
- examples/calculator.js    |    2 +-
- examples/clutter-cairo.js |    2 +-
- examples/glib/env.js      |    2 +-
- examples/glib/thread.js   |    2 +-
- examples/glib/timeout.js  |    2 +-
- examples/glib/timer.js    |    2 +-
- examples/threaded-repl.js |    2 +-
- examples/video.js         |    2 +-
+ examples/Gnio-server.js   | 2 +-
+ examples/Gnio.js          | 2 +-
+ examples/calculator.js    | 2 +-
+ examples/clutter-cairo.js | 2 +-
+ examples/glib/env.js      | 2 +-
+ examples/glib/thread.js   | 2 +-
+ examples/glib/timeout.js  | 2 +-
+ examples/glib/timer.js    | 2 +-
+ examples/threaded-repl.js | 2 +-
+ examples/video.js         | 2 +-
  10 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 617a8cde3103fc1c2864cb13e94be21f7202c58e
@@ -18454,7 +19823,7 @@ Date:   Sat Dec 20 21:12:10 2008 +0000
     
     svn path=/trunk/; revision=523
 
- doc/modules/Makefile.am |    7 +++++++
+ doc/modules/Makefile.am | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit faf5d6c3dc6562512ab5bd1b170269d16586f2fc
@@ -18465,9 +19834,9 @@ Date:   Sat Dec 20 08:46:09 2008 +0000
     
     svn path=/trunk/; revision=522
 
- configure.ac         |    1 +
- doc/Makefile.am      |    2 +-
- examples/Makefile.am |    2 +-
+ configure.ac         | 1 +
+ doc/Makefile.am      | 2 +-
+ examples/Makefile.am | 2 +-
  3 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 46f7ffe5ffe69986100d8f5c893c471a56f2cd51
@@ -18478,7 +19847,7 @@ Date:   Sat Dec 20 08:37:24 2008 +0000
     
     svn path=/trunk/; revision=521
 
- modules/readline/seed-readline.c |   12 ++++++------
+ modules/readline/seed-readline.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 82935b5068e8e872d7aa12bb026c4557e33b9ca1
@@ -18489,8 +19858,8 @@ Date:   Sat Dec 20 08:28:27 2008 +0000
     
     svn path=/trunk/; revision=520
 
- doc/modules/readline.html |  100 +++++++++++++++++++++++++++++++++++++++++++++
- doc/runtime.html          |   18 --------
+ doc/modules/readline.html | 100 ++++++++++++++++++++++++++++++++++++++++++++++
+ doc/runtime.html          |  18 ---------
  2 files changed, 100 insertions(+), 18 deletions(-)
 
 commit bbc42e484e98fee2691aa5d7fd485ad8beafed50
@@ -18501,7 +19870,7 @@ Date:   Sat Dec 20 08:28:01 2008 +0000
     
     svn path=/trunk/; revision=519
 
- modules/readline/seed-readline.c |    5 +++--
+ modules/readline/seed-readline.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 27066f56710f57883ea94b2542f043281ed374a8
@@ -18512,8 +19881,8 @@ Date:   Sat Dec 20 08:22:44 2008 +0000
     
     svn path=/trunk/; revision=518
 
- examples/Makefile.am |    2 ++
- examples/gtkplug.js  |   37 +++++++++++++++++++++++++++++++++++++
+ examples/Makefile.am |  2 ++
+ examples/gtkplug.js  | 37 +++++++++++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+)
 
 commit d696528aac5f64cc5cb458d036c2729d6f289430
@@ -18524,16 +19893,16 @@ Date:   Sat Dec 20 08:21:16 2008 +0000
     
     svn path=/trunk/; revision=517
 
- Makefile.am                      |   24 ++++----
- config.h.in                      |    3 -
- configure.ac                     |   11 ++--
- examples/repl.js                 |   22 ++++----
- examples/turtle/Makefile.am      |    2 +-
- libseed/seed-builtins.c          |  114 --------------------------------------
- modules/readline/Makefile.am     |    4 +-
- src/main.c                       |    6 +-
- tests/builtin-argument-length.js |    9 +--
- tests/readline.js                |    3 +-
+ Makefile.am                      |  24 ++++-----
+ config.h.in                      |   3 --
+ configure.ac                     |  11 ++--
+ examples/repl.js                 |  22 ++++----
+ examples/turtle/Makefile.am      |   2 +-
+ libseed/seed-builtins.c          | 114 ---------------------------------------
+ modules/readline/Makefile.am     |   4 +-
+ src/main.c                       |   6 +--
+ tests/builtin-argument-length.js |   9 +---
+ tests/readline.js                |   3 +-
  10 files changed, 37 insertions(+), 161 deletions(-)
 
 commit c7e6b6a14906ecc1d2cc86b366ebc691b6625c21
@@ -18544,10 +19913,10 @@ Date:   Sat Dec 20 07:55:16 2008 +0000
     
     svn path=/trunk/; revision=516
 
- configure.ac                     |    1 +
- modules/Makefile.am              |    2 +-
- modules/readline/Makefile.am     |   20 ++++++
- modules/readline/seed-readline.c |  139 ++++++++++++++++++++++++++++++++++++++
+ configure.ac                     |   1 +
+ modules/Makefile.am              |   2 +-
+ modules/readline/Makefile.am     |  20 ++++++
+ modules/readline/seed-readline.c | 139 +++++++++++++++++++++++++++++++++++++++
  4 files changed, 161 insertions(+), 1 deletion(-)
 
 commit 7fee7e273f76127222a9e19f090a1e97a3b8083c
@@ -18558,7 +19927,7 @@ Date:   Sat Dec 20 06:32:59 2008 +0000
     
     svn path=/trunk/; revision=515
 
- doc/runtime.html |   83 ++++++++++++++++++++++++++++++++++++++++++------------
+ doc/runtime.html | 83 ++++++++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 65 insertions(+), 18 deletions(-)
 
 commit f3d6d173f6b157e2f8d3aa291f14084457db376c
@@ -18569,7 +19938,7 @@ Date:   Sat Dec 20 05:34:35 2008 +0000
     
     svn path=/trunk/; revision=514
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit dacfad0bb012599b01df620449e7314b2a4f0776
@@ -18580,10 +19949,10 @@ Date:   Sat Dec 20 05:31:35 2008 +0000
     
     svn path=/trunk/; revision=513
 
- configure.ac               |   14 ++++++++++++++
- doc/runtime.html           |    4 ++++
- modules/canvas/Makefile.am |    8 +++++---
- modules/sqlite/Makefile.am |    8 +++++---
+ configure.ac               | 14 ++++++++++++++
+ doc/runtime.html           |  4 ++++
+ modules/canvas/Makefile.am |  8 +++++---
+ modules/sqlite/Makefile.am |  8 +++++---
  4 files changed, 28 insertions(+), 6 deletions(-)
 
 commit 34d2cfab796e608c160b37a63c9ab4de3bc867bf
@@ -18611,7 +19980,7 @@ Date:   Sat Dec 20 04:43:09 2008 +0000
     
     svn path=/trunk/; revision=511
 
- libseed/seed-structs.c |    4 ++++
+ libseed/seed-structs.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 744a7632f11d27652c54ac8b8321bf721d10bbde
@@ -18623,7 +19992,7 @@ Date:   Sat Dec 20 04:32:41 2008 +0000
     
     svn path=/trunk/; revision=510
 
- examples/lightsoff/main.js |    2 +-
+ examples/lightsoff/main.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ea420c738760817647a912ef70d4abda31b3e2af
@@ -18634,7 +20003,7 @@ Date:   Sat Dec 20 04:31:38 2008 +0000
     
     svn path=/trunk/; revision=509
 
- libseed/seed-engine.c |    5 ++---
+ libseed/seed-engine.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit f4d91e8421767b192746e0d0d9ad3c6d756c6e9b
@@ -18645,7 +20014,7 @@ Date:   Sat Dec 20 04:27:53 2008 +0000
     
     svn path=/trunk/; revision=508
 
- libseed/seed-closure.c |    1 +
+ libseed/seed-closure.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit b5bbb38cb7d691834a1b58e9d7a36cc3a703c966
@@ -18657,7 +20026,7 @@ Date:   Sat Dec 20 04:14:59 2008 +0000
     
     svn path=/trunk/; revision=507
 
- libseed/seed-engine.c |    7 +++++--
+ libseed/seed-engine.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit d2e08aee88d3a6399432a2731db1c45b8941c09e
@@ -18668,7 +20037,7 @@ Date:   Sat Dec 20 04:07:03 2008 +0000
     
     svn path=/trunk/; revision=506
 
- libseed/seed-closure.c |    1 +
+ libseed/seed-closure.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit d4e3784f268ce69d78c9ad1f7371a8346e1746e6
@@ -18713,7 +20082,7 @@ Date:   Sat Dec 20 03:52:16 2008 +0000
     
     svn path=/trunk/; revision=504
 
- doc/reference/seed-docs.sgml |   18 ++++--------------
+ doc/reference/seed-docs.sgml | 18 ++++--------------
  1 file changed, 4 insertions(+), 14 deletions(-)
 
 commit 1226c8cf733886392fedf9f09dea33590394e0b9
@@ -18724,7 +20093,7 @@ Date:   Sat Dec 20 03:47:41 2008 +0000
     
     svn path=/trunk/; revision=503
 
- doc/reference/Makefile.am |    2 +-
+ doc/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f0f7f6ef6288aba91261253bee5092f679fd90fd
@@ -18735,14 +20104,15 @@ Date:   Sat Dec 20 03:47:39 2008 +0000
     
     svn path=/trunk/; revision=502
 
- Makefile.am                     |    2 +
- autogen.sh                      |    2 +
- configure.ac                    |    1 +
- doc/Makefile.am                 |    2 +-
- doc/reference/Makefile.am       |   87 ++++++++++++++++
- doc/reference/seed-docs.sgml    |   28 ++++++
- doc/reference/seed-sections.txt |  211 +++++++++++++++++++++++++++++++++++++++
- 7 files changed, 332 insertions(+), 1 deletion(-)
+ Makefile.am                     |   2 +
+ autogen.sh                      |   2 +
+ configure.ac                    |   1 +
+ doc/Makefile.am                 |   2 +-
+ doc/reference/Makefile.am       |  87 +++++++++++++++++
+ doc/reference/seed-docs.sgml    |  28 ++++++
+ doc/reference/seed-sections.txt | 211 ++++++++++++++++++++++++++++++++++++++++
+ doc/reference/seed.types        |   0
+ 8 files changed, 332 insertions(+), 1 deletion(-)
 
 commit 7e37f4774d58850566a3c2d858184a31835c953e
 Author: Robert Carr <racarr@src.gnome.org>
@@ -18752,7 +20122,7 @@ Date:   Sat Dec 20 03:47:37 2008 +0000
     
     svn path=/trunk/; revision=501
 
- configure.ac |    5 +++++
+ configure.ac | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 22b9039b886248e45113b8dd8301913a65f87166
@@ -18763,7 +20133,7 @@ Date:   Sat Dec 20 03:13:20 2008 +0000
     
     svn path=/trunk/; revision=500
 
- libseed/seed-closure.c |   45 +++++++++++++++++++++------------------------
+ libseed/seed-closure.c | 45 +++++++++++++++++++++------------------------
  1 file changed, 21 insertions(+), 24 deletions(-)
 
 commit b922ee6644377842cfaa17a69e3a6fd47ad5c8c6
@@ -18774,8 +20144,8 @@ Date:   Sat Dec 20 03:04:17 2008 +0000
     
     svn path=/trunk/; revision=499
 
- tests/Makefile.am                 |    1 +
- tests/native-closure-exception.js |   17 +++++++++++++++++
+ tests/Makefile.am                 |  1 +
+ tests/native-closure-exception.js | 17 +++++++++++++++++
  2 files changed, 18 insertions(+)
 
 commit de1787a67a4a6f4882a342575c47feba80508551
@@ -18786,7 +20156,7 @@ Date:   Sat Dec 20 03:04:14 2008 +0000
     
     svn path=/trunk/; revision=498
 
- libseed/seed-closure.c |   12 +++++++++++-
+ libseed/seed-closure.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit b5bd5f10aae0d6020183a3837bfeb30c5a87e890
@@ -18797,10 +20167,10 @@ Date:   Sat Dec 20 02:56:59 2008 +0000
     
     svn path=/trunk/; revision=497
 
- examples/clutter-shader/ShaderView.js |    4 ++--
- examples/lightsoff/arrow.js           |    4 ++--
- examples/lightsoff/light.js           |    4 ++--
- examples/lightsoff/score.js           |    8 ++++----
+ examples/clutter-shader/ShaderView.js | 4 ++--
+ examples/lightsoff/arrow.js           | 4 ++--
+ examples/lightsoff/light.js           | 4 ++--
+ examples/lightsoff/score.js           | 8 ++++----
  4 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 26f80444e99895debb322e4b92cc25ea70b04ea8
@@ -18811,7 +20181,7 @@ Date:   Sat Dec 20 02:56:57 2008 +0000
     
     svn path=/trunk/; revision=496
 
- examples/repl.js |    2 --
+ examples/repl.js | 2 --
  1 file changed, 2 deletions(-)
 
 commit 55ed65c50cfbbea14340c0043c5cb992aab47e78
@@ -18822,14 +20192,14 @@ Date:   Sat Dec 20 02:56:54 2008 +0000
     
     svn path=/trunk/; revision=495
 
- examples/Gnio-server.js  |    4 ++--
- examples/clutter.js      |    2 +-
- examples/json-packing.js |    2 +-
- examples/n-oscillator.js |    4 ++--
- examples/poppler.js      |    8 ++++----
- examples/video.js        |    2 +-
- examples/vte-test.js     |    4 ++--
- extensions/Gtk.js        |    2 +-
+ examples/Gnio-server.js  | 4 ++--
+ examples/clutter.js      | 2 +-
+ examples/json-packing.js | 2 +-
+ examples/n-oscillator.js | 4 ++--
+ examples/poppler.js      | 8 ++++----
+ examples/video.js        | 2 +-
+ examples/vte-test.js     | 4 ++--
+ extensions/Gtk.js        | 2 +-
  8 files changed, 14 insertions(+), 14 deletions(-)
 
 commit 08f74c8ac026086d64f82b47e5324570fcf14480
@@ -18840,9 +20210,9 @@ Date:   Sat Dec 20 02:56:51 2008 +0000
     
     svn path=/trunk/; revision=494
 
- libseed/seed-engine.c      |    1 +
- tests/enum.js              |    4 ++--
- tests/struct-nested-set.js |    2 +-
+ libseed/seed-engine.c      | 1 +
+ tests/enum.js              | 4 ++--
+ tests/struct-nested-set.js | 2 +-
  3 files changed, 4 insertions(+), 3 deletions(-)
 
 commit 97eb839195f066b42e9250d640931f3544162212
@@ -18854,7 +20224,7 @@ Date:   Sat Dec 20 02:56:48 2008 +0000
     
     svn path=/trunk/; revision=493
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ee0c7a348cf0c0c8bc3505cf3dd703f25760a53a
@@ -18865,7 +20235,7 @@ Date:   Sat Dec 20 02:56:45 2008 +0000
     
     svn path=/trunk/; revision=492
 
- libseed/seed-engine.c |    4 +++-
+ libseed/seed-engine.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 5263b96849dfc77968d27633ad4c0d6d0187a255
@@ -18876,8 +20246,8 @@ Date:   Thu Dec 18 02:04:00 2008 +0000
     
     svn path=/trunk/; revision=491
 
- modules/canvas/seed-canvas.c |    2 +-
- src/main.c                   |    4 ++--
+ modules/canvas/seed-canvas.c | 2 +-
+ src/main.c                   | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit bf64bebc22b4c1fca92df6941c748dec5e96748f
@@ -18888,7 +20258,7 @@ Date:   Thu Dec 18 01:57:06 2008 +0000
     
     svn path=/trunk/; revision=490
 
- examples/turtle/turtle.c |   27 +++++++++++++++++++--------
+ examples/turtle/turtle.c | 27 +++++++++++++++++++--------
  1 file changed, 19 insertions(+), 8 deletions(-)
 
 commit 9a1e5cb14dbd55a1d84f10183abb761b74b5a504
@@ -18907,8 +20277,8 @@ Date:   Thu Dec 18 01:47:47 2008 +0000
     
     svn path=/trunk/; revision=488
 
- examples/HACKING     |    3 ---
- examples/Makefile.am |    2 ++
+ examples/HACKING     | 3 ---
+ examples/Makefile.am | 2 ++
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 9792783afac12f3c57584c810f1da99d7ee1d18a
@@ -18919,7 +20289,7 @@ Date:   Thu Dec 18 01:39:43 2008 +0000
     
     svn path=/trunk/; revision=487
 
- modules/canvas/Makefile.am |    2 +-
+ modules/canvas/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 327e0c2b22d338a9c163ef6b40ca93c1b512e752
@@ -18930,7 +20300,7 @@ Date:   Thu Dec 18 01:36:14 2008 +0000
     
     svn path=/trunk/; revision=486
 
- examples/HACKING |   27 +++++++++++++++++++++------
+ examples/HACKING | 27 +++++++++++++++++++++------
  1 file changed, 21 insertions(+), 6 deletions(-)
 
 commit 8f4a028254d33108b05b624d7c49bdf1bb2dbdc6
@@ -18942,7 +20312,7 @@ Date:   Thu Dec 18 00:55:43 2008 +0000
     
     svn path=/trunk/; revision=485
 
- examples/lightsoff/main.js |   26 +++++++++-----------------
+ examples/lightsoff/main.js | 26 +++++++++-----------------
  1 file changed, 9 insertions(+), 17 deletions(-)
 
 commit 4a8f614f1568c18e53a2552d9ebe449febd67f5a
@@ -18953,8 +20323,8 @@ Date:   Thu Dec 18 00:36:21 2008 +0000
     
     svn path=/trunk/; revision=484
 
- doc/runtime.html        |    9 +++++++++
- libseed/seed-builtins.c |    4 ----
+ doc/runtime.html        | 9 +++++++++
+ libseed/seed-builtins.c | 4 ----
  2 files changed, 9 insertions(+), 4 deletions(-)
 
 commit 0522a1b2389fd1e5d9a8ad71f3ffa867a7193c10
@@ -18969,10 +20339,10 @@ Date:   Wed Dec 17 00:37:41 2008 +0000
     
     svn path=/trunk/; revision=483
 
- configure.ac                |    1 +
- examples/Makefile.am        |    7 ++++---
- examples/turtle/Makefile.am |   17 +++++++++++++++++
- examples/turtle/turtle.c    |   21 +++++++++++----------
+ configure.ac                |  1 +
+ examples/Makefile.am        |  7 ++++---
+ examples/turtle/Makefile.am | 17 +++++++++++++++++
+ examples/turtle/turtle.c    | 21 +++++++++++----------
  4 files changed, 33 insertions(+), 13 deletions(-)
 
 commit a986da0309e0806545b444a33c62c79a75f10c63
@@ -18983,8 +20353,8 @@ Date:   Tue Dec 16 01:15:15 2008 +0000
     
     svn path=/trunk/; revision=482
 
- examples/Gnio-server.js |    7 ++++---
- libseed/seed-builtins.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ examples/Gnio-server.js |  7 ++++---
+ libseed/seed-builtins.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 48 insertions(+), 3 deletions(-)
 
 commit 127937f7ea6bd4cb79c789dd1149f515e54539a7
@@ -18995,8 +20365,8 @@ Date:   Tue Dec 16 00:58:33 2008 +0000
     
     svn path=/trunk/; revision=481
 
- examples/Gnio-server.js |   41 +++++++++++++++++++++++++++++++++++++++++
- examples/Makefile.am    |    2 ++
+ examples/Gnio-server.js | 41 +++++++++++++++++++++++++++++++++++++++++
+ examples/Makefile.am    |  2 ++
  2 files changed, 43 insertions(+)
 
 commit 2d87d31439b9e6b11f90904396937773661aac0c
@@ -19007,8 +20377,8 @@ Date:   Tue Dec 16 00:24:01 2008 +0000
     
     svn path=/trunk/; revision=480
 
- examples/Gnio.js     |   24 ++++++++++++++++++++++++
- examples/Makefile.am |    2 ++
+ examples/Gnio.js     | 24 ++++++++++++++++++++++++
+ examples/Makefile.am |  2 ++
  2 files changed, 26 insertions(+)
 
 commit cf71dcf5d2bbf2ca795cadddda2991aecfe9533d
@@ -19019,7 +20389,7 @@ Date:   Mon Dec 15 08:54:29 2008 +0000
     
     svn path=/trunk/; revision=479
 
- examples/clutter-shader/ShaderView.js |    2 +-
+ examples/clutter-shader/ShaderView.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dcaf38a4f986f31bbe3126a14716c3be7368ce85
@@ -19032,8 +20402,8 @@ Date:   Mon Dec 15 08:53:22 2008 +0000
     
     svn path=/trunk/; revision=478
 
- examples/Makefile.am      |    1 +
- examples/threaded-repl.js |   10 ++++++++++
+ examples/Makefile.am      |  1 +
+ examples/threaded-repl.js | 10 ++++++++++
  2 files changed, 11 insertions(+)
 
 commit feb3e2c6802fca68406081a593444e8801e212bf
@@ -19044,8 +20414,8 @@ Date:   Mon Dec 15 08:43:58 2008 +0000
     
     svn path=/trunk/; revision=477
 
- examples/Makefile.am |    2 +-
- extensions/Seed.js   |    7 +++++++
+ examples/Makefile.am | 2 +-
+ extensions/Seed.js   | 7 +++++++
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 2106b85498e45219c920d1227ad882f1efed6e5c
@@ -19057,7 +20427,7 @@ Date:   Mon Dec 15 08:32:26 2008 +0000
     
     svn path=/trunk/; revision=476
 
- libseed/seed-signals.c |    9 ++-------
+ libseed/seed-signals.c | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit 674da50130522aa8f145f9b3b66721380479480f
@@ -19068,17 +20438,17 @@ Date:   Mon Dec 15 08:32:23 2008 +0000
     
     svn path=/trunk/; revision=475
 
- configure.ac                          |    1 -
- examples/Makefile.am                  |    1 -
- examples/browser/Makefile.am          |   21 ---
- examples/browser/browser-actions.js   |  301 ---------------------------------
- examples/browser/browser-bookmarks.js |   56 ------
- examples/browser/browser-find.js      |   39 -----
- examples/browser/browser-main.js      |   24 ---
- examples/browser/browser-menu.js      |  130 --------------
- examples/browser/browser-tab.js       |  155 -----------------
- examples/browser/browser-toolbar.js   |   25 ---
- examples/browser/main.js              |  112 ------------
+ configure.ac                          |   1 -
+ examples/Makefile.am                  |   1 -
+ examples/browser/Makefile.am          |  21 ---
+ examples/browser/browser-actions.js   | 301 ----------------------------------
+ examples/browser/browser-bookmarks.js |  56 -------
+ examples/browser/browser-find.js      |  39 -----
+ examples/browser/browser-main.js      |  24 ---
+ examples/browser/browser-menu.js      | 130 ---------------
+ examples/browser/browser-tab.js       | 155 -----------------
+ examples/browser/browser-toolbar.js   |  25 ---
+ examples/browser/main.js              | 112 -------------
  11 files changed, 865 deletions(-)
 
 commit 8bb7cd6feef9c8e945638bf273947acd39d39b1a
@@ -19089,7 +20459,7 @@ Date:   Mon Dec 15 08:32:21 2008 +0000
     
     svn path=/trunk/; revision=474
 
- examples/vte-test.js |    4 ++--
+ examples/vte-test.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9ff95da5e1e9628024e161d8b693f5d33603608f
@@ -19100,8 +20470,8 @@ Date:   Mon Dec 15 08:32:18 2008 +0000
     
     svn path=/trunk/; revision=473
 
- examples/lightsoff/board.js |    6 +++---
- examples/lightsoff/light.js |    4 ++--
+ examples/lightsoff/board.js | 6 +++---
+ examples/lightsoff/light.js | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 015319563bc9e9b0a5ef8f1a1437fad968c09e90
@@ -19112,8 +20482,8 @@ Date:   Mon Dec 15 08:32:16 2008 +0000
     
     svn path=/trunk/; revision=472
 
- libseed/seed-signals.c   |    2 +-
- tests/signal-userdata.js |    2 +-
+ libseed/seed-signals.c   | 2 +-
+ tests/signal-userdata.js | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 158a8023cbcec8f16526b62606cce13d6f40b18b
@@ -19124,7 +20494,7 @@ Date:   Mon Dec 15 08:32:13 2008 +0000
     
     svn path=/trunk/; revision=471
 
- libseed/seed-signals.c |   19 ++++++++-----------
+ libseed/seed-signals.c | 19 ++++++++-----------
  1 file changed, 8 insertions(+), 11 deletions(-)
 
 commit 17d35b64e44919fc6a7ba26fe4b8d8c66ce4bfc1
@@ -19135,7 +20505,7 @@ Date:   Mon Dec 15 08:32:11 2008 +0000
     
     svn path=/trunk/; revision=470
 
- libseed/seed-signals.c |   10 +++++++---
+ libseed/seed-signals.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 commit 90684c0772b8a2f683f2c6cb55c18067ddb9b936
@@ -19146,36 +20516,36 @@ Date:   Mon Dec 15 01:09:56 2008 +0000
     
     svn path=/trunk/; revision=469
 
- configure.ac                           |    1 -
- examples/Makefile.am                   |    3 +-
- examples/broken/ide/Makefile.am        |   26 ++++
- examples/broken/ide/exception.svg      |   76 ++++++++++++
- examples/broken/ide/ide-actions.js     |  126 ++++++++++++++++++++
- examples/broken/ide/ide-messagearea.js |  121 +++++++++++++++++++
- examples/broken/ide/ide-sourceview.js  |  203 ++++++++++++++++++++++++++++++++
- examples/broken/ide/ide-tab.js         |   65 ++++++++++
- examples/broken/ide/ide-tabheader.js   |   27 +++++
- examples/broken/ide/ide-tabview.js     |   80 +++++++++++++
- examples/broken/ide/ide-toolbar.js     |   26 ++++
- examples/broken/ide/ide-window.js      |   40 +++++++
- examples/broken/ide/legacy/ide.js      |  155 ++++++++++++++++++++++++
- examples/broken/ide/legacy/tabview.js  |   77 ++++++++++++
- examples/broken/ide/legacy/toolbar.js  |  143 ++++++++++++++++++++++
- examples/broken/ide/main.js            |   30 +++++
- examples/ide/Makefile.am               |   26 ----
- examples/ide/exception.svg             |   76 ------------
- examples/ide/ide-actions.js            |  126 --------------------
- examples/ide/ide-messagearea.js        |  121 -------------------
- examples/ide/ide-sourceview.js         |  203 --------------------------------
- examples/ide/ide-tab.js                |   65 ----------
- examples/ide/ide-tabheader.js          |   27 -----
- examples/ide/ide-tabview.js            |   80 -------------
- examples/ide/ide-toolbar.js            |   26 ----
- examples/ide/ide-window.js             |   40 -------
- examples/ide/legacy/ide.js             |  155 ------------------------
- examples/ide/legacy/tabview.js         |   77 ------------
- examples/ide/legacy/toolbar.js         |  143 ----------------------
- examples/ide/main.js                   |   30 -----
+ configure.ac                           |   1 -
+ examples/Makefile.am                   |   3 +-
+ examples/broken/ide/Makefile.am        |  26 +++++
+ examples/broken/ide/exception.svg      |  76 ++++++++++++
+ examples/broken/ide/ide-actions.js     | 126 ++++++++++++++++++++
+ examples/broken/ide/ide-messagearea.js | 121 ++++++++++++++++++++
+ examples/broken/ide/ide-sourceview.js  | 203 +++++++++++++++++++++++++++++++++
+ examples/broken/ide/ide-tab.js         |  65 +++++++++++
+ examples/broken/ide/ide-tabheader.js   |  27 +++++
+ examples/broken/ide/ide-tabview.js     |  80 +++++++++++++
+ examples/broken/ide/ide-toolbar.js     |  26 +++++
+ examples/broken/ide/ide-window.js      |  40 +++++++
+ examples/broken/ide/legacy/ide.js      | 155 +++++++++++++++++++++++++
+ examples/broken/ide/legacy/tabview.js  |  77 +++++++++++++
+ examples/broken/ide/legacy/toolbar.js  | 143 +++++++++++++++++++++++
+ examples/broken/ide/main.js            |  30 +++++
+ examples/ide/Makefile.am               |  26 -----
+ examples/ide/exception.svg             |  76 ------------
+ examples/ide/ide-actions.js            | 126 --------------------
+ examples/ide/ide-messagearea.js        | 121 --------------------
+ examples/ide/ide-sourceview.js         | 203 ---------------------------------
+ examples/ide/ide-tab.js                |  65 -----------
+ examples/ide/ide-tabheader.js          |  27 -----
+ examples/ide/ide-tabview.js            |  80 -------------
+ examples/ide/ide-toolbar.js            |  26 -----
+ examples/ide/ide-window.js             |  40 -------
+ examples/ide/legacy/ide.js             | 155 -------------------------
+ examples/ide/legacy/tabview.js         |  77 -------------
+ examples/ide/legacy/toolbar.js         | 143 -----------------------
+ examples/ide/main.js                   |  30 -----
  30 files changed, 1196 insertions(+), 1198 deletions(-)
 
 commit 077bc4cbd9d7e839be784cd4cb3c135885c7e8cd
@@ -19186,7 +20556,7 @@ Date:   Mon Dec 15 01:05:39 2008 +0000
     
     svn path=/trunk/; revision=468
 
- libseed/seed-engine.c |   66 ++++++++++++++-----------------------------------
+ libseed/seed-engine.c | 66 +++++++++++++++------------------------------------
  1 file changed, 19 insertions(+), 47 deletions(-)
 
 commit 3d17df20eab388c4dffab82c63e176bfb77ef148
@@ -19197,7 +20567,7 @@ Date:   Mon Dec 15 00:42:23 2008 +0000
     
     svn path=/trunk/; revision=467
 
- libseed/seed-engine.c |    3 ++-
+ libseed/seed-engine.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 670ee7c614e05ec8335622ddff2502748043ae4c
@@ -19208,7 +20578,7 @@ Date:   Mon Dec 15 00:42:21 2008 +0000
     
     svn path=/trunk/; revision=466
 
- libseed/seed-engine.c |    4 ++++
+ libseed/seed-engine.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit e0de3f4a4f9ed3713ef9c7fe3d6eef57cb0bdb17
@@ -19220,7 +20590,7 @@ Date:   Mon Dec 15 00:42:19 2008 +0000
     
     svn path=/trunk/; revision=465
 
- libseed/seed-engine.c |   59 ++++++++++++++++++++++++++++++++++---------------
+ libseed/seed-engine.c | 59 +++++++++++++++++++++++++++++++++++----------------
  1 file changed, 41 insertions(+), 18 deletions(-)
 
 commit 93f65153e7fdba65112fbb1ac787a2414a766319
@@ -19231,7 +20601,7 @@ Date:   Mon Dec 15 00:42:18 2008 +0000
     
     svn path=/trunk/; revision=464
 
- libseed/seed-engine.c |    5 +++--
+ libseed/seed-engine.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 8572c696baf3b18144e49d734d9b21f553f9cfb0
@@ -19244,8 +20614,8 @@ Date:   Sun Dec 14 23:04:56 2008 +0000
     
     svn path=/trunk/; revision=463
 
- examples/accelgroup.js |    3 ++-
- extensions/Seed.js     |   22 ++++++++++++++++++++++
+ examples/accelgroup.js |  3 ++-
+ extensions/Seed.js     | 22 ++++++++++++++++++++++
  2 files changed, 24 insertions(+), 1 deletion(-)
 
 commit 70d45e292305e1d9343cb0fd9603f377ee96b6bd
@@ -19256,7 +20626,7 @@ Date:   Sun Dec 14 22:48:57 2008 +0000
     
     svn path=/trunk/; revision=462
 
- libseed/seed-engine.c |    1 +
+ libseed/seed-engine.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 901d6bbc9a2eec3dbf4a85c1210623ab2fc0d612
@@ -19267,7 +20637,7 @@ Date:   Sun Dec 14 22:48:55 2008 +0000
     
     svn path=/trunk/; revision=461
 
- libseed/seed-engine.c |    7 ++++++-
+ libseed/seed-engine.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit c5de5d49e75b8b2ab252ac3be71dda8009e33c59
@@ -19278,7 +20648,7 @@ Date:   Sun Dec 14 16:38:20 2008 +0000
     
     svn path=/trunk/; revision=460
 
- examples/Makefile.am |    4 ----
+ examples/Makefile.am | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 817b3289baa609a4b84142d97cba8a59c149b2de
@@ -19289,8 +20659,8 @@ Date:   Sun Dec 14 08:23:47 2008 +0000
     
     svn path=/trunk/; revision=459
 
- examples/repl.js        |    6 ++++--
- libseed/seed-builtins.c |   19 +++++++++++++++++--
+ examples/repl.js        |  6 ++++--
+ libseed/seed-builtins.c | 19 +++++++++++++++++--
  2 files changed, 21 insertions(+), 4 deletions(-)
 
 commit dfab96a9481b526f0b5c70d4cdd70ceec0a03cdb
@@ -19301,7 +20671,7 @@ Date:   Sun Dec 14 08:23:45 2008 +0000
     
     svn path=/trunk/; revision=458
 
- libseed/seed-builtins.c |   57 +++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-builtins.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 57 insertions(+)
 
 commit cda177cf23d9151acc67ac2c026db83c5a11db2b
@@ -19313,9 +20683,9 @@ Date:   Sun Dec 14 07:56:47 2008 +0000
     
     svn path=/trunk/; revision=457
 
- tests/Makefile.am               |    2 ++
- tests/struct-enumerate.js       |   12 ++++++++++++
- tests/struct-union-enumerate.js |   21 +++++++++++++++++++++
+ tests/Makefile.am               |  2 ++
+ tests/struct-enumerate.js       | 12 ++++++++++++
+ tests/struct-union-enumerate.js | 21 +++++++++++++++++++++
  3 files changed, 35 insertions(+)
 
 commit e9f9724a45614dba6d12cd9a7fa1f05f62a4ed29
@@ -19326,7 +20696,7 @@ Date:   Sun Dec 14 07:56:45 2008 +0000
     
     svn path=/trunk/; revision=456
 
- libseed/seed-structs.c |   51 +++++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-structs.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 48 insertions(+), 3 deletions(-)
 
 commit 23034044c8a4ac7c6543379a2f2289578b7e76d1
@@ -19337,23 +20707,23 @@ Date:   Sun Dec 14 07:27:04 2008 +0000
     
     svn path=/trunk/; revision=455
 
- modules/canvas/run-tests.js |  384 +++++++++++++++++++++++++++++++++++++++++++
- modules/canvas/test1.js     |   34 ----
- modules/canvas/test10.js    |   47 ------
- modules/canvas/test11.js    |   49 ------
- modules/canvas/test12.js    |   44 -----
- modules/canvas/test13.js    |   35 ----
- modules/canvas/test14.js    |   47 ------
- modules/canvas/test15.js    |   40 -----
- modules/canvas/test16.js    |   97 -----------
- modules/canvas/test2.js     |   32 ----
- modules/canvas/test3.js     |   33 ----
- modules/canvas/test4.js     |   38 -----
- modules/canvas/test5.js     |   43 -----
- modules/canvas/test6.js     |   47 ------
- modules/canvas/test7.js     |   37 -----
- modules/canvas/test8.js     |   37 -----
- modules/canvas/test9.js     |   94 -----------
+ modules/canvas/run-tests.js | 384 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/test1.js     |  34 ----
+ modules/canvas/test10.js    |  47 ------
+ modules/canvas/test11.js    |  49 ------
+ modules/canvas/test12.js    |  44 -----
+ modules/canvas/test13.js    |  35 ----
+ modules/canvas/test14.js    |  47 ------
+ modules/canvas/test15.js    |  40 -----
+ modules/canvas/test16.js    |  97 -----------
+ modules/canvas/test2.js     |  32 ----
+ modules/canvas/test3.js     |  33 ----
+ modules/canvas/test4.js     |  38 -----
+ modules/canvas/test5.js     |  43 -----
+ modules/canvas/test6.js     |  47 ------
+ modules/canvas/test7.js     |  37 -----
+ modules/canvas/test8.js     |  37 -----
+ modules/canvas/test9.js     |  94 -----------
  17 files changed, 384 insertions(+), 754 deletions(-)
 
 commit 99f321e2d407225fa6b7096663b5303aa532966f
@@ -19364,11 +20734,11 @@ Date:   Sun Dec 14 07:12:55 2008 +0000
     
     svn path=/trunk/; revision=454
 
- examples/broken/pango-fontset.js |   18 ++++
- examples/broken/pango.js         |  194 ++++++++++++++++++++++++++++++++++++++
- examples/n-oscillator.js         |   70 +++++++-------
- examples/pango-fontset.js        |   18 ----
- examples/pango.js                |  194 --------------------------------------
+ examples/broken/pango-fontset.js |  18 ++++
+ examples/broken/pango.js         | 194 +++++++++++++++++++++++++++++++++++++++
+ examples/n-oscillator.js         |  70 +++++++-------
+ examples/pango-fontset.js        |  18 ----
+ examples/pango.js                | 194 ---------------------------------------
  5 files changed, 247 insertions(+), 247 deletions(-)
 
 commit f633b85bb18100242cb715a1605fe5bfadffd610
@@ -19379,7 +20749,7 @@ Date:   Sun Dec 14 07:12:53 2008 +0000
     
     svn path=/trunk/; revision=453
 
- examples/clutter-shader/ShaderView.js |   68 ++++++++++++++++-----------------
+ examples/clutter-shader/ShaderView.js | 68 +++++++++++++++++------------------
  1 file changed, 34 insertions(+), 34 deletions(-)
 
 commit a04c900f0f6aa88872d84f92fada2f4517bba9d4
@@ -19390,7 +20760,7 @@ Date:   Sun Dec 14 06:53:10 2008 +0000
     
     svn path=/trunk/; revision=452
 
- examples/lightsoff/arrow.js |    6 +++---
+ examples/lightsoff/arrow.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 4c283b656758cec21ad2e5c1fd074c1393488e9e
@@ -19401,8 +20771,8 @@ Date:   Sun Dec 14 06:53:09 2008 +0000
     
     svn path=/trunk/; revision=451
 
- examples/pango-fontset.js |    1 -
- examples/vte-test.js      |    4 ++--
+ examples/pango-fontset.js | 1 -
+ examples/vte-test.js      | 4 ++--
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 4802acec32067fae8305189e2b90e7ccbb4d3855
@@ -19413,7 +20783,7 @@ Date:   Sun Dec 14 06:53:07 2008 +0000
     
     svn path=/trunk/; revision=450
 
- examples/n-oscillator.js |   30 +++++++++++++++---------------
+ examples/n-oscillator.js | 30 +++++++++++++++---------------
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 commit f3b752a3fa99c27957d428da9238ab3437e14938
@@ -19424,7 +20794,7 @@ Date:   Sun Dec 14 06:53:05 2008 +0000
     
     svn path=/trunk/; revision=449
 
- examples/clutter-shader/ShaderView.js |   12 ++++++------
+ examples/clutter-shader/ShaderView.js | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit f36563275f002c90c7ab1c55f53864fada5f1669
@@ -19435,7 +20805,7 @@ Date:   Sun Dec 14 06:53:03 2008 +0000
     
     svn path=/trunk/; revision=448
 
- examples/calculator.js |    2 +-
+ examples/calculator.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c52742b3049d8eef77a7efdffc16e6bb3d36c88d
@@ -19446,8 +20816,8 @@ Date:   Sun Dec 14 06:53:02 2008 +0000
     
     svn path=/trunk/; revision=447
 
- examples/calculator.js |    2 +-
- libseed/seed-signals.c |    1 -
+ examples/calculator.js | 2 +-
+ libseed/seed-signals.c | 1 -
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 commit f5fa94d4b5e3a3e59b2ed68c0c6603677ec4aeec
@@ -19458,8 +20828,8 @@ Date:   Sun Dec 14 06:53:00 2008 +0000
     
     svn path=/trunk/; revision=446
 
- tests/Makefile.am    |    1 -
- tests/signal-this.js |   17 -----------------
+ tests/Makefile.am    |  1 -
+ tests/signal-this.js | 17 -----------------
  2 files changed, 18 deletions(-)
 
 commit 7a2154fdb5dfc527f3ca24e04d772b2914b611e6
@@ -19470,7 +20840,7 @@ Date:   Sun Dec 14 06:52:58 2008 +0000
     
     svn path=/trunk/; revision=445
 
- libseed/seed-signals.c |    6 ++++++
+ libseed/seed-signals.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit db1796b2bb7f11dc7d80f631f3f929cf217c3e91
@@ -19481,8 +20851,8 @@ Date:   Sun Dec 14 06:29:38 2008 +0000
     
     svn path=/trunk/; revision=444
 
- tests/Makefile.am                   |    1 +
- tests/gtype-class-init-exception.js |   22 ++++++++++++++++++++++
+ tests/Makefile.am                   |  1 +
+ tests/gtype-class-init-exception.js | 22 ++++++++++++++++++++++
  2 files changed, 23 insertions(+)
 
 commit ae2d1fd68aba289d196207f4470e067944a26821
@@ -19493,7 +20863,7 @@ Date:   Sun Dec 14 06:29:36 2008 +0000
     
     svn path=/trunk/; revision=443
 
- libseed/seed-gtype.c |    2 +-
+ libseed/seed-gtype.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7453703df497551f2a66e11c4d5b304e559ac30a
@@ -19504,8 +20874,8 @@ Date:   Sun Dec 14 06:29:33 2008 +0000
     
     svn path=/trunk/; revision=442
 
- tests/Makefile.am       |    1 +
- tests/include-syntax.js |    6 ++++++
+ tests/Makefile.am       | 1 +
+ tests/include-syntax.js | 6 ++++++
  2 files changed, 7 insertions(+)
 
 commit a150e2fb6d1fe8e7629b31470006dca56a2a4934
@@ -19516,7 +20886,7 @@ Date:   Sun Dec 14 06:29:31 2008 +0000
     
     svn path=/trunk/; revision=441
 
- libseed/seed-builtins.c |    3 ++-
+ libseed/seed-builtins.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 91e6550979f4618fcb78dfec1eb99e5791c413cd
@@ -19527,10 +20897,10 @@ Date:   Sat Dec 13 00:20:10 2008 +0000
     
     svn path=/trunk/; revision=440
 
- examples/accelgroup.js |   41 +++++++++--------
- examples/actions.js    |  116 +++++++++++++++++++++++++-----------------------
- examples/repl.js       |   17 ++++---
- examples/vte-test.js   |   41 +++++++++--------
+ examples/accelgroup.js |  41 +++++++++--------
+ examples/actions.js    | 116 ++++++++++++++++++++++++++-----------------------
+ examples/repl.js       |  17 +++++---
+ examples/vte-test.js   |  41 +++++++++--------
  4 files changed, 115 insertions(+), 100 deletions(-)
 
 commit 307b4ba1d03f66415af5f8f083c3402b06c0f7ad
@@ -19541,7 +20911,7 @@ Date:   Sat Dec 13 00:10:16 2008 +0000
     
     svn path=/trunk/; revision=439
 
- examples/clutter-cairo.js |    2 +-
+ examples/clutter-cairo.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e48f7913f61267aa37a3fdd2cb33eb859cc9d8ba
@@ -19552,8 +20922,8 @@ Date:   Sat Dec 13 00:07:20 2008 +0000
     
     svn path=/trunk/; revision=438
 
- examples/Makefile.am      |    2 ++
- examples/clutter-cairo.js |   30 ++++++++++++++++++++++++++++++
+ examples/Makefile.am      |  2 ++
+ examples/clutter-cairo.js | 30 ++++++++++++++++++++++++++++++
  2 files changed, 32 insertions(+)
 
 commit dcf955788dab838f33ef384840477a4dc0b17f33
@@ -19564,7 +20934,7 @@ Date:   Sat Dec 13 00:06:51 2008 +0000
     
     svn path=/trunk/; revision=437
 
- modules/canvas/seed-canvas.c |   18 +++++++++++++++++-
+ modules/canvas/seed-canvas.c | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 commit b5d4dd6a3e3c802ad7e5fe8963bce41b588fd801
@@ -19575,7 +20945,7 @@ Date:   Fri Dec 12 23:56:16 2008 +0000
     
     svn path=/trunk/; revision=436
 
- modules/canvas/seed-canvas.c |   46 +++++++++++++++++++++++++++++++++++++++++-
+ modules/canvas/seed-canvas.c | 46 +++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 45 insertions(+), 1 deletion(-)
 
 commit 338c4bf7211b644dc32b6289e47c7fbfa23e5b67
@@ -19586,7 +20956,7 @@ Date:   Fri Dec 12 19:11:28 2008 +0000
     
     svn path=/trunk/; revision=435
 
- libseed/seed-engine.c |    9 ++++++---
+ libseed/seed-engine.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 0658eea45ad15271a5deb98b352f441d2839de58
@@ -19598,15 +20968,15 @@ Date:   Fri Dec 12 05:02:52 2008 +0000
     
     svn path=/trunk/; revision=434
 
- examples/browser/Makefile.am          |    9 +-
- examples/browser/browser-actions.js   |  274 +++++++++++++++++++++++++++++----
- examples/browser/browser-bookmarks.js |   56 +++++++
- examples/browser/browser-find.js      |   39 +++++
- examples/browser/browser-main.js      |    2 +-
- examples/browser/browser-menu.js      |  130 ++++++++++++++++
- examples/browser/browser-tab.js       |   43 +++++-
- examples/browser/browser-toolbar.js   |   24 +--
- examples/browser/main.js              |   71 +++++++--
+ examples/browser/Makefile.am          |   9 +-
+ examples/browser/browser-actions.js   | 274 ++++++++++++++++++++++++++++++----
+ examples/browser/browser-bookmarks.js |  56 +++++++
+ examples/browser/browser-find.js      |  39 +++++
+ examples/browser/browser-main.js      |   2 +-
+ examples/browser/browser-menu.js      | 130 ++++++++++++++++
+ examples/browser/browser-tab.js       |  43 +++++-
+ examples/browser/browser-toolbar.js   |  24 +--
+ examples/browser/main.js              |  71 +++++++--
  9 files changed, 588 insertions(+), 60 deletions(-)
 
 commit 349e7211f6b755d9db446589768f488d9a38d15b
@@ -19617,7 +20987,7 @@ Date:   Fri Dec 12 01:26:47 2008 +0000
     
     svn path=/trunk/; revision=433
 
- libseed/seed-engine.c |   29 +++++++++++++----------------
+ libseed/seed-engine.c | 29 +++++++++++++----------------
  1 file changed, 13 insertions(+), 16 deletions(-)
 
 commit 1e8b902c76441d465d46d85a2312dd1a53bfa811
@@ -19628,7 +20998,7 @@ Date:   Thu Dec 11 18:50:24 2008 +0000
     
     svn path=/trunk/; revision=432
 
- libseed/seed-engine.c |    2 ++
+ libseed/seed-engine.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit f999dcbe1193e79bce2bcf366a5a8dae2764b20a
@@ -19639,7 +21009,7 @@ Date:   Thu Dec 11 00:54:42 2008 +0000
     
     svn path=/trunk/; revision=431
 
- examples/pango-fontset.js |    2 +-
+ examples/pango-fontset.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5a318be777805721a3b7c4f0db11322efc65d27e
@@ -19650,7 +21020,7 @@ Date:   Thu Dec 11 00:50:25 2008 +0000
     
     svn path=/trunk/; revision=430
 
- examples/clutter.js |    6 +++---
+ examples/clutter.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 424740ce04a6dcfee7ac71f503cdc636b4104a91
@@ -19661,8 +21031,8 @@ Date:   Thu Dec 11 00:49:32 2008 +0000
     
     svn path=/trunk/; revision=429
 
- examples/accelgroup.js  |    9 ++++++---
- examples/notify-test.js |    2 +-
+ examples/accelgroup.js  | 9 ++++++---
+ examples/notify-test.js | 2 +-
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 commit 2743d92c49bccc96371ec1e59df14b87b61d2832
@@ -19673,7 +21043,7 @@ Date:   Thu Dec 11 00:02:34 2008 +0000
     
     svn path=/trunk/; revision=428
 
- examples/browser/Makefile.am |    4 ++--
+ examples/browser/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit cc90d1abd44cb24ca3e1de0ed65a238f6edcd3c6
@@ -19684,7 +21054,7 @@ Date:   Wed Dec 10 01:14:31 2008 +0000
     
     svn path=/trunk/; revision=427
 
- libseed/seed-engine.c |    2 ++
+ libseed/seed-engine.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit f00e5ad2d652b2914fec09bb12e49dcea05f9b2d
@@ -19695,7 +21065,7 @@ Date:   Wed Dec 10 00:57:34 2008 +0000
     
     svn path=/trunk/; revision=426
 
- examples/browser/main.js |   11 ++++-------
+ examples/browser/main.js | 11 ++++-------
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 commit b5b289cc2ead5b318e35b092fa41ba2cf5e51602
@@ -19706,7 +21076,7 @@ Date:   Wed Dec 10 00:42:33 2008 +0000
     
     svn path=/trunk/; revision=425
 
- modules/Multiprocessing/multi.c |   14 ++++++++++++++
+ modules/Multiprocessing/multi.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 670f169c62b5d8b46d3f2fa6ba528b40899805bd
@@ -19717,9 +21087,9 @@ Date:   Wed Dec 10 00:37:27 2008 +0000
     
     svn path=/trunk/; revision=424
 
- modules/Multiprocessing/Makefile.am |    2 +-
- modules/Multiprocessing/bi.js       |   21 ++++++++++++++
- modules/Multiprocessing/multi.c     |   54 ++++++++++++++++++++++++-----------
+ modules/Multiprocessing/Makefile.am |  2 +-
+ modules/Multiprocessing/bi.js       | 21 +++++++++++++++
+ modules/Multiprocessing/multi.c     | 54 +++++++++++++++++++++++++------------
  3 files changed, 59 insertions(+), 18 deletions(-)
 
 commit 1c42c7b2f2ff0ab261581c4fd6f3d1de73573697
@@ -19730,7 +21100,7 @@ Date:   Tue Dec 9 23:44:08 2008 +0000
     
     svn path=/trunk/; revision=423
 
- examples/browser/main.js |   19 +++++++++++++++++++
+ examples/browser/main.js | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit a3d3774d4b83ccb672ed2e4d374b6d4fce753be3
@@ -19741,11 +21111,11 @@ Date:   Tue Dec 9 23:01:11 2008 +0000
     
     svn path=/trunk/; revision=422
 
- configure.ac                        |    1 +
- modules/Makefile.am                 |    2 +-
- modules/Multiprocessing/Makefile.am |   19 ++++
- modules/Multiprocessing/fork.js     |   39 +++++++++
- modules/Multiprocessing/multi.c     |  164 +++++++++++++++++++++++++++++++++++
+ configure.ac                        |   1 +
+ modules/Makefile.am                 |   2 +-
+ modules/Multiprocessing/Makefile.am |  19 +++++
+ modules/Multiprocessing/fork.js     |  39 +++++++++
+ modules/Multiprocessing/multi.c     | 164 ++++++++++++++++++++++++++++++++++++
  5 files changed, 224 insertions(+), 1 deletion(-)
 
 commit 5bd2968d88150c3ff38e9a2d8e72ae7cb2098f75
@@ -19756,9 +21126,9 @@ Date:   Tue Dec 9 21:19:23 2008 +0000
     
     svn path=/trunk/; revision=421
 
- examples/browser/browser-tab.js     |   10 +++++++---
- examples/browser/browser-toolbar.js |    6 +++---
- examples/browser/main.js            |   10 +++++++++-
+ examples/browser/browser-tab.js     | 10 +++++++---
+ examples/browser/browser-toolbar.js |  6 +++---
+ examples/browser/main.js            | 10 +++++++++-
  3 files changed, 19 insertions(+), 7 deletions(-)
 
 commit 13c8f0735648b38a6fb747ddf1e9e71b6b6a7416
@@ -19770,9 +21140,9 @@ Date:   Tue Dec 9 20:27:10 2008 +0000
     
     svn path=/trunk/; revision=420
 
- configure.ac                 |    1 +
- examples/Makefile.am         |    5 ++---
- examples/browser/Makefile.am |   16 ++++++++++++++++
+ configure.ac                 |  1 +
+ examples/Makefile.am         |  5 ++---
+ examples/browser/Makefile.am | 16 ++++++++++++++++
  3 files changed, 19 insertions(+), 3 deletions(-)
 
 commit c5a66b6a8a84698192ffc2fe5765653f60409ece
@@ -19783,8 +21153,8 @@ Date:   Tue Dec 9 20:18:28 2008 +0000
     
     svn path=/trunk/; revision=419
 
- libseed/seed-api.c |    9 +++++++++
- libseed/seed.h     |    6 ++++++
+ libseed/seed-api.c | 9 +++++++++
+ libseed/seed.h     | 6 ++++++
  2 files changed, 15 insertions(+)
 
 commit 52f616f39b7966767dae933bb958fa5407de71fa
@@ -19796,11 +21166,11 @@ Date:   Tue Dec 9 19:53:08 2008 +0000
     
     svn path=/trunk/; revision=418
 
- examples/browser/browser-actions.js |   87 ++++++++++++
- examples/browser/browser-main.js    |   24 ++++
- examples/browser/browser-tab.js     |  110 +++++++++++++++
- examples/browser/browser-toolbar.js |   25 ++++
- examples/browser/main.js            |  255 +----------------------------------
+ examples/browser/browser-actions.js |  87 ++++++++++++
+ examples/browser/browser-main.js    |  24 ++++
+ examples/browser/browser-tab.js     | 110 ++++++++++++++++
+ examples/browser/browser-toolbar.js |  25 ++++
+ examples/browser/main.js            | 255 +-----------------------------------
  5 files changed, 250 insertions(+), 251 deletions(-)
 
 commit c389e9c3ae1ff7820b3ee352016f37cca8c803a9
@@ -19812,7 +21182,7 @@ Date:   Tue Dec 9 19:45:08 2008 +0000
     
     svn path=/trunk/; revision=417
 
- examples/browser/main.js |   12 ++++++++++++
+ examples/browser/main.js | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit eab8224de94bbf23bae5e5aaa1bac53453d93033
@@ -19824,8 +21194,8 @@ Date:   Tue Dec 9 18:57:41 2008 +0000
     
     svn path=/trunk/; revision=416
 
- examples/browser/main.js |  280 ++++++++++++++++++++++++++++++++++++++++++++++
- examples/mini-browser.js |  280 ----------------------------------------------
+ examples/browser/main.js | 280 +++++++++++++++++++++++++++++++++++++++++++++++
+ examples/mini-browser.js | 280 -----------------------------------------------
  2 files changed, 280 insertions(+), 280 deletions(-)
 
 commit a5f98c731ffece05312d57a3af2b20f6c61e69ff
@@ -19836,7 +21206,7 @@ Date:   Tue Dec 9 17:21:14 2008 +0000
     
     svn path=/trunk/; revision=415
 
- examples/mini-browser.js |   74 +++++++++++++++++++++++++++++++++++++++-------
+ examples/mini-browser.js | 74 +++++++++++++++++++++++++++++++++++++++++-------
  1 file changed, 63 insertions(+), 11 deletions(-)
 
 commit b09204ce56e6e50cc5b746e8698939330f86c188
@@ -19848,7 +21218,7 @@ Date:   Tue Dec 9 16:53:17 2008 +0000
     
     svn path=/trunk/; revision=414
 
- examples/mini-browser.js |  320 +++++++++++++++++++++++++---------------------
+ examples/mini-browser.js | 320 ++++++++++++++++++++++++++---------------------
  1 file changed, 176 insertions(+), 144 deletions(-)
 
 commit 85780b4e011d2ec8b28f0481a5a5933ab047a8b2
@@ -19862,9 +21232,9 @@ Date:   Tue Dec 9 14:04:11 2008 +0000
     
     svn path=/trunk/; revision=413
 
- doc/runtime.html        |   47 +++++++++++++++++++++++++++++------------------
- libseed/seed-builtins.c |    3 ---
- libseed/seed-closure.h  |    2 +-
+ doc/runtime.html        | 47 +++++++++++++++++++++++++++++------------------
+ libseed/seed-builtins.c |  3 ---
+ libseed/seed-closure.h  |  2 +-
  3 files changed, 30 insertions(+), 22 deletions(-)
 
 commit 9182e9fa0d83aeba1e9151209af578a7c3807cfa
@@ -19875,7 +21245,7 @@ Date:   Tue Dec 9 02:00:28 2008 +0000
     
     svn path=/trunk/; revision=412
 
- tests/Makefile.am |    1 +
+ tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit c1046029a86d8b9ffb67336f924191e17cc57c46
@@ -19886,7 +21256,7 @@ Date:   Tue Dec 9 01:59:17 2008 +0000
     
     svn path=/trunk/; revision=411
 
- examples/turtle/turtle.c |   50 ++++++++++++++++++++++++++++++++++++++++++++--
+ examples/turtle/turtle.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 48 insertions(+), 2 deletions(-)
 
 commit 3dc20360c83c818442e286db43c6a86522c00ec5
@@ -19897,7 +21267,7 @@ Date:   Tue Dec 9 00:16:25 2008 +0000
     
     svn path=/trunk/; revision=410
 
- examples/mini-browser.js |   29 +++++++++++++++++++++++++++++
+ examples/mini-browser.js | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit 825e287d9bc7c6f6f7f4fea8d367e138496c18a2
@@ -19908,7 +21278,7 @@ Date:   Mon Dec 8 22:41:09 2008 +0000
     
     svn path=/trunk/; revision=409
 
- examples/ide/ide-toolbar.js |    4 ----
+ examples/ide/ide-toolbar.js | 4 ----
  1 file changed, 4 deletions(-)
 
 commit c2f7b47e36c813eea9816e6867c536efe6ebf524
@@ -19919,7 +21289,7 @@ Date:   Mon Dec 8 20:30:43 2008 +0000
     
     svn path=/trunk/; revision=408
 
- tests/gtype-signal2.js |    2 +-
+ tests/gtype-signal2.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f369ee1901e53fad6d6e94e81f379ff2cfff6ed8
@@ -19930,7 +21300,7 @@ Date:   Mon Dec 8 04:28:09 2008 +0000
     
     svn path=/trunk/; revision=407
 
- modules/canvas/seed-canvas.c |   16 ++++++++++++++++
+ modules/canvas/seed-canvas.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
 commit 302dc8ef02d34224f3aebd10a3b22791bf9d970d
@@ -19941,7 +21311,7 @@ Date:   Mon Dec 8 04:18:56 2008 +0000
     
     svn path=/trunk/; revision=406
 
- modules/canvas/seed-canvas.c |  170 ++++++++++++++++++++++++++++++++++++++----
+ modules/canvas/seed-canvas.c | 170 +++++++++++++++++++++++++++++++++++++++----
  1 file changed, 155 insertions(+), 15 deletions(-)
 
 commit 55a3c8610ce1a59641b57d90747892ef0909ecac
@@ -19952,8 +21322,8 @@ Date:   Sat Dec 6 06:23:54 2008 +0000
     
     svn path=/trunk/; revision=405
 
- examples/turtle/turtle.c |  210 +++++++++++++++++++++++++++++++++++++++-------
- libseed/seed.h           |    9 +-
+ examples/turtle/turtle.c | 210 ++++++++++++++++++++++++++++++++++++++++-------
+ libseed/seed.h           |   9 +-
  2 files changed, 184 insertions(+), 35 deletions(-)
 
 commit f436976ad06ba80025ea7f04557c4da17fc3a556
@@ -19964,8 +21334,8 @@ Date:   Sat Dec 6 04:13:56 2008 +0000
     
     svn path=/trunk/; revision=404
 
- modules/canvas/Makefile.am |    2 +-
- modules/canvas/test16.js   |   97 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am |  2 +-
+ modules/canvas/test16.js   | 97 ++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 98 insertions(+), 1 deletion(-)
 
 commit 7858307f36b68cb151df1fc69e3c2115ab8ec195
@@ -19976,9 +21346,9 @@ Date:   Sat Dec 6 04:03:04 2008 +0000
     
     svn path=/trunk/; revision=403
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/seed-canvas.c |   25 ++++++++++++++++++++++++-
- modules/canvas/test15.js     |   40 ++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am   |  2 +-
+ modules/canvas/seed-canvas.c | 25 ++++++++++++++++++++++++-
+ modules/canvas/test15.js     | 40 ++++++++++++++++++++++++++++++++++++++++
  3 files changed, 65 insertions(+), 2 deletions(-)
 
 commit b7229c94bec0d9e6ceda1ba78b7d9f61df2dcf53
@@ -19989,7 +21359,7 @@ Date:   Sat Dec 6 03:52:59 2008 +0000
     
     svn path=/trunk/; revision=402
 
- modules/canvas/seed-canvas.c |   65 ++++++++++++++++++++++++++++--------------
+ modules/canvas/seed-canvas.c | 65 ++++++++++++++++++++++++++++++--------------
  1 file changed, 44 insertions(+), 21 deletions(-)
 
 commit 0dc4185a37c9eb1d962be065a98282ecbdef16f9
@@ -20000,9 +21370,9 @@ Date:   Sat Dec 6 03:36:51 2008 +0000
     
     svn path=/trunk/; revision=401
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/seed-canvas.c |   20 ++++++++++++++++++
- modules/canvas/test14.js     |   47 ++++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am   |  2 +-
+ modules/canvas/seed-canvas.c | 20 +++++++++++++++++++
+ modules/canvas/test14.js     | 47 ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 68 insertions(+), 1 deletion(-)
 
 commit 3fb45abc00f2edc7fbbbb63f6f6c96cc9140a14b
@@ -20013,9 +21383,9 @@ Date:   Sat Dec 6 03:27:01 2008 +0000
     
     svn path=/trunk/; revision=400
 
- modules/canvas/Makefile.am   |    4 +-
- modules/canvas/seed-canvas.c |  157 ++++++++++++++++++++++--------------------
- modules/canvas/test13.js     |   35 ++++++++++
+ modules/canvas/Makefile.am   |   4 +-
+ modules/canvas/seed-canvas.c | 157 ++++++++++++++++++++++---------------------
+ modules/canvas/test13.js     |  35 ++++++++++
  3 files changed, 118 insertions(+), 78 deletions(-)
 
 commit 0efbb6a0207ffd88bea2798f082089c3c1be49e9
@@ -20026,8 +21396,8 @@ Date:   Sat Dec 6 03:16:05 2008 +0000
     
     svn path=/trunk/; revision=399
 
- modules/canvas/Makefile.am |    2 +-
- modules/canvas/test12.js   |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am |  2 +-
+ modules/canvas/test12.js   | 44 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 45 insertions(+), 1 deletion(-)
 
 commit 55a6efb57227a98767bc2b24ecaaced044af4483
@@ -20038,10 +21408,10 @@ Date:   Sat Dec 6 03:14:55 2008 +0000
     
     svn path=/trunk/; revision=398
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/seed-canvas.c |   67 ++++++++++++++++++++++++++++++++++--------
- modules/canvas/test10.js     |   14 ++++++++-
- modules/canvas/test11.js     |   49 ++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am   |  2 +-
+ modules/canvas/seed-canvas.c | 67 +++++++++++++++++++++++++++++++++++---------
+ modules/canvas/test10.js     | 14 ++++++++-
+ modules/canvas/test11.js     | 49 ++++++++++++++++++++++++++++++++
  4 files changed, 117 insertions(+), 15 deletions(-)
 
 commit 5e0bdb4084f4cae7a3b76c993f5dcc74a47ee82f
@@ -20052,7 +21422,7 @@ Date:   Sat Dec 6 02:51:20 2008 +0000
     
     svn path=/trunk/; revision=397
 
- modules/canvas/test10.js |   35 +++++++++++++++++++++++++++++++++++
+ modules/canvas/test10.js | 35 +++++++++++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
 commit e78e2c82fb71f43ff0f72646a6563e065272b705
@@ -20063,9 +21433,9 @@ Date:   Sat Dec 6 02:49:10 2008 +0000
     
     svn path=/trunk/; revision=396
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/seed-canvas.c |   19 +++++++++
- modules/canvas/test9.js      |   94 ++++++++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am   |  2 +-
+ modules/canvas/seed-canvas.c | 19 +++++++++
+ modules/canvas/test9.js      | 94 ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 114 insertions(+), 1 deletion(-)
 
 commit b5c7f6b9a2be6fff5ae1232bb228222334d854ee
@@ -20076,9 +21446,9 @@ Date:   Sat Dec 6 02:37:22 2008 +0000
     
     svn path=/trunk/; revision=395
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/seed-canvas.c |   23 +++++++++++++++++++++++
- modules/canvas/test8.js      |   37 +++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am   |  2 +-
+ modules/canvas/seed-canvas.c | 23 +++++++++++++++++++++++
+ modules/canvas/test8.js      | 37 +++++++++++++++++++++++++++++++++++++
  3 files changed, 61 insertions(+), 1 deletion(-)
 
 commit 753b182b4a2bad3533d8187700e83b644e9bffd3
@@ -20089,9 +21459,9 @@ Date:   Sat Dec 6 02:32:38 2008 +0000
     
     svn path=/trunk/; revision=394
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/seed-canvas.c |   33 +++++++++++++++++++++++++++++++++
- modules/canvas/test7.js      |   37 +++++++++++++++++++++++++++++++++++++
+ modules/canvas/Makefile.am   |  2 +-
+ modules/canvas/seed-canvas.c | 33 +++++++++++++++++++++++++++++++++
+ modules/canvas/test7.js      | 37 +++++++++++++++++++++++++++++++++++++
  3 files changed, 71 insertions(+), 1 deletion(-)
 
 commit e98eaed636d7feedd7850528cc40c33e269e5fa2
@@ -20102,15 +21472,15 @@ Date:   Sat Dec 6 01:50:30 2008 +0000
     
     svn path=/trunk/; revision=393
 
- modules/canvas/Makefile.am   |    2 +-
- modules/canvas/example.js    |   18 ---
- modules/canvas/seed-canvas.c |  256 +++++++++++++++++++++++++++++++++++++++---
- modules/canvas/test1.js      |   34 ++++++
- modules/canvas/test2.js      |   32 ++++++
- modules/canvas/test3.js      |   33 ++++++
- modules/canvas/test4.js      |   38 +++++++
- modules/canvas/test5.js      |   43 +++++++
- modules/canvas/test6.js      |   47 ++++++++
+ modules/canvas/Makefile.am   |   2 +-
+ modules/canvas/example.js    |  18 ---
+ modules/canvas/seed-canvas.c | 256 ++++++++++++++++++++++++++++++++++++++++---
+ modules/canvas/test1.js      |  34 ++++++
+ modules/canvas/test2.js      |  32 ++++++
+ modules/canvas/test3.js      |  33 ++++++
+ modules/canvas/test4.js      |  38 +++++++
+ modules/canvas/test5.js      |  43 ++++++++
+ modules/canvas/test6.js      |  47 ++++++++
  9 files changed, 470 insertions(+), 33 deletions(-)
 
 commit 6e4e41cbdb570a9518c2f976790c56e28e15b0a5
@@ -20121,7 +21491,7 @@ Date:   Fri Dec 5 20:27:00 2008 +0000
     
     svn path=/trunk/; revision=392
 
- examples/turtle/turtle.c |   98 ++++++++++++++++++++++++++++++++++++++++++++++
+ examples/turtle/turtle.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 98 insertions(+)
 
 commit 8714741d403ceffd79b6f10332da6a6cf27fc3c0
@@ -20132,14 +21502,14 @@ Date:   Fri Dec 5 08:09:39 2008 +0000
     
     svn path=/trunk/; revision=391
 
- configure.ac                 |    1 +
- libseed/seed-api.c           |   10 ++
- libseed/seed.h               |    6 +-
- modules/Makefile.am          |    2 +-
- modules/canvas/Makefile.am   |   20 ++++
- modules/canvas/example.js    |   18 +++
- modules/canvas/seed-canvas.c |  254 ++++++++++++++++++++++++++++++++++++++++++
- modules/sqlite/seed-sqlite.c |    4 +-
+ configure.ac                 |   1 +
+ libseed/seed-api.c           |  10 ++
+ libseed/seed.h               |   6 +-
+ modules/Makefile.am          |   2 +-
+ modules/canvas/Makefile.am   |  20 ++++
+ modules/canvas/example.js    |  18 +++
+ modules/canvas/seed-canvas.c | 254 +++++++++++++++++++++++++++++++++++++++++++
+ modules/sqlite/seed-sqlite.c |   4 +-
  8 files changed, 311 insertions(+), 4 deletions(-)
 
 commit a780fefc73364a55ff7cff5fd6bf320f9b0d7131
@@ -20150,7 +21520,8 @@ Date:   Fri Dec 5 05:12:29 2008 +0000
     
     svn path=/trunk/; revision=390
 
- 0 files changed
+ modules/sqlite/example.js | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 7d895f32120e93442a3267ea10b4e69ff9da954a
 Author: Robert Carr <racarr@src.gnome.org>
@@ -20160,13 +21531,13 @@ Date:   Fri Dec 5 05:10:50 2008 +0000
     
     svn path=/trunk/; revision=389
 
- libseed/seed-api.c           |   16 ++++++++
- libseed/seed-engine.c        |    1 +
- libseed/seed-private.h       |    2 +
- libseed/seed.h               |   11 +++++-
- modules/sqlite/Makefile.am   |    2 +
- modules/sqlite/example.js    |   10 +++++
- modules/sqlite/seed-sqlite.c |   83 +++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-api.c           | 16 +++++++++
+ libseed/seed-engine.c        |  1 +
+ libseed/seed-private.h       |  2 ++
+ libseed/seed.h               | 11 +++++-
+ modules/sqlite/Makefile.am   |  2 ++
+ modules/sqlite/example.js    | 10 ++++++
+ modules/sqlite/seed-sqlite.c | 83 +++++++++++++++++++++++++++++++++++++++++++-
  7 files changed, 123 insertions(+), 2 deletions(-)
 
 commit 27001fe91d9d7e89d28e2decdd40e7d7d20f810b
@@ -20177,9 +21548,9 @@ Date:   Fri Dec 5 03:32:41 2008 +0000
     
     svn path=/trunk/; revision=388
 
- libseed/seed-api.c           |   12 ++++++++++++
- libseed/seed.h               |   14 ++++++++++----
- modules/sqlite/seed-sqlite.c |   18 ++++++++++++++++++
+ libseed/seed-api.c           | 12 ++++++++++++
+ libseed/seed.h               | 14 ++++++++++----
+ modules/sqlite/seed-sqlite.c | 18 ++++++++++++++++++
  3 files changed, 40 insertions(+), 4 deletions(-)
 
 commit af7d596f4953f0a6cc8361ed95767eccd25eab1f
@@ -20190,9 +21561,9 @@ Date:   Fri Dec 5 03:15:37 2008 +0000
     
     svn path=/trunk/; revision=387
 
- libseed/seed-api.c           |   27 +++++++++++++++++
- libseed/seed.h               |   38 +++++++++++++++++++++--
- modules/sqlite/seed-sqlite.c |   68 ++++++++++++++++++++++++++++++++++++++----
+ libseed/seed-api.c           | 27 ++++++++++++++++++
+ libseed/seed.h               | 38 +++++++++++++++++++++++--
+ modules/sqlite/seed-sqlite.c | 68 ++++++++++++++++++++++++++++++++++++++++----
  3 files changed, 125 insertions(+), 8 deletions(-)
 
 commit 78571b0aa9ee64ee5dff250b56fc8e9882b48938
@@ -20203,7 +21574,7 @@ Date:   Thu Dec 4 21:04:50 2008 +0000
     
     svn path=/trunk/; revision=386
 
- libseed/seed.h |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed.h | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 102 insertions(+), 5 deletions(-)
 
 commit 1564febc5a87f7bca507868f9cf8ed324d32303b
@@ -20214,8 +21585,8 @@ Date:   Thu Dec 4 20:42:34 2008 +0000
     
     svn path=/trunk/; revision=385
 
- libseed/seed-api.c |   32 ++++++++++++++++++++++++++++++++
- libseed/seed.h     |   25 +++++++++++++++++++++++++
+ libseed/seed-api.c | 32 ++++++++++++++++++++++++++++++++
+ libseed/seed.h     | 25 +++++++++++++++++++++++++
  2 files changed, 57 insertions(+)
 
 commit 938e573953bb1b2c9c4144a55f71dc3db2ba83da
@@ -20226,7 +21597,7 @@ Date:   Mon Dec 1 04:26:45 2008 +0000
     
     svn path=/trunk/; revision=384
 
- libseed/seed-types.c |    2 +-
+ libseed/seed-types.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit be316ebba6ea9d26a63cdd7495eb13844ac9d74f
@@ -20237,7 +21608,7 @@ Date:   Mon Dec 1 03:18:37 2008 +0000
     
     svn path=/trunk/; revision=383
 
- tests/builtin-argument-length.js |    6 ++++++
+ tests/builtin-argument-length.js | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 3546b2f95bca563cd60873d1e2fe56e3adf13b36
@@ -20248,7 +21619,7 @@ Date:   Mon Dec 1 03:17:41 2008 +0000
     
     svn path=/trunk/; revision=382
 
- libseed/seed-builtins.c |   15 ++++++++++-----
+ libseed/seed-builtins.c | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 commit acf0285d8daa6d8f3501e71be5693fe45039ee47
@@ -20259,7 +21630,7 @@ Date:   Mon Dec 1 03:10:34 2008 +0000
     
     svn path=/trunk/; revision=381
 
- tests/builtin-argument-length.js |   55 ++++++++++++++++++++++++++++++++++++++
+ tests/builtin-argument-length.js | 55 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 55 insertions(+)
 
 commit 79b9760ddbe040830b5bb0aa329d75ca5ebd4feb
@@ -20272,7 +21643,7 @@ Date:   Mon Dec 1 03:08:09 2008 +0000
     
     svn path=/trunk/; revision=380
 
- libseed/seed-builtins.c |   99 -----------------------------------------------
+ libseed/seed-builtins.c | 99 -------------------------------------------------
  1 file changed, 99 deletions(-)
 
 commit a3ea09892e64f24252a6053ba7d9de49d62f8722
@@ -20283,7 +21654,7 @@ Date:   Mon Dec 1 03:05:29 2008 +0000
     
     svn path=/trunk/; revision=379
 
- libseed/seed-builtins.c |   12 ++++++------
+ libseed/seed-builtins.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 2a122a14bf9973f6b8056b0cb73eba1f3520f852
@@ -20295,7 +21666,7 @@ Date:   Mon Dec 1 03:00:11 2008 +0000
     
     svn path=/trunk/; revision=378
 
- libseed/seed-builtins.c |    6 +++---
+ libseed/seed-builtins.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit ca96d4c6f59e5bc9a73c761e8e062dccfbbe6932
@@ -20308,7 +21679,7 @@ Date:   Mon Dec 1 02:45:26 2008 +0000
     
     svn path=/trunk/; revision=377
 
- libseed/seed-builtins.c |    5 -----
+ libseed/seed-builtins.c | 5 -----
  1 file changed, 5 deletions(-)
 
 commit b8a6b47a533bb3b8fe68fcbaa3656237d493332e
@@ -20319,7 +21690,8 @@ Date:   Sun Nov 30 22:47:23 2008 +0000
     
     svn path=/trunk/; revision=376
 
- 0 files changed
+ tests/constructor-prototype.js | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit ed5bbd64d6d1cf34621262774cfd942c6dcd6489
 Author: Robert Carr <racarr@src.gnome.org>
@@ -20356,23 +21728,23 @@ Date:   Sun Nov 30 22:39:20 2008 +0000
     
     svn path=/trunk/; revision=375
 
- examples/Makefile.am           |    4 +++-
- examples/introspect.js         |    4 ++--
- examples/n-oscillator.js       |    6 +++---
- examples/video.js              |   24 ++++++++++++++++++++++++
- extensions/Gio.js              |    2 +-
- extensions/Gtk.js              |    6 +++---
- libseed/seed-closure.c         |    5 +++++
- libseed/seed-debug.h           |    8 +++++---
- libseed/seed-engine.c          |   31 ++++++++++++++++++++++++-------
- libseed/seed-gtype.c           |   18 ++++++++++++++++--
- libseed/seed-structs.c         |   16 ++++++++++------
- libseed/seed-types.c           |    5 +++++
- tests/Makefile.am              |    6 +++++-
- tests/closure-finalization.js  |   23 +++++++++++++++++++++++
- tests/constructor-prototype.js |   12 ++++++++++++
- tests/function-info.js         |   10 ++++++++++
- tests/object-info.js           |   19 +++++++++++++++++++
+ examples/Makefile.am           |  4 +++-
+ examples/introspect.js         |  4 ++--
+ examples/n-oscillator.js       |  6 +++---
+ examples/video.js              | 24 ++++++++++++++++++++++++
+ extensions/Gio.js              |  2 +-
+ extensions/Gtk.js              |  6 +++---
+ libseed/seed-closure.c         |  5 +++++
+ libseed/seed-debug.h           |  8 +++++---
+ libseed/seed-engine.c          | 31 ++++++++++++++++++++++++-------
+ libseed/seed-gtype.c           | 18 ++++++++++++++++--
+ libseed/seed-structs.c         | 16 ++++++++++------
+ libseed/seed-types.c           |  5 +++++
+ tests/Makefile.am              |  6 +++++-
+ tests/closure-finalization.js  | 23 +++++++++++++++++++++++
+ tests/constructor-prototype.js | 12 ++++++++++++
+ tests/function-info.js         | 10 ++++++++++
+ tests/object-info.js           | 19 +++++++++++++++++++
  17 files changed, 170 insertions(+), 29 deletions(-)
 
 commit 0a54dbf853069982d192a46c1891c061db7adda2
@@ -20383,7 +21755,7 @@ Date:   Sun Nov 30 05:24:06 2008 +0000
     
     svn path=/trunk/; revision=374
 
- examples/glib/Makefile.am |   14 ++++++++++++++
+ examples/glib/Makefile.am | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 18b1c524f8d356d2db62656f55b76c07c2c693c2
@@ -20396,10 +21768,10 @@ Date:   Sun Nov 30 05:23:25 2008 +0000
     
     svn path=/trunk/; revision=373
 
- configure.ac         |    1 +
- examples/Makefile.am |    3 ++-
- tests/Makefile.am    |    4 ++++
- tests/introspect.js  |   10 ++++++++++
+ configure.ac         |  1 +
+ examples/Makefile.am |  3 ++-
+ tests/Makefile.am    |  4 ++++
+ tests/introspect.js  | 10 ++++++++++
  4 files changed, 17 insertions(+), 1 deletion(-)
 
 commit 572877b94dae5defa323eccd110b9cdb4019b050
@@ -20413,12 +21785,12 @@ Date:   Sun Nov 30 05:09:09 2008 +0000
     
     svn path=/trunk/; revision=372
 
- libseed/seed-builtins.c |   46 ----------------------------------------------
- tests/check-syntax.js   |   12 ++++++++++++
- tests/fork.js           |   16 ++++++++++++++++
- tests/quit.js           |    7 +++++++
- tests/run-tests.py      |   27 ++++++++++++++++++---------
- tests/syntax-test.js    |   13 +------------
+ libseed/seed-builtins.c | 46 ----------------------------------------------
+ tests/check-syntax.js   | 12 ++++++++++++
+ tests/fork.js           | 16 ++++++++++++++++
+ tests/quit.js           |  7 +++++++
+ tests/run-tests.py      | 27 ++++++++++++++++++---------
+ tests/syntax-test.js    | 13 +------------
  6 files changed, 54 insertions(+), 67 deletions(-)
 
 commit 228a0d0483a0359c09d6ddaf8498da67f8c6d861
@@ -20431,8 +21803,8 @@ Date:   Sun Nov 30 02:40:05 2008 +0000
     
     svn path=/trunk/; revision=371
 
- Makefile.am  |    4 ++++
- configure.ac |    2 +-
+ Makefile.am  | 4 ++++
+ configure.ac | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit d525c665cf9d9258e8ec3ff251e54e7ce352bad4
@@ -20443,7 +21815,7 @@ Date:   Sun Nov 30 02:35:06 2008 +0000
     
     svn path=/trunk/; revision=370
 
- configure.ac |   10 ++++++----
+ configure.ac | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit afbf1d2991b53b6266a24f006c3a874ad434d706
@@ -20454,8 +21826,8 @@ Date:   Sun Nov 30 01:49:35 2008 +0000
     
     svn path=/trunk/; revision=369
 
- modules/example/Makefile.am |    3 ++-
- modules/sqlite/Makefile.am  |    3 ++-
+ modules/example/Makefile.am | 3 ++-
+ modules/sqlite/Makefile.am  | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 5257a53126a1980995708fac60fd5b8085dc0dcc
@@ -20466,8 +21838,8 @@ Date:   Sun Nov 30 01:45:53 2008 +0000
     
     svn path=/trunk/; revision=368
 
- modules/example/Makefile.am |    4 +++-
- modules/sqlite/Makefile.am  |    4 +++-
+ modules/example/Makefile.am | 4 +++-
+ modules/sqlite/Makefile.am  | 4 +++-
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit e37baa7b8db6055f3d2897a4547e6eceb29213d4
@@ -20478,10 +21850,10 @@ Date:   Sun Nov 30 01:22:05 2008 +0000
     
     svn path=/trunk/; revision=367
 
- examples/glib/env.js     |    7 +++++++
- examples/glib/thread.js  |   27 +++++++++++++++++++++++++++
- examples/glib/timeout.js |   19 +++++++++++++++++++
- examples/glib/timer.js   |   12 ++++++++++++
+ examples/glib/env.js     |  7 +++++++
+ examples/glib/thread.js  | 27 +++++++++++++++++++++++++++
+ examples/glib/timeout.js | 19 +++++++++++++++++++
+ examples/glib/timer.js   | 12 ++++++++++++
  4 files changed, 65 insertions(+)
 
 commit d55603ed3f19fcc5141e8e7649039c803492ce2b
@@ -20493,8 +21865,8 @@ Date:   Sat Nov 29 05:54:02 2008 +0000
     
     svn path=/trunk/; revision=366
 
- examples/mini-browser.js |   39 +++++++++++++++++++++++++--------------
- tests/Makefile.am        |    1 +
+ examples/mini-browser.js | 39 +++++++++++++++++++++++++--------------
+ tests/Makefile.am        |  1 +
  2 files changed, 26 insertions(+), 14 deletions(-)
 
 commit 47578065822ad809290068768bacc50f6a84cbe0
@@ -20505,7 +21877,7 @@ Date:   Sat Nov 29 01:09:57 2008 +0000
     
     svn path=/trunk/; revision=365
 
- Makefile.am |    2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 01f60beb009489262ccc25d25826f57c992e6cff
@@ -20516,8 +21888,8 @@ Date:   Sat Nov 29 01:02:24 2008 +0000
     
     svn path=/trunk/; revision=364
 
- Makefile.am  |    2 +-
- configure.ac |    2 +-
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 79e43372e405da07e7cb8cb1bc90267dc4f327c4
@@ -20530,11 +21902,11 @@ Date:   Sat Nov 29 00:34:13 2008 +0000
     
     svn path=/trunk/; revision=363
 
- Makefile.am               |   10 +++++++--
- configure.ac              |   50 ++++++++++++++++++++++++++-------------------
- libseed/Makefile.am       |    4 ++--
- src/Makefile.am           |    5 +++--
- tests/struct-functions.js |   10 +++++++++
+ Makefile.am               | 10 ++++++++--
+ configure.ac              | 50 +++++++++++++++++++++++++++--------------------
+ libseed/Makefile.am       |  4 ++--
+ src/Makefile.am           |  5 +++--
+ tests/struct-functions.js | 10 ++++++++++
  5 files changed, 52 insertions(+), 27 deletions(-)
 
 commit 4f45938c409910867eea993a7b2dd907799bea96
@@ -20545,7 +21917,7 @@ Date:   Sat Nov 29 00:28:21 2008 +0000
     
     svn path=/trunk/; revision=362
 
- MAINTAINERS |    4 ++++
+ MAINTAINERS | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 1d00692877b84fc53f264a4fe6a452d7867a9bc0
@@ -20556,7 +21928,7 @@ Date:   Fri Nov 28 05:17:26 2008 +0000
     
     svn path=/trunk/; revision=361
 
- libseed/seed-engine.c |   10 ++++++++--
+ libseed/seed-engine.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 8ff8592c6d309df6feb519003cf33b43b8a1442c
@@ -20567,7 +21939,7 @@ Date:   Fri Nov 28 05:06:49 2008 +0000
     
     svn path=/trunk/; revision=360
 
- libseed/seed-engine.c |   10 +++++++++-
+ libseed/seed-engine.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit 7ff443ffda9dbb2a29198ba6f1ace2dccd65bfb8
@@ -20578,7 +21950,7 @@ Date:   Fri Nov 28 05:01:55 2008 +0000
     
     svn path=/trunk/; revision=359
 
- libseed/seed-engine.c |    1 +
+ libseed/seed-engine.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 5b121a67c1d73f23451df5153473ed86e4a17da0
@@ -20589,7 +21961,7 @@ Date:   Fri Nov 28 04:34:12 2008 +0000
     
     svn path=/trunk/; revision=358
 
- libseed/seed-engine.c |   14 +++++++-------
+ libseed/seed-engine.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 9d54f6590c1807021c08780e7490ef6284789186
@@ -20600,12 +21972,12 @@ Date:   Fri Nov 28 04:28:19 2008 +0000
     
     svn path=/trunk/; revision=357
 
- examples/gconf.js              |    2 +-
- examples/ide/ide-sourceview.js |    6 +++---
- examples/lightsoff/main.js     |    2 +-
- examples/pango.js              |    2 +-
- libseed/seed-engine.c          |   14 +++++++-------
- libseed/seed-structs.c         |    2 +-
+ examples/gconf.js              |  2 +-
+ examples/ide/ide-sourceview.js |  6 +++---
+ examples/lightsoff/main.js     |  2 +-
+ examples/pango.js              |  2 +-
+ libseed/seed-engine.c          | 14 +++++++-------
+ libseed/seed-structs.c         |  2 +-
  6 files changed, 14 insertions(+), 14 deletions(-)
 
 commit ec762fa27a94a9bae63770ffb42df1aa5039eb7c
@@ -20616,7 +21988,7 @@ Date:   Thu Nov 27 04:04:45 2008 +0000
     
     svn path=/trunk/; revision=356
 
- libseed/seed-types.c |   13 +++++++------
+ libseed/seed-types.c | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 commit 8b170840ee7d4840763d50139fc631606c57684f
@@ -20627,14 +21999,14 @@ Date:   Thu Nov 27 04:03:43 2008 +0000
     
     svn path=/trunk/; revision=355
 
- libseed/seed-builtins.c      |    8 +-
- libseed/seed-engine.c        |   27 +--
- libseed/seed-exceptions.c    |    2 +-
- libseed/seed-gtype.c         |   25 +--
- libseed/seed-types.c         |  375 +++++++++++++++++++++++++-----------------
- libseed/seed-types.h         |  123 ++++++++++----
- libseed/seed.h               |  127 +++++++++-----
- modules/sqlite/seed-sqlite.c |    2 +-
+ libseed/seed-builtins.c      |   8 +-
+ libseed/seed-engine.c        |  27 ++--
+ libseed/seed-exceptions.c    |   2 +-
+ libseed/seed-gtype.c         |  25 +--
+ libseed/seed-types.c         | 375 +++++++++++++++++++++++++------------------
+ libseed/seed-types.h         | 123 ++++++++++----
+ libseed/seed.h               | 127 ++++++++++-----
+ modules/sqlite/seed-sqlite.c |   2 +-
  8 files changed, 432 insertions(+), 257 deletions(-)
 
 commit 6068de46780082ea223d6046b051fc1793ed456b
@@ -20645,7 +22017,7 @@ Date:   Thu Nov 27 03:40:30 2008 +0000
     
     svn path=/trunk/; revision=354
 
- modules/sqlite/seed-sqlite.c |    2 +-
+ modules/sqlite/seed-sqlite.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d49d97e2bdf972dfa9d1466d2d7119786b63551a
@@ -20656,20 +22028,20 @@ Date:   Wed Nov 26 00:59:00 2008 +0000
     
     svn path=/trunk/; revision=353
 
- libseed/seed-api.c        |    4 +-
- libseed/seed-builtins.c   |   68 ++++++++++++++----------
- libseed/seed-closure.c    |   19 ++++---
- libseed/seed-closure.h    |    1 -
- libseed/seed-engine.c     |  122 +++++++++++++++++++++++-------------------
- libseed/seed-engine.h     |   10 ++--
- libseed/seed-exceptions.c |   18 +++----
- libseed/seed-gtype.c      |   74 +++++++++++++++-----------
- libseed/seed-gtype.h      |    2 +-
- libseed/seed-signals.c    |   33 +++++++-----
- libseed/seed-structs.c    |   32 +++++++-----
- libseed/seed-types.c      |  128 ++++++++++++++++++++++++---------------------
- libseed/seed-types.h      |   26 ++++++---
- libseed/seed.h            |    9 ++--
+ libseed/seed-api.c        |   4 +-
+ libseed/seed-builtins.c   |  68 ++++++++++++++----------
+ libseed/seed-closure.c    |  19 ++++---
+ libseed/seed-closure.h    |   1 -
+ libseed/seed-engine.c     | 122 ++++++++++++++++++++++++-------------------
+ libseed/seed-engine.h     |  10 ++--
+ libseed/seed-exceptions.c |  18 +++----
+ libseed/seed-gtype.c      |  74 ++++++++++++++++-----------
+ libseed/seed-gtype.h      |   2 +-
+ libseed/seed-signals.c    |  33 +++++++-----
+ libseed/seed-structs.c    |  32 +++++++-----
+ libseed/seed-types.c      | 128 +++++++++++++++++++++++++---------------------
+ libseed/seed-types.h      |  26 +++++++---
+ libseed/seed.h            |   9 ++--
  14 files changed, 316 insertions(+), 230 deletions(-)
 
 commit aa9c0332cd083131ff487cb319cf907cb9ab6563
@@ -20680,10 +22052,10 @@ Date:   Tue Nov 25 07:05:09 2008 +0000
     
     svn path=/trunk/; revision=352
 
- libseed/seed-engine.c  |    2 +-
- libseed/seed-structs.c |   17 +++++++++--------
- libseed/seed-structs.h |    3 ++-
- libseed/seed-types.c   |    5 ++++-
+ libseed/seed-engine.c  |  2 +-
+ libseed/seed-structs.c | 17 +++++++++--------
+ libseed/seed-structs.h |  3 ++-
+ libseed/seed-types.c   |  5 ++++-
  4 files changed, 16 insertions(+), 11 deletions(-)
 
 commit 9ea8c34ccda73b8bae9a73c7f935a6df6cf2eee6
@@ -20694,12 +22066,12 @@ Date:   Tue Nov 25 07:02:41 2008 +0000
     
     svn path=/trunk/; revision=351
 
- libseed/seed-builtins.c |    2 +-
- libseed/seed-engine.c   |    5 +++--
- libseed/seed-gtype.c    |    8 ++++----
- libseed/seed-structs.c  |   52 ++++++++++++++++++++++++++++-------------------
- libseed/seed-structs.h  |   20 +++++++++++-------
- libseed/seed-types.c    |   28 ++++++++++++++++---------
+ libseed/seed-builtins.c |  2 +-
+ libseed/seed-engine.c   |  5 +++--
+ libseed/seed-gtype.c    |  8 ++++----
+ libseed/seed-structs.c  | 52 +++++++++++++++++++++++++++++--------------------
+ libseed/seed-structs.h  | 20 ++++++++++++-------
+ libseed/seed-types.c    | 28 ++++++++++++++++----------
  6 files changed, 70 insertions(+), 45 deletions(-)
 
 commit 97aaa6b8b5e5bd2098bf50f4812a9a46e51708a4
@@ -20710,10 +22082,10 @@ Date:   Tue Nov 25 06:52:01 2008 +0000
     
     svn path=/trunk/; revision=350
 
- libseed/seed-builtins.c |    6 +++---
- libseed/seed-closure.c  |   20 ++++++++++++--------
- libseed/seed-closure.h  |    7 +++++--
- libseed/seed-types.c    |    6 ++++--
+ libseed/seed-builtins.c |  6 +++---
+ libseed/seed-closure.c  | 20 ++++++++++++--------
+ libseed/seed-closure.h  |  7 +++++--
+ libseed/seed-types.c    |  6 ++++--
  4 files changed, 24 insertions(+), 15 deletions(-)
 
 commit 796fa55b9dd5d97c52fec18d82e81c895178d373
@@ -20724,7 +22096,7 @@ Date:   Tue Nov 25 06:46:59 2008 +0000
     
     svn path=/trunk/; revision=349
 
- libseed/seed-closure.c |    2 --
+ libseed/seed-closure.c | 2 --
  1 file changed, 2 deletions(-)
 
 commit 22db57848e0ea3701a454d24b8cc27e527f5cd24
@@ -20735,10 +22107,10 @@ Date:   Tue Nov 25 06:45:10 2008 +0000
     
     svn path=/trunk/; revision=348
 
- libseed/seed-api.c           |   14 ++++++++++----
- libseed/seed.h               |    9 ++++++---
- modules/sqlite/seed-sqlite.c |    2 +-
- src/main.c                   |    8 ++++----
+ libseed/seed-api.c           | 14 ++++++++++----
+ libseed/seed.h               |  9 ++++++---
+ modules/sqlite/seed-sqlite.c |  2 +-
+ src/main.c                   |  8 ++++----
  4 files changed, 21 insertions(+), 12 deletions(-)
 
 commit 0b6fadfa03e11b083715b2f9be589135b3feb658
@@ -20749,13 +22121,13 @@ Date:   Tue Nov 25 06:40:15 2008 +0000
     
     svn path=/trunk/; revision=347
 
- libseed/seed-engine.c     |    4 +--
- libseed/seed-exceptions.c |   26 ++++++++++----------
- libseed/seed-exceptions.h |   10 ++++----
- libseed/seed-gtype.c      |   60 +++------------------------------------------
- libseed/seed-signals.c    |    5 ++--
- libseed/seed.h            |   12 ++++-----
- src/main.c                |   20 ++++++++-------
+ libseed/seed-engine.c     |  4 ++--
+ libseed/seed-exceptions.c | 26 ++++++++++----------
+ libseed/seed-exceptions.h | 10 ++++----
+ libseed/seed-gtype.c      | 60 ++++-------------------------------------------
+ libseed/seed-signals.c    |  5 ++--
+ libseed/seed.h            | 12 +++++-----
+ src/main.c                | 20 +++++++++-------
  7 files changed, 44 insertions(+), 93 deletions(-)
 
 commit dab2c8e13132811a0047709ca8b8c4bed1c2677f
@@ -20766,9 +22138,9 @@ Date:   Tue Nov 25 06:32:55 2008 +0000
     
     svn path=/trunk/; revision=346
 
- libseed/seed-engine.c     |    4 ++--
- libseed/seed-exceptions.c |    6 ++++--
- libseed/seed-exceptions.h |    3 ++-
+ libseed/seed-engine.c     | 4 ++--
+ libseed/seed-exceptions.c | 6 ++++--
+ libseed/seed-exceptions.h | 3 ++-
  3 files changed, 8 insertions(+), 5 deletions(-)
 
 commit 44e05fc61ba1d96b1ecd456017935a4c1c969e4d
@@ -20779,15 +22151,15 @@ Date:   Tue Nov 25 06:30:23 2008 +0000
     
     svn path=/trunk/; revision=345
 
- libseed/seed-builtins.c   |   20 ++++++++++----------
- libseed/seed-engine.c     |   16 ++++++++--------
- libseed/seed-exceptions.c |   17 +++++++++++------
- libseed/seed-exceptions.h |    2 +-
- libseed/seed-gtype.c      |   16 ++++++++--------
- libseed/seed-signals.c    |    6 +++---
- libseed/seed-structs.c    |    2 +-
- libseed/seed-types.c      |   28 ++++++++++++++--------------
- libseed/seed.h            |    3 ++-
+ libseed/seed-builtins.c   | 20 ++++++++++----------
+ libseed/seed-engine.c     | 16 ++++++++--------
+ libseed/seed-exceptions.c | 17 +++++++++++------
+ libseed/seed-exceptions.h |  2 +-
+ libseed/seed-gtype.c      | 16 ++++++++--------
+ libseed/seed-signals.c    |  6 +++---
+ libseed/seed-structs.c    |  2 +-
+ libseed/seed-types.c      | 28 ++++++++++++++--------------
+ libseed/seed.h            |  3 ++-
  9 files changed, 58 insertions(+), 52 deletions(-)
 
 commit 3a2cfa3e9e249bd8063f2dad0138cb57bc819295
@@ -20798,7 +22170,7 @@ Date:   Tue Nov 25 02:10:14 2008 +0000
     
     svn path=/trunk/; revision=344
 
- libseed/Makefile.am |    7 ++++---
+ libseed/Makefile.am | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 94f72482f580932b2188d5f4059285f4e09c389b
@@ -20809,7 +22181,7 @@ Date:   Tue Nov 25 02:07:59 2008 +0000
     
     svn path=/trunk/; revision=343
 
- examples/Makefile.am |    1 -
+ examples/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 commit 896481d246ef4a0944c1e94bcd252c1a294f308d
@@ -20820,9 +22192,9 @@ Date:   Tue Nov 25 01:54:11 2008 +0000
     
     svn path=/trunk/; revision=342
 
- libseed/seed-builtins.c |   59 +++++++++++++++++++++++++----------------------
- libseed/seed-builtins.h |   32 +------------------------
- libseed/seed-engine.c   |    2 +-
+ libseed/seed-builtins.c | 59 +++++++++++++++++++++++++++----------------------
+ libseed/seed-builtins.h | 32 +--------------------------
+ libseed/seed-engine.c   |  2 +-
  3 files changed, 34 insertions(+), 59 deletions(-)
 
 commit 63fd7f36c9669baf6e869bbaf3d5f9c133c07beb
@@ -20833,8 +22205,8 @@ Date:   Tue Nov 25 01:44:37 2008 +0000
     
     svn path=/trunk/; revision=341
 
- libseed/seed-closure.h |    1 +
- libseed/seed-signals.c |   27 ++++++++++++++-------------
+ libseed/seed-closure.h |  1 +
+ libseed/seed-signals.c | 27 ++++++++++++++-------------
  2 files changed, 15 insertions(+), 13 deletions(-)
 
 commit eb72a33f315bcb2798bc189f4042395d70667e1c
@@ -20845,9 +22217,9 @@ Date:   Tue Nov 25 01:34:50 2008 +0000
     
     svn path=/trunk/; revision=340
 
- libseed/seed-engine.c  |    2 +-
- libseed/seed-signals.c |   22 +++++++++++++---------
- libseed/seed-signals.h |    3 ++-
+ libseed/seed-engine.c  |  2 +-
+ libseed/seed-signals.c | 22 +++++++++++++---------
+ libseed/seed-signals.h |  3 ++-
  3 files changed, 16 insertions(+), 11 deletions(-)
 
 commit 19d64df739010644bf0d3e29f74d19c188085f31
@@ -20858,8 +22230,8 @@ Date:   Tue Nov 25 01:30:49 2008 +0000
     
     svn path=/trunk/; revision=339
 
- libseed/seed-signals.c  |   12 ++++++------
- tests/signal-connect.js |    2 +-
+ libseed/seed-signals.c  | 12 ++++++------
+ tests/signal-connect.js |  2 +-
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 commit 4b34ccc908e0b52b6d611ff012479c21a01b3607
@@ -20870,7 +22242,7 @@ Date:   Tue Nov 25 01:27:03 2008 +0000
     
     svn path=/trunk/; revision=338
 
- examples/lightsoff/score.js |   10 ----------
+ examples/lightsoff/score.js | 10 ----------
  1 file changed, 10 deletions(-)
 
 commit cb33a99dbaeb6cacfc32084e1b1aa59b5011e200
@@ -20881,7 +22253,7 @@ Date:   Tue Nov 25 01:20:30 2008 +0000
     
     svn path=/trunk/; revision=337
 
- configure.ac |    1 -
+ configure.ac | 1 -
  1 file changed, 1 deletion(-)
 
 commit a74aade29170b02c965134bad0fb63b27a283f80
@@ -20892,10 +22264,10 @@ Date:   Tue Nov 25 01:18:16 2008 +0000
     
     svn path=/trunk/; revision=336
 
- Makefile.am          |    1 -
- examples/Makefile.am |    1 -
- examples/cairo.js    |   40 ----------------------------------------
- gir/Makefile.am      |   28 ----------------------------
+ Makefile.am          |  1 -
+ examples/Makefile.am |  1 -
+ examples/cairo.js    | 40 ----------------------------------------
+ gir/Makefile.am      | 28 ----------------------------
  4 files changed, 70 deletions(-)
 
 commit b0d33c814b838c8838e331e6100f9d09ee7e5ba5
@@ -20906,9 +22278,9 @@ Date:   Tue Nov 25 00:56:38 2008 +0000
     
     svn path=/trunk/; revision=335
 
- libseed/seed-api.c    |   36 ++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.c |   35 -----------------------------------
- libseed/seed.h        |   12 +++++++++---
+ libseed/seed-api.c    | 36 ++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c | 35 -----------------------------------
+ libseed/seed.h        | 12 +++++++++---
  3 files changed, 45 insertions(+), 38 deletions(-)
 
 commit 728cf465a88b0d698ffaa4211b3d5a6c4007877a
@@ -20919,10 +22291,10 @@ Date:   Tue Nov 25 00:49:47 2008 +0000
     
     svn path=/trunk/; revision=334
 
- libseed/Makefile.am          |    1 +
- libseed/seed-api.c           |    6 ++++++
- libseed/seed.h               |   12 ++++++++++++
- modules/sqlite/seed-sqlite.c |   37 ++++++++++++++++++++++++++++++++++++-
+ libseed/Makefile.am          |  1 +
+ libseed/seed-api.c           |  6 ++++++
+ libseed/seed.h               | 12 ++++++++++++
+ modules/sqlite/seed-sqlite.c | 37 ++++++++++++++++++++++++++++++++++++-
  4 files changed, 55 insertions(+), 1 deletion(-)
 
 commit 5386571f89d00e69bfc7c9cfc35f8d9c8842fc57
@@ -20933,12 +22305,12 @@ Date:   Tue Nov 25 00:29:24 2008 +0000
     
     svn path=/trunk/; revision=333
 
- configure.ac                 |    1 +
- libseed/seed.h               |    4 ++++
- modules/Makefile.am          |    2 +-
- modules/example/example.c    |    2 --
- modules/sqlite/Makefile.am   |   14 ++++++++++++++
- modules/sqlite/seed-sqlite.c |    7 +++++++
+ configure.ac                 |  1 +
+ libseed/seed.h               |  4 ++++
+ modules/Makefile.am          |  2 +-
+ modules/example/example.c    |  2 --
+ modules/sqlite/Makefile.am   | 14 ++++++++++++++
+ modules/sqlite/seed-sqlite.c |  7 +++++++
  6 files changed, 27 insertions(+), 3 deletions(-)
 
 commit 36c49d948765667ae7a49be06ff937d6f599c064
@@ -20949,8 +22321,8 @@ Date:   Mon Nov 24 14:20:30 2008 +0000
     
     svn path=/trunk/; revision=332
 
- libseed/seed-structs.c |    2 ++
- libseed/seed-types.c   |    1 -
+ libseed/seed-structs.c | 2 ++
+ libseed/seed-types.c   | 1 -
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 5c3fa3ecd5ff0b16c9a08cd40f3ad779d93eacf0
@@ -20961,8 +22333,8 @@ Date:   Mon Nov 24 07:24:30 2008 +0000
     
     svn path=/trunk/; revision=331
 
- libseed/seed-structs.c |    2 +-
- libseed/seed-types.c   |   23 +++++++++++++++++++++++
+ libseed/seed-structs.c |  2 +-
+ libseed/seed-types.c   | 23 +++++++++++++++++++++++
  2 files changed, 24 insertions(+), 1 deletion(-)
 
 commit bb7685e3823e085a86db17fb1fbb3adfc48e5d5a
@@ -20973,7 +22345,7 @@ Date:   Mon Nov 24 07:16:23 2008 +0000
     
     svn path=/trunk/; revision=330
 
- libseed/seed-types.c |    7 +++++++
+ libseed/seed-types.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit b49eeaa01a5091897f59d4eb708eb4b26f770610
@@ -20984,9 +22356,9 @@ Date:   Mon Nov 24 07:10:43 2008 +0000
     
     svn path=/trunk/; revision=329
 
- libseed/seed-engine.c  |   85 +++++-----------------------------------------
- libseed/seed-structs.c |   88 ++++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-structs.h |    6 ++++
+ libseed/seed-engine.c  | 85 +++++-------------------------------------------
+ libseed/seed-structs.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-structs.h |  6 ++++
  3 files changed, 102 insertions(+), 77 deletions(-)
 
 commit f21ab0057cd03f4d1f557fecba5fa76bf27076b1
@@ -20997,8 +22369,8 @@ Date:   Mon Nov 24 06:56:51 2008 +0000
     
     svn path=/trunk/; revision=328
 
- tests/Makefile.am           |    1 +
- tests/struct-constructor.js |   12 ++++++++++++
+ tests/Makefile.am           |  1 +
+ tests/struct-constructor.js | 12 ++++++++++++
  2 files changed, 13 insertions(+)
 
 commit 9e8b209baa6edd3cf6da38b8abd3537419ecdb77
@@ -21009,9 +22381,9 @@ Date:   Mon Nov 24 06:52:30 2008 +0000
     
     svn path=/trunk/; revision=327
 
- libseed/seed-engine.c  |   63 ++++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-structs.c |    4 +--
- libseed/seed-structs.h |    5 ++++
+ libseed/seed-engine.c  | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-structs.c |  4 ++--
+ libseed/seed-structs.h |  5 ++++
  3 files changed, 70 insertions(+), 2 deletions(-)
 
 commit df62eb494cea90869737de9d5d4bf59ab45142a7
@@ -21022,9 +22394,9 @@ Date:   Mon Nov 24 06:31:38 2008 +0000
     
     svn path=/trunk/; revision=326
 
- libseed/seed-debug.h   |    3 ++-
- libseed/seed-engine.c  |    3 ++-
- libseed/seed-structs.c |   22 ++++++++++++++++++++++
+ libseed/seed-debug.h   |  3 ++-
+ libseed/seed-engine.c  |  3 ++-
+ libseed/seed-structs.c | 22 ++++++++++++++++++++++
  3 files changed, 26 insertions(+), 2 deletions(-)
 
 commit fc94bfe5c57c39da4c3d68ffd71e64692d0a6fef
@@ -21035,7 +22407,7 @@ Date:   Mon Nov 24 06:19:32 2008 +0000
     
     svn path=/trunk/; revision=325
 
- libseed/seed-structs.c |    1 +
+ libseed/seed-structs.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8ca78cfbaf52267d3323579a24daceb37582551c
@@ -21046,8 +22418,8 @@ Date:   Mon Nov 24 06:15:38 2008 +0000
     
     svn path=/trunk/; revision=324
 
- tests/Makefile.am          |    1 +
- tests/struct-nested-set.js |   17 +++++++++++++++++
+ tests/Makefile.am          |  1 +
+ tests/struct-nested-set.js | 17 +++++++++++++++++
  2 files changed, 18 insertions(+)
 
 commit 6f15f0b9afcaa54ccf3d0924c578f9f4e9a41e24
@@ -21058,8 +22430,8 @@ Date:   Mon Nov 24 06:10:00 2008 +0000
     
     svn path=/trunk/; revision=323
 
- tests/Makefile.am          |    1 +
- tests/struct-set-member.js |   15 +++++++++++++++
+ tests/Makefile.am          |  1 +
+ tests/struct-set-member.js | 15 +++++++++++++++
  2 files changed, 16 insertions(+)
 
 commit a3acf111b850e5d5e12970f2a7ea29ecdfa8c59d
@@ -21070,7 +22442,7 @@ Date:   Mon Nov 24 06:06:45 2008 +0000
     
     svn path=/trunk/; revision=322
 
- libseed/seed-engine.c |   87 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-engine.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 86 insertions(+), 1 deletion(-)
 
 commit 13c9f2b053b186ab95ab96c8518c9736d255801f
@@ -21081,8 +22453,8 @@ Date:   Mon Nov 24 05:52:44 2008 +0000
     
     svn path=/trunk/; revision=321
 
- libseed/seed-structs.c |   22 ++++++++++++++++++++--
- libseed/seed-structs.h |    2 ++
+ libseed/seed-structs.c | 22 ++++++++++++++++++++--
+ libseed/seed-structs.h |  2 ++
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 commit 03811bb34083f979f9fc265aca8e24ff2aa98a19
@@ -21093,7 +22465,7 @@ Date:   Mon Nov 24 05:46:27 2008 +0000
     
     svn path=/trunk/; revision=320
 
- libseed/seed-structs.c |   38 +++++++++++++++++++++++++++++++++++++-
+ libseed/seed-structs.c | 38 +++++++++++++++++++++++++++++++++++++-
  1 file changed, 37 insertions(+), 1 deletion(-)
 
 commit 01064e5b9ca076050a19a18580b926a1d46bfcbc
@@ -21107,7 +22479,7 @@ Date:   Mon Nov 24 03:37:37 2008 +0000
     
     svn path=/trunk/; revision=319
 
- libseed/seed-engine.c |    3 +++
+ libseed/seed-engine.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 741d504f5c63f0ebea15b9247546b5dea538240e
@@ -21118,9 +22490,9 @@ Date:   Mon Nov 24 03:27:59 2008 +0000
     
     svn path=/trunk/; revision=318
 
- libseed/seed-engine.c  |   13 +------------
- libseed/seed-structs.c |    2 +-
- libseed/seed-structs.h |    5 +++++
+ libseed/seed-engine.c  | 13 +------------
+ libseed/seed-structs.c |  2 +-
+ libseed/seed-structs.h |  5 +++++
  3 files changed, 7 insertions(+), 13 deletions(-)
 
 commit e77c6a1f31c4d87adb0052250d478c309ed1080d
@@ -21131,7 +22503,7 @@ Date:   Mon Nov 24 03:24:37 2008 +0000
     
     svn path=/trunk/; revision=317
 
- libseed/seed-structs.c |  114 +++++++++++++++++++-----------------------------
+ libseed/seed-structs.c | 114 +++++++++++++++++++------------------------------
  1 file changed, 45 insertions(+), 69 deletions(-)
 
 commit 12fce6be3256c65bbfb244833115d227deccf0a4
@@ -21142,7 +22514,7 @@ Date:   Mon Nov 24 01:08:48 2008 +0000
     
     svn path=/trunk/; revision=316
 
- tests/make-test.py |    1 +
+ tests/make-test.py | 1 +
  1 file changed, 1 insertion(+)
 
 commit ecaaa716d2c2ee03e3da57cd3aa2b21583d538b7
@@ -21153,8 +22525,8 @@ Date:   Mon Nov 24 01:06:19 2008 +0000
     
     svn path=/trunk/; revision=315
 
- tests/Makefile.am |    1 +
- tests/c-module.js |    6 ++++++
+ tests/Makefile.am | 1 +
+ tests/c-module.js | 6 ++++++
  2 files changed, 7 insertions(+)
 
 commit 969c26241b72a033325f8ec0603f02fbe89ae6c9
@@ -21165,12 +22537,12 @@ Date:   Mon Nov 24 01:04:35 2008 +0000
     
     svn path=/trunk/; revision=314
 
- Makefile.am                 |    1 +
- configure.ac                |    2 ++
- libseed/seed-engine.c       |    8 ++++----
- modules/Makefile.am         |    1 +
- modules/example/Makefile.am |   14 ++++++++++++++
- modules/example/example.c   |    8 ++++++++
+ Makefile.am                 |  1 +
+ configure.ac                |  2 ++
+ libseed/seed-engine.c       |  8 ++++----
+ modules/Makefile.am         |  1 +
+ modules/example/Makefile.am | 14 ++++++++++++++
+ modules/example/example.c   |  8 ++++++++
  6 files changed, 30 insertions(+), 4 deletions(-)
 
 commit c426e4259dc76df632ce604dc53282945da44ddd
@@ -21181,11 +22553,11 @@ Date:   Mon Nov 24 00:38:44 2008 +0000
     
     svn path=/trunk/; revision=313
 
- libseed/Makefile.am    |    1 +
- libseed/seed-engine.c  |   48 ++++++++++++++++++++++++++++++++++++++++++++----
- libseed/seed-engine.h  |    2 ++
- libseed/seed-private.h |    1 +
- libseed/seed.h         |    8 ++++++++
+ libseed/Makefile.am    |  1 +
+ libseed/seed-engine.c  | 48 ++++++++++++++++++++++++++++++++++++++++++++----
+ libseed/seed-engine.h  |  2 ++
+ libseed/seed-private.h |  1 +
+ libseed/seed.h         |  8 ++++++++
  5 files changed, 56 insertions(+), 4 deletions(-)
 
 commit 0f14d6b0335f113b0de6ab02647fca52d4e39e0a
@@ -21197,8 +22569,8 @@ Date:   Sun Nov 23 04:59:43 2008 +0000
     
     svn path=/trunk/; revision=312
 
- tests/Makefile.am       |    1 +
- tests/signal-connect.js |   21 +++++++++++++++++++++
+ tests/Makefile.am       |  1 +
+ tests/signal-connect.js | 21 +++++++++++++++++++++
  2 files changed, 22 insertions(+)
 
 commit 005c79de9b7d5ba26381028a3e963b8641318c31
@@ -21209,8 +22581,8 @@ Date:   Sun Nov 23 04:23:22 2008 +0000
     
     svn path=/trunk/; revision=311
 
- libseed/seed-structs.c |    2 +-
- libseed/seed-types.c   |    3 +++
+ libseed/seed-structs.c | 2 +-
+ libseed/seed-types.c   | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit d42e423bedc0f7d7a2090ce1f8438c4220bd74be
@@ -21221,8 +22593,8 @@ Date:   Sun Nov 23 02:15:55 2008 +0000
     
     svn path=/trunk/; revision=310
 
- libseed/seed-builtins.c |   10 ++++----
- libseed/seed-gtype.c    |   64 +++++++++++++++++++++++------------------------
+ libseed/seed-builtins.c | 10 ++++----
+ libseed/seed-gtype.c    | 64 ++++++++++++++++++++++++-------------------------
  2 files changed, 37 insertions(+), 37 deletions(-)
 
 commit 938ea070a0858cc69a194ccee84f90d4f6775a83
@@ -21233,9 +22605,9 @@ Date:   Sun Nov 23 02:11:33 2008 +0000
     
     svn path=/trunk/; revision=309
 
- libseed/seed-engine.c |   59 ++++++++++++++++++++++++-------------------------
- libseed/seed-gtype.c  |    1 -
- libseed/seed.h        |    2 +-
+ libseed/seed-engine.c | 59 +++++++++++++++++++++++++--------------------------
+ libseed/seed-gtype.c  |  1 -
+ libseed/seed.h        |  2 +-
  3 files changed, 30 insertions(+), 32 deletions(-)
 
 commit 2534088a1589e38c7cfaddd7d71b99148e8fd05b
@@ -21247,7 +22619,7 @@ Date:   Sat Nov 22 23:10:28 2008 +0000
     
     svn path=/trunk/; revision=308
 
- libseed/seed-signals.c |   30 +++++++++---------------------
+ libseed/seed-signals.c | 30 +++++++++---------------------
  1 file changed, 9 insertions(+), 21 deletions(-)
 
 commit 6d0eece0f55a25acedd947d7daec9a3cb933c2c0
@@ -21260,7 +22632,7 @@ Date:   Sat Nov 22 22:37:02 2008 +0000
     
     svn path=/trunk/; revision=307
 
- libseed/seed-signals.c |  170 ++++++++++++++++++++++++++++++++++++------------
+ libseed/seed-signals.c | 170 +++++++++++++++++++++++++++++++++++++------------
  1 file changed, 128 insertions(+), 42 deletions(-)
 
 commit 86295cd04aef12b318175488f30697035c798a73
@@ -21271,7 +22643,7 @@ Date:   Sat Nov 22 19:30:32 2008 +0000
     
     svn path=/trunk/; revision=306
 
- tests/gtype-typerror.js |    2 +-
+ tests/gtype-typerror.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e8ac57b010fa3bce3729b328095bbd41efe7466d
@@ -21282,7 +22654,7 @@ Date:   Sat Nov 22 19:28:30 2008 +0000
     
     svn path=/trunk/; revision=305
 
- libseed/seed-gtype.c |    2 +-
+ libseed/seed-gtype.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 43480c6c35787b43967054817e2861dcf1992afc
@@ -21321,7 +22693,7 @@ Date:   Sat Nov 22 04:11:30 2008 +0000
     
     svn path=/trunk/; revision=303
 
- libseed/seed-engine.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 58 insertions(+)
 
 commit ea7c28da4c146341f4a4c4f456a56b3d1ae18e1d
@@ -21332,8 +22704,8 @@ Date:   Sat Nov 22 04:09:36 2008 +0000
     
     svn path=/trunk/; revision=302
 
- doc/runtime.html        |    6 +++++-
- libseed/seed-builtins.c |   28 ++++++++++++++--------------
+ doc/runtime.html        |  6 +++++-
+ libseed/seed-builtins.c | 28 ++++++++++++++--------------
  2 files changed, 19 insertions(+), 15 deletions(-)
 
 commit a4a4af69635c77d69982d07f9dcb8f85a9c820ca
@@ -21344,8 +22716,8 @@ Date:   Sat Nov 22 03:23:48 2008 +0000
     
     svn path=/trunk/; revision=301
 
- tests/Makefile.am  |    1 +
- tests/gdk-event.js |   28 ++++++++++++++++++++++++++++
+ tests/Makefile.am  |  1 +
+ tests/gdk-event.js | 28 ++++++++++++++++++++++++++++
  2 files changed, 29 insertions(+)
 
 commit 5f1ea9e9dc7de86c8acec741c9fc116fe522b0e4
@@ -21356,8 +22728,8 @@ Date:   Sat Nov 22 02:37:02 2008 +0000
     
     svn path=/trunk/; revision=300
 
- libseed/seed-closure.c |    4 ++++
- libseed/seed-structs.c |    2 ++
+ libseed/seed-closure.c | 4 ++++
+ libseed/seed-structs.c | 2 ++
  2 files changed, 6 insertions(+)
 
 commit 59ab54419f13479d59a396e92ee68b4ea2340ec7
@@ -21368,8 +22740,8 @@ Date:   Sat Nov 22 02:31:06 2008 +0000
     
     svn path=/trunk/; revision=299
 
- libseed/seed-structs.c  |   81 +++++++++++++++++++++++++++++------------------
- tests/struct-offsets.js |    3 +-
+ libseed/seed-structs.c  | 81 ++++++++++++++++++++++++++++++-------------------
+ tests/struct-offsets.js |  3 +-
  2 files changed, 52 insertions(+), 32 deletions(-)
 
 commit 54b270d93c1a46f0d945146054e1133ae7601e0e
@@ -21380,7 +22752,7 @@ Date:   Sat Nov 22 02:23:51 2008 +0000
     
     svn path=/trunk/; revision=298
 
- libseed/seed-structs.c |   29 +++++++++++++++++++++++++++++
+ libseed/seed-structs.c | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit 361aa4058c5111165e1556c8cf83cf159aabf997
@@ -21391,7 +22763,7 @@ Date:   Sat Nov 22 02:22:53 2008 +0000
     
     svn path=/trunk/; revision=297
 
- libseed/seed-structs.c |    6 ++++++
+ libseed/seed-structs.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 8341d698ca479fd2a917ab3a6cb1e24a5274e205
@@ -21402,7 +22774,7 @@ Date:   Sat Nov 22 02:22:10 2008 +0000
     
     svn path=/trunk/; revision=296
 
- libseed/seed-structs.c |  110 +++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-structs.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 109 insertions(+), 1 deletion(-)
 
 commit 925b6e517f1bd2412fae191950a02bdb6cca5433
@@ -21413,7 +22785,7 @@ Date:   Sat Nov 22 01:54:25 2008 +0000
     
     svn path=/trunk/; revision=295
 
- libseed/seed-structs.c |    6 ------
+ libseed/seed-structs.c | 6 ------
  1 file changed, 6 deletions(-)
 
 commit 5f06b06cac839b43f3d25c10aee73ae020b31a7a
@@ -21424,9 +22796,9 @@ Date:   Sat Nov 22 01:49:53 2008 +0000
     
     svn path=/trunk/; revision=294
 
- libseed/seed-structs.c  |    1 -
- tests/Makefile.am       |    1 +
- tests/struct-offsets.js |   15 +++++++++++++++
+ libseed/seed-structs.c  |  1 -
+ tests/Makefile.am       |  1 +
+ tests/struct-offsets.js | 15 +++++++++++++++
  3 files changed, 16 insertions(+), 1 deletion(-)
 
 commit aaa4fede5556f7c8139ee7f5d42561dfa391a4fb
@@ -21437,7 +22809,7 @@ Date:   Sat Nov 22 01:45:03 2008 +0000
     
     svn path=/trunk/; revision=293
 
- libseed/seed-structs.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++--
+ libseed/seed-structs.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 68 insertions(+), 2 deletions(-)
 
 commit 8e3349622a02613f6f35745a9953286464520f1a
@@ -21448,8 +22820,8 @@ Date:   Sat Nov 22 01:08:15 2008 +0000
     
     svn path=/trunk/; revision=292
 
- libseed/seed-signals.c |    1 +
- libseed/seed-structs.c |   18 +++++++++---------
+ libseed/seed-signals.c |  1 +
+ libseed/seed-structs.c | 18 +++++++++---------
  2 files changed, 10 insertions(+), 9 deletions(-)
 
 commit 631ae45ae0ee8c4fd53b90cb17dbd3d266ebe91c
@@ -21460,7 +22832,7 @@ Date:   Sat Nov 22 01:02:31 2008 +0000
     
     svn path=/trunk/; revision=291
 
- libseed/seed-structs.c |   18 +++++++++++++++++-
+ libseed/seed-structs.c | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 commit d7cca613d5706014609ac38ce71eea8d11c5c246
@@ -21471,8 +22843,8 @@ Date:   Sat Nov 22 00:59:28 2008 +0000
     
     svn path=/trunk/; revision=290
 
- libseed/seed-gtype.c   |    2 +-
- libseed/seed-structs.c |   20 ++++++++++++++++++--
+ libseed/seed-gtype.c   |  2 +-
+ libseed/seed-structs.c | 20 ++++++++++++++++++--
  2 files changed, 19 insertions(+), 3 deletions(-)
 
 commit 7c912bb5e14cb80affe320cdd1d62e4eb70f670e
@@ -21483,9 +22855,9 @@ Date:   Sat Nov 22 00:52:55 2008 +0000
     
     svn path=/trunk/; revision=289
 
- libseed/seed-structs.c |   45 ++++++++++++++++++++++++++++++++++++++-------
- libseed/seed-structs.h |    2 ++
- libseed/seed-types.c   |    4 ++--
+ libseed/seed-structs.c | 45 ++++++++++++++++++++++++++++++++++++++-------
+ libseed/seed-structs.h |  2 ++
+ libseed/seed-types.c   |  4 ++--
  3 files changed, 42 insertions(+), 9 deletions(-)
 
 commit 7f389756f368fc6e00c638c4ff40e965be7dac29
@@ -21496,7 +22868,7 @@ Date:   Sat Nov 22 00:41:14 2008 +0000
     
     svn path=/trunk/; revision=288
 
- examples/lightsoff/board.js |    4 ++--
+ examples/lightsoff/board.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 85bfee22c492307405deb38cbd41c4e5e06354b6
@@ -21507,11 +22879,11 @@ Date:   Sat Nov 22 00:32:03 2008 +0000
     
     svn path=/trunk/; revision=287
 
- libseed/seed-engine.c  |    2 +-
- libseed/seed-gtype.c   |    2 +-
- libseed/seed-structs.c |    2 +-
- libseed/seed-structs.h |    2 +-
- libseed/seed-types.c   |    4 ++--
+ libseed/seed-engine.c  | 2 +-
+ libseed/seed-gtype.c   | 2 +-
+ libseed/seed-structs.c | 2 +-
+ libseed/seed-structs.h | 2 +-
+ libseed/seed-types.c   | 4 ++--
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 commit d361aa129a69541d0150edc0bcaf5abcdc9f0da0
@@ -21522,9 +22894,9 @@ Date:   Sat Nov 22 00:28:45 2008 +0000
     
     svn path=/trunk/; revision=286
 
- libseed/seed-gtype.c   |    4 ++--
- libseed/seed-structs.c |   28 ++++++++++++++++++++++++++++
- libseed/seed-structs.h |    2 ++
+ libseed/seed-gtype.c   |  4 ++--
+ libseed/seed-structs.c | 28 ++++++++++++++++++++++++++++
+ libseed/seed-structs.h |  2 ++
  3 files changed, 32 insertions(+), 2 deletions(-)
 
 commit 654df2841a9772da40acb1d1a33a640b8f3fdc68
@@ -21535,9 +22907,9 @@ Date:   Sat Nov 22 00:08:35 2008 +0000
     
     svn path=/trunk/; revision=285
 
- libseed/seed-engine.c  |    1 +
- libseed/seed-structs.c |   38 ++++++++++++++++++++++++++++++--------
- libseed/seed-structs.h |    2 ++
+ libseed/seed-engine.c  |  1 +
+ libseed/seed-structs.c | 38 ++++++++++++++++++++++++++++++--------
+ libseed/seed-structs.h |  2 ++
  3 files changed, 33 insertions(+), 8 deletions(-)
 
 commit b89622b7ee5a94688117b1e34f89fb5a7b89ae25
@@ -21548,7 +22920,7 @@ Date:   Fri Nov 21 20:00:35 2008 +0000
     
     svn path=/trunk/; revision=284
 
- libseed/seed-closure.c |    4 ++++
+ libseed/seed-closure.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 84840f9d43df4eaebac00ec21720f62c71ed115e
@@ -21559,7 +22931,7 @@ Date:   Fri Nov 21 19:58:00 2008 +0000
     
     svn path=/trunk/; revision=283
 
- libseed/seed-engine.c |    2 ++
+ libseed/seed-engine.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 9113f92f75a85e35bae79225783ed13f274b043b
@@ -21570,9 +22942,9 @@ Date:   Fri Nov 21 19:07:25 2008 +0000
     
     svn path=/trunk/; revision=282
 
- libseed/seed-debug.h  |    3 ++-
- libseed/seed-engine.c |   41 +++++++++++++++++++++++++++++++++++++++--
- libseed/seed-types.c  |   15 ++++++++++-----
+ libseed/seed-debug.h  |  3 ++-
+ libseed/seed-engine.c | 41 +++++++++++++++++++++++++++++++++++++++--
+ libseed/seed-types.c  | 15 ++++++++++-----
  3 files changed, 51 insertions(+), 8 deletions(-)
 
 commit 3c88bf4973cc1dfc50390e11511d83e35b094539
@@ -21584,8 +22956,8 @@ Date:   Fri Nov 21 18:44:25 2008 +0000
     
     svn path=/trunk/; revision=281
 
- examples/lightsoff/arrow.js |    3 +++
- examples/lightsoff/board.js |   10 ++++++++++
+ examples/lightsoff/arrow.js |  3 +++
+ examples/lightsoff/board.js | 10 ++++++++++
  2 files changed, 13 insertions(+)
 
 commit 7db59913b9f6b3d86b0a7295681c26bdd80cb479
@@ -21598,7 +22970,7 @@ Date:   Fri Nov 21 18:23:39 2008 +0000
     
     svn path=/trunk/; revision=280
 
- libseed/indent.sh |    2 +-
+ libseed/indent.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c35f2901d972dd5d07f56753d0ce315cb3ec83c4
@@ -21609,9 +22981,9 @@ Date:   Fri Nov 21 18:15:45 2008 +0000
     
     svn path=/trunk/; revision=279
 
- libseed/seed-engine.c  |   16 ++++++++++++----
- libseed/seed-signals.c |    6 +++---
- libseed/seed-types.c   |    1 -
+ libseed/seed-engine.c  | 16 ++++++++++++----
+ libseed/seed-signals.c |  6 +++---
+ libseed/seed-types.c   |  1 -
  3 files changed, 15 insertions(+), 8 deletions(-)
 
 commit bc0be595d4d62e332d2403517bb479d498c80f2d
@@ -21622,7 +22994,7 @@ Date:   Fri Nov 21 17:34:01 2008 +0000
     
     svn path=/trunk/; revision=278
 
- libseed/seed-engine.c |    4 ----
+ libseed/seed-engine.c | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 48a8ce97c618dc515f2998aec994f271b3e735a6
@@ -21633,12 +23005,12 @@ Date:   Fri Nov 21 17:32:46 2008 +0000
     
     svn path=/trunk/; revision=277
 
- configure.ac           |   19 +++++++++
- libseed/Makefile.am    |    2 +-
- libseed/seed-debug.h   |   42 +++++++++++++++++++
- libseed/seed-engine.c  |  107 +++++++++++++++++++++++++++++++++++++++++++++++-
- libseed/seed-private.h |    1 +
- src/main.c             |   12 ++++--
+ configure.ac           |  19 +++++++++
+ libseed/Makefile.am    |   2 +-
+ libseed/seed-debug.h   |  42 +++++++++++++++++++
+ libseed/seed-engine.c  | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-private.h |   1 +
+ src/main.c             |  12 ++++--
  6 files changed, 177 insertions(+), 6 deletions(-)
 
 commit 87e0ec82f7cce29685bae9446f2405661d9ce526
@@ -21649,9 +23021,9 @@ Date:   Fri Nov 21 03:36:57 2008 +0000
     
     svn path=/trunk/; revision=276
 
- examples/lightsoff/Makefile.am       |    7 -------
- examples/lightsoff/lightsoff.schemas |   16 ----------------
- examples/lightsoff/score.js          |    4 ++++
+ examples/lightsoff/Makefile.am       |  7 -------
+ examples/lightsoff/lightsoff.schemas | 16 ----------------
+ examples/lightsoff/score.js          |  4 ++++
  3 files changed, 4 insertions(+), 23 deletions(-)
 
 commit 099c361db229292758483af28583c3d6d1679f55
@@ -21662,8 +23034,8 @@ Date:   Fri Nov 21 01:02:51 2008 +0000
     
     svn path=/trunk/; revision=275
 
- configure.ac                   |    2 ++
- examples/lightsoff/Makefile.am |    2 +-
+ configure.ac                   | 2 ++
+ examples/lightsoff/Makefile.am | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 8c193ae3db5aa59510d766785b1fdd0bce410a90
@@ -21674,7 +23046,7 @@ Date:   Sun Nov 16 05:15:30 2008 +0000
     
     svn path=/trunk/; revision=274
 
- examples/lightsoff/Makefile.am |    6 ++++--
+ examples/lightsoff/Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 37d78b3397911c079725dd297b83b56eb7ea90d0
@@ -21685,7 +23057,7 @@ Date:   Sun Nov 16 05:14:24 2008 +0000
     
     svn path=/trunk/; revision=273
 
- tests/Makefile.am |    2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3977c86418ea88ca08fc5768f4df2d9603168c52
@@ -21696,7 +23068,7 @@ Date:   Sun Nov 16 05:12:41 2008 +0000
     
     svn path=/trunk/; revision=272
 
- examples/lightsoff/Makefile.am |   22 ++++++++++------------
+ examples/lightsoff/Makefile.am | 22 ++++++++++------------
  1 file changed, 10 insertions(+), 12 deletions(-)
 
 commit 767a495b12be6dc49ff0b4b22bd01d956d218a0c
@@ -21707,21 +23079,21 @@ Date:   Sun Nov 16 04:47:03 2008 +0000
     
     svn path=/trunk/; revision=271
 
- examples/lightsoff/arrow.js      |    9 +-
- examples/lightsoff/back.svg      |  117 -----
- examples/lightsoff/board.js      |   43 +-
- examples/lightsoff/front.svg     |  113 -----
- examples/lightsoff/lcd-back.svg  |  117 +++++
- examples/lightsoff/lcd-front.svg |  113 +++++
- examples/lightsoff/lcd-off.svg   |  228 ++++++++++
- examples/lightsoff/led.svg       |  884 --------------------------------------
- examples/lightsoff/light-off.svg |  228 ++++++++++
- examples/lightsoff/light-on.svg  |  204 +++++++++
- examples/lightsoff/light.js      |    4 +-
- examples/lightsoff/off.svg       |  228 ----------
- examples/lightsoff/score.js      |   20 +-
- examples/lightsoff/tim-off.svg   |  228 ----------
- examples/lightsoff/tim-on.svg    |  204 ---------
+ examples/lightsoff/arrow.js      |   9 +-
+ examples/lightsoff/back.svg      | 117 ------
+ examples/lightsoff/board.js      |  43 +-
+ examples/lightsoff/front.svg     | 113 -----
+ examples/lightsoff/lcd-back.svg  | 117 ++++++
+ examples/lightsoff/lcd-front.svg | 113 +++++
+ examples/lightsoff/lcd-off.svg   | 228 ++++++++++
+ examples/lightsoff/led.svg       | 884 ---------------------------------------
+ examples/lightsoff/light-off.svg | 228 ++++++++++
+ examples/lightsoff/light-on.svg  | 204 +++++++++
+ examples/lightsoff/light.js      |   4 +-
+ examples/lightsoff/off.svg       | 228 ----------
+ examples/lightsoff/score.js      |  20 +-
+ examples/lightsoff/tim-off.svg   | 228 ----------
+ examples/lightsoff/tim-on.svg    | 204 ---------
  15 files changed, 926 insertions(+), 1814 deletions(-)
 
 commit 8495a0acccb0f72f315c6d75e3884841b184c30e
@@ -21732,21 +23104,21 @@ Date:   Sun Nov 16 03:16:27 2008 +0000
     
     svn path=/trunk/; revision=270
 
- examples/lightsoff/0.svg    |  148 ++++++++++++++++++++-----------------------
- examples/lightsoff/1.svg    |   14 ++--
- examples/lightsoff/2.svg    |  140 ++++++++++++++++++----------------------
- examples/lightsoff/3.svg    |   14 ++--
- examples/lightsoff/4.svg    |  132 +++++++++++++++-----------------------
- examples/lightsoff/5.svg    |  140 ++++++++++++++++++----------------------
- examples/lightsoff/6.svg    |  148 ++++++++++++++++++++-----------------------
- examples/lightsoff/7.svg    |   14 ++--
- examples/lightsoff/8.svg    |   14 ++--
- examples/lightsoff/9.svg    |  148 ++++++++++++++++++++-----------------------
- examples/lightsoff/arrow.js |   15 ++++-
- examples/lightsoff/board.js |   34 +++++++++-
- examples/lightsoff/main.js  |    2 +-
- examples/lightsoff/off.svg  |   16 ++---
- examples/lightsoff/score.js |   17 ++---
+ examples/lightsoff/0.svg    | 148 +++++++++++++++++++++-----------------------
+ examples/lightsoff/1.svg    |  14 ++---
+ examples/lightsoff/2.svg    | 140 ++++++++++++++++++-----------------------
+ examples/lightsoff/3.svg    |  14 ++---
+ examples/lightsoff/4.svg    | 132 +++++++++++++++------------------------
+ examples/lightsoff/5.svg    | 140 ++++++++++++++++++-----------------------
+ examples/lightsoff/6.svg    | 148 +++++++++++++++++++++-----------------------
+ examples/lightsoff/7.svg    |  14 ++---
+ examples/lightsoff/8.svg    |  14 ++---
+ examples/lightsoff/9.svg    | 148 +++++++++++++++++++++-----------------------
+ examples/lightsoff/arrow.js |  15 ++++-
+ examples/lightsoff/board.js |  34 +++++++++-
+ examples/lightsoff/main.js  |   2 +-
+ examples/lightsoff/off.svg  |  16 ++---
+ examples/lightsoff/score.js |  17 ++---
  15 files changed, 472 insertions(+), 524 deletions(-)
 
 commit 851a7671a530be87b9b6fdb3e9125422e8f6638b
@@ -21758,14 +23130,14 @@ Date:   Sun Nov 16 01:22:43 2008 +0000
     
     svn path=/trunk/; revision=269
 
- examples/lightsoff/Makefile.am       |   16 ++-
- examples/lightsoff/arrow-l.svg       |  174 +++++++++++++++++++++++++++++++
- examples/lightsoff/arrow-r.svg       |  191 ++++++++++++++++++++++++++++++++++
- examples/lightsoff/arrow.js          |   27 +++++
- examples/lightsoff/board.js          |   15 +--
- examples/lightsoff/lightsoff.schemas |   16 +++
- examples/lightsoff/main.js           |   20 +++-
- examples/lightsoff/score.js          |    5 +-
+ examples/lightsoff/Makefile.am       |  16 ++-
+ examples/lightsoff/arrow-l.svg       | 174 +++++++++++++++++++++++++++++++
+ examples/lightsoff/arrow-r.svg       | 191 +++++++++++++++++++++++++++++++++++
+ examples/lightsoff/arrow.js          |  27 +++++
+ examples/lightsoff/board.js          |  15 +--
+ examples/lightsoff/lightsoff.schemas |  16 +++
+ examples/lightsoff/main.js           |  20 +++-
+ examples/lightsoff/score.js          |   5 +-
  8 files changed, 450 insertions(+), 14 deletions(-)
 
 commit 2da7d67a3fa6594b10a7721174e9a6218a6d95dd
@@ -21776,7 +23148,7 @@ Date:   Thu Nov 13 15:01:51 2008 +0000
     
     svn path=/trunk/; revision=268
 
- libseed/seed-types.c |    3 ---
+ libseed/seed-types.c | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 80b50dfe42ab8a9ce6772ba69a978ac6799b7ef6
@@ -21787,7 +23159,7 @@ Date:   Thu Nov 13 09:06:21 2008 +0000
     
     svn path=/trunk/; revision=267
 
- libseed/seed-types.c |    2 --
+ libseed/seed-types.c | 2 --
  1 file changed, 2 deletions(-)
 
 commit 8b016d369b3e55ee9b66ffb7212051f8c65b5ea0
@@ -21798,9 +23170,9 @@ Date:   Thu Nov 13 08:58:27 2008 +0000
     
     svn path=/trunk/; revision=266
 
- examples/lightsoff/board.js |    2 +-
- examples/lightsoff/score.js |   12 ++++++++++--
- libseed/seed-types.c        |    2 ++
+ examples/lightsoff/board.js |  2 +-
+ examples/lightsoff/score.js | 12 ++++++++++--
+ libseed/seed-types.c        |  2 ++
  3 files changed, 13 insertions(+), 3 deletions(-)
 
 commit 994d560e61d315fc136d77534287bf1102cca1b3
@@ -21811,9 +23183,9 @@ Date:   Thu Nov 13 08:21:18 2008 +0000
     
     svn path=/trunk/; revision=265
 
- libseed/seed-gtype.c |    2 +-
- libseed/seed-types.c |  185 ++++++++++----------------------------------------
- libseed/seed-types.h |    3 -
+ libseed/seed-gtype.c |   2 +-
+ libseed/seed-types.c | 185 +++++++++++----------------------------------------
+ libseed/seed-types.h |   3 -
  3 files changed, 38 insertions(+), 152 deletions(-)
 
 commit d2862d0717cfd9d2b756166530580b24a32c98df
@@ -21824,12 +23196,12 @@ Date:   Thu Nov 13 08:06:23 2008 +0000
     
     svn path=/trunk/; revision=264
 
- examples/quine.js            |    2 +-
- libseed/seed-engine.c        |   57 +++++++++++++++-----------
- libseed/seed-types.c         |   93 ++++++++++++++++++++++++++++++++++++++++--
- libseed/seed-types.h         |    8 ++++
- tests/Makefile.am            |    3 +-
- tests/reference-count-new.js |   20 ---------
+ examples/quine.js            |  2 +-
+ libseed/seed-engine.c        | 57 ++++++++++++++++-----------
+ libseed/seed-types.c         | 93 ++++++++++++++++++++++++++++++++++++++++++--
+ libseed/seed-types.h         |  8 ++++
+ tests/Makefile.am            |  3 +-
+ tests/reference-count-new.js | 20 ----------
  6 files changed, 134 insertions(+), 49 deletions(-)
 
 commit db77ace493fcd320f5a23effb57c7771ce3fee6e
@@ -21840,8 +23212,8 @@ Date:   Wed Nov 12 14:03:19 2008 +0000
     
     svn path=/trunk/; revision=263
 
- libseed/seed-engine.c |   11 +++++------
- libseed/seed-types.c  |    9 ++++++++-
+ libseed/seed-engine.c | 11 +++++------
+ libseed/seed-types.c  |  9 ++++++++-
  2 files changed, 13 insertions(+), 7 deletions(-)
 
 commit 1245c35dbfa8476ddba1f47c70ff90582b569ce0
@@ -21852,7 +23224,7 @@ Date:   Wed Nov 12 11:41:23 2008 +0000
     
     svn path=/trunk/; revision=262
 
- examples/ide/Makefile.am |    9 ++++++---
+ examples/ide/Makefile.am | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 5da6dfa0988da90c92e3c1b640d4a7888ae92dd8
@@ -21863,8 +23235,8 @@ Date:   Wed Nov 12 11:38:53 2008 +0000
     
     svn path=/trunk/; revision=261
 
- examples/lightsoff/Makefile.am |   37 +++++++++++++++++++++++++++++++---
- examples/lightsoff/menu.js     |   43 ++++++++++++++++++++++++++++++++++++++++
+ examples/lightsoff/Makefile.am | 37 +++++++++++++++++++++++++++++++++---
+ examples/lightsoff/menu.js     | 43 ++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 77 insertions(+), 3 deletions(-)
 
 commit f7eef664ef2e14135c9bc4d72acaaad747047293
@@ -21880,8 +23252,8 @@ Date:   Wed Nov 12 11:36:45 2008 +0000
     
     svn path=/trunk/; revision=260
 
- examples/lightsoff/board.js |    8 ++++++++
- examples/lightsoff/main.js  |   24 +++++++++++++++++-------
+ examples/lightsoff/board.js |  8 ++++++++
+ examples/lightsoff/main.js  | 24 +++++++++++++++++-------
  2 files changed, 25 insertions(+), 7 deletions(-)
 
 commit d17569d2d95a9ceca5b4263431a79fc0f9c99f7a
@@ -21893,12 +23265,12 @@ Date:   Wed Nov 12 10:45:27 2008 +0000
     
     svn path=/trunk/; revision=259
 
- examples/lightsoff/back.svg  |   69 ++++++++++++++++++++---------------
- examples/lightsoff/board.js  |   60 +++++++++++++++++++++++++++++--
- examples/lightsoff/front.svg |   24 +++++++++----
- examples/lightsoff/light.js  |   16 ++++++++-
- examples/lightsoff/main.js   |   81 ++++++------------------------------------
- examples/lightsoff/score.js  |   66 +++++++---------------------------
+ examples/lightsoff/back.svg  | 69 ++++++++++++++++++++++---------------
+ examples/lightsoff/board.js  | 60 ++++++++++++++++++++++++++++++--
+ examples/lightsoff/front.svg | 24 +++++++++----
+ examples/lightsoff/light.js  | 16 ++++++++-
+ examples/lightsoff/main.js   | 81 ++++++--------------------------------------
+ examples/lightsoff/score.js  | 66 +++++++-----------------------------
  6 files changed, 154 insertions(+), 162 deletions(-)
 
 commit 2aff96f285088ca7869805056cb377f87f1a0e1b
@@ -21909,10 +23281,10 @@ Date:   Wed Nov 12 09:22:33 2008 +0000
     
     svn path=/trunk/; revision=258
 
- libseed/seed-types.c  |    6 +++++-
- tests/Makefile.am     |    1 -
- tests/gsuper.js       |   53 -------------------------------------------------
- tests/gtype-signal.js |    2 +-
+ libseed/seed-types.c  |  6 +++++-
+ tests/Makefile.am     |  1 -
+ tests/gsuper.js       | 53 ---------------------------------------------------
+ tests/gtype-signal.js |  2 +-
  4 files changed, 6 insertions(+), 56 deletions(-)
 
 commit ce182ec65236ecc1da6a8a46f8dd18f3e753063c
@@ -21924,7 +23296,7 @@ Date:   Wed Nov 12 09:02:10 2008 +0000
     
     svn path=/trunk/; revision=257
 
- examples/lightsoff/main.js |   28 ++++++++++++++++++++--------
+ examples/lightsoff/main.js | 28 ++++++++++++++++++++--------
  1 file changed, 20 insertions(+), 8 deletions(-)
 
 commit 6b3f4a76be61056c8974b519b557d53a2095db40
@@ -21935,7 +23307,7 @@ Date:   Wed Nov 12 08:41:14 2008 +0000
     
     svn path=/trunk/; revision=256
 
- libseed/seed-types.c |    3 ---
+ libseed/seed-types.c | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 21b9838e93aab5f34dd28bc665198499b2594a39
@@ -21947,9 +23319,9 @@ Date:   Wed Nov 12 08:39:17 2008 +0000
     
     svn path=/trunk/; revision=255
 
- examples/lightsoff/board.js |    8 +++----
- examples/lightsoff/main.js  |    8 +++----
- examples/lightsoff/score.js |   49 ++++++++++++++++++++++++++++++++++++-------
+ examples/lightsoff/board.js |  8 +++-----
+ examples/lightsoff/main.js  |  8 +++-----
+ examples/lightsoff/score.js | 49 +++++++++++++++++++++++++++++++++++++--------
  3 files changed, 47 insertions(+), 18 deletions(-)
 
 commit 923a6587ba8f5962834956a9d0343f539fb97727
@@ -21961,11 +23333,11 @@ Date:   Wed Nov 12 08:17:47 2008 +0000
     
     svn path=/trunk/; revision=254
 
- examples/lightsoff/back.svg    |  104 ++++++++++++++++++++++++++++++++++++++++
- examples/lightsoff/bkg.png     |  Bin 1375 -> 0 bytes
- examples/lightsoff/bkg_top.png |  Bin 1084 -> 0 bytes
- examples/lightsoff/front.svg   |  103 +++++++++++++++++++++++++++++++++++++++
- examples/lightsoff/score.js    |    9 ++--
+ examples/lightsoff/back.svg    | 104 +++++++++++++++++++++++++++++++++++++++++
+ examples/lightsoff/bkg.png     | Bin 1375 -> 0 bytes
+ examples/lightsoff/bkg_top.png | Bin 1084 -> 0 bytes
+ examples/lightsoff/front.svg   | 103 ++++++++++++++++++++++++++++++++++++++++
+ examples/lightsoff/score.js    |   9 ++--
  5 files changed, 213 insertions(+), 3 deletions(-)
 
 commit 7f6e2716c778629a353c8d158f5675d7eea171cf
@@ -21976,7 +23348,7 @@ Date:   Wed Nov 12 08:08:59 2008 +0000
     
     svn path=/trunk/; revision=253
 
- libseed/seed-engine.c |    2 ++
+ libseed/seed-engine.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 4104944faf6cb24993d5e14fd3694b35baeed6e5
@@ -21987,8 +23359,8 @@ Date:   Tue Nov 11 19:38:45 2008 +0000
     
     svn path=/trunk/; revision=252
 
- examples/lightsoff/main.js  |   14 +++++++++++-
- examples/lightsoff/score.js |   52 ++++++++++++++++++++++++++-----------------
+ examples/lightsoff/main.js  | 14 +++++++++++-
+ examples/lightsoff/score.js | 52 +++++++++++++++++++++++++++------------------
  2 files changed, 44 insertions(+), 22 deletions(-)
 
 commit a5207c8265ac92bd5c39bd0784300cedc1846e07
@@ -21999,12 +23371,12 @@ Date:   Tue Nov 11 16:23:06 2008 +0000
     
     svn path=/trunk/; revision=251
 
- examples/lightsoff/bg_bottom.svg |  101 --------------------------------------
- examples/lightsoff/bg_top.svg    |   93 -----------------------------------
- examples/lightsoff/bkg.png       |  Bin 0 -> 1375 bytes
- examples/lightsoff/bkg_top.png   |  Bin 0 -> 1084 bytes
- examples/lightsoff/led.svg       |   54 ++++++++++++++++++--
- examples/lightsoff/score.js      |   53 +++++++++++++++-----
+ examples/lightsoff/bg_bottom.svg | 101 ---------------------------------------
+ examples/lightsoff/bg_top.svg    |  93 -----------------------------------
+ examples/lightsoff/bkg.png       | Bin 0 -> 1375 bytes
+ examples/lightsoff/bkg_top.png   | Bin 0 -> 1084 bytes
+ examples/lightsoff/led.svg       |  54 +++++++++++++++++++--
+ examples/lightsoff/score.js      |  53 +++++++++++++++-----
  6 files changed, 93 insertions(+), 208 deletions(-)
 
 commit c98e8bfb51b4217a76954942639851125ee94d2c
@@ -22015,10 +23387,10 @@ Date:   Tue Nov 11 16:22:23 2008 +0000
     
     svn path=/trunk/; revision=250
 
- libseed/seed-closure.c |    9 +++++++++
- libseed/seed-engine.c  |    2 ++
- libseed/seed-signals.c |   10 +++++++++-
- libseed/seed-types.c   |   26 ++++++++++++++++++++------
+ libseed/seed-closure.c |  9 +++++++++
+ libseed/seed-engine.c  |  2 ++
+ libseed/seed-signals.c | 10 +++++++++-
+ libseed/seed-types.c   | 26 ++++++++++++++++++++------
  4 files changed, 40 insertions(+), 7 deletions(-)
 
 commit de495d1d0bdb21911a03f609476ed8410d388744
@@ -22029,22 +23401,22 @@ Date:   Tue Nov 11 15:39:40 2008 +0000
     
     svn path=/trunk/; revision=249
 
- examples/lightsoff/0.svg         |  217 ++++++++++
- examples/lightsoff/1.svg         |  177 ++++++++
- examples/lightsoff/2.svg         |  207 ++++++++++
- examples/lightsoff/3.svg         |  207 ++++++++++
- examples/lightsoff/4.svg         |  197 +++++++++
- examples/lightsoff/5.svg         |  207 ++++++++++
- examples/lightsoff/6.svg         |  217 ++++++++++
- examples/lightsoff/7.svg         |  187 +++++++++
- examples/lightsoff/8.svg         |  227 +++++++++++
- examples/lightsoff/9.svg         |  217 ++++++++++
- examples/lightsoff/bg_bottom.svg |  101 +++++
- examples/lightsoff/bg_top.svg    |   93 +++++
- examples/lightsoff/board.js      |    1 -
- examples/lightsoff/led.svg       |  836 ++++++++++++++++++++++++++++++++++++++
- examples/lightsoff/off.svg       |  228 +++++++++++
- examples/lightsoff/score.js      |   51 +++
+ examples/lightsoff/0.svg         | 217 ++++++++++
+ examples/lightsoff/1.svg         | 177 +++++++++
+ examples/lightsoff/2.svg         | 207 ++++++++++
+ examples/lightsoff/3.svg         | 207 ++++++++++
+ examples/lightsoff/4.svg         | 197 +++++++++
+ examples/lightsoff/5.svg         | 207 ++++++++++
+ examples/lightsoff/6.svg         | 217 ++++++++++
+ examples/lightsoff/7.svg         | 187 +++++++++
+ examples/lightsoff/8.svg         | 227 +++++++++++
+ examples/lightsoff/9.svg         | 217 ++++++++++
+ examples/lightsoff/bg_bottom.svg | 101 +++++
+ examples/lightsoff/bg_top.svg    |  93 +++++
+ examples/lightsoff/board.js      |   1 -
+ examples/lightsoff/led.svg       | 836 +++++++++++++++++++++++++++++++++++++++
+ examples/lightsoff/off.svg       | 228 +++++++++++
+ examples/lightsoff/score.js      |  51 +++
  16 files changed, 3369 insertions(+), 1 deletion(-)
 
 commit e3e78e360bf5a95b3bf44d426ac865c73f10322c
@@ -22055,10 +23427,10 @@ Date:   Tue Nov 11 15:28:24 2008 +0000
     
     svn path=/trunk/; revision=248
 
- libseed/seed-engine.c        |   26 +++++++++++++++++++++++---
- libseed/seed-types.c         |    3 +--
- tests/Makefile.am            |    1 +
- tests/reference-count-new.js |   20 ++++++++++++++++++++
+ libseed/seed-engine.c        | 26 +++++++++++++++++++++++---
+ libseed/seed-types.c         |  3 +--
+ tests/Makefile.am            |  1 +
+ tests/reference-count-new.js | 20 ++++++++++++++++++++
  4 files changed, 45 insertions(+), 5 deletions(-)
 
 commit c268d54ff5261d91995277f9354a2fc917bbc312
@@ -22069,7 +23441,7 @@ Date:   Tue Nov 11 12:53:57 2008 +0000
     
     svn path=/trunk/; revision=247
 
- examples/lightsoff/Makefile.am |    7 ++++++-
+ examples/lightsoff/Makefile.am | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 30f0ea65d993fcaff74414204ce844f8bf792f4e
@@ -22080,9 +23452,9 @@ Date:   Tue Nov 11 12:51:57 2008 +0000
     
     svn path=/trunk/; revision=246
 
- examples/lightsoff/board.js |   15 ++++++++++-----
- examples/lightsoff/light.js |   20 ++++++++++++--------
- examples/lightsoff/main.js  |   26 ++++++++++++++------------
+ examples/lightsoff/board.js | 15 ++++++++++-----
+ examples/lightsoff/light.js | 20 ++++++++++++--------
+ examples/lightsoff/main.js  | 26 ++++++++++++++------------
  3 files changed, 36 insertions(+), 25 deletions(-)
 
 commit c5997fb5846959a03c203f8b147b26e0b8ac807f
@@ -22093,9 +23465,9 @@ Date:   Tue Nov 11 12:15:40 2008 +0000
     
     svn path=/trunk/; revision=245
 
- examples/lightsoff/board.js |   66 +++++++++++++++++++++++++++++++-
- examples/lightsoff/light.js |   23 +++++------
- examples/lightsoff/main.js  |   89 +++++++++++++++++++------------------------
+ examples/lightsoff/board.js | 66 ++++++++++++++++++++++++++++++++-
+ examples/lightsoff/light.js | 23 ++++++------
+ examples/lightsoff/main.js  | 89 ++++++++++++++++++++-------------------------
  3 files changed, 116 insertions(+), 62 deletions(-)
 
 commit c92ff6c6624605621cd8737e5caab426f5ce9f4c
@@ -22106,8 +23478,8 @@ Date:   Tue Nov 11 11:50:20 2008 +0000
     
     svn path=/trunk/; revision=244
 
- libseed/seed-gtype.c   |  112 +++++++++++++++++++++++++++++++++++++++++++++++-
- libseed/seed-signals.c |   14 +++++-
+ libseed/seed-gtype.c   | 112 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-signals.c |  14 ++++++-
  2 files changed, 124 insertions(+), 2 deletions(-)
 
 commit 9ed9be75b7ddba811506a1097bb6ab696dbeaacd
@@ -22118,11 +23490,11 @@ Date:   Tue Nov 11 10:59:05 2008 +0000
     
     svn path=/trunk/; revision=243
 
- examples/lightsoff/board.js            |   33 ++++
- examples/lightsoff/legacy/lightsoff.js |  268 ++++++++++++++++++++++++++++++++
- examples/lightsoff/light.js            |   48 ++++++
- examples/lightsoff/lightsoff.js        |  268 --------------------------------
- examples/lightsoff/main.js             |   92 +++++++++++
+ examples/lightsoff/board.js            |  33 ++++
+ examples/lightsoff/legacy/lightsoff.js | 268 +++++++++++++++++++++++++++++++++
+ examples/lightsoff/light.js            |  48 ++++++
+ examples/lightsoff/lightsoff.js        | 268 ---------------------------------
+ examples/lightsoff/main.js             |  92 +++++++++++
  5 files changed, 441 insertions(+), 268 deletions(-)
 
 commit 5fe6c52e7c0df5be4adb358e687e9d3a6cd7fe48
@@ -22133,7 +23505,7 @@ Date:   Tue Nov 11 09:48:43 2008 +0000
     
     svn path=/trunk/; revision=242
 
- libseed/seed-signals.c |    3 ++-
+ libseed/seed-signals.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit e36185438875ee64c642353343f39bec0145f320
@@ -22144,7 +23516,7 @@ Date:   Tue Nov 11 09:44:33 2008 +0000
     
     svn path=/trunk/; revision=241
 
- libseed/seed-closure.c |    2 +-
+ libseed/seed-closure.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3c410450ee1155c72456c5a6310625984dc330ae
@@ -22155,17 +23527,17 @@ Date:   Tue Nov 11 09:42:47 2008 +0000
     
     svn path=/trunk/; revision=240
 
- libseed/Makefile.am       |    4 +++-
- libseed/seed-builtins.c   |   14 +++++++-------
- libseed/seed-closure.c    |    4 ++--
- libseed/seed-engine.c     |   30 +++++++++++++++---------------
- libseed/seed-exceptions.c |   20 ++++++++++----------
- libseed/seed-gtype.c      |   29 +++++++++++++++++------------
- libseed/seed-private.h    |    1 -
- libseed/seed-signals.c    |    4 ++--
- libseed/seed-types.c      |   25 +++++++++++++------------
- libseed/seed-types.h      |   10 +++++-----
- tests/Makefile.am         |    2 +-
+ libseed/Makefile.am       |  4 +++-
+ libseed/seed-builtins.c   | 14 +++++++-------
+ libseed/seed-closure.c    |  4 ++--
+ libseed/seed-engine.c     | 30 +++++++++++++++---------------
+ libseed/seed-exceptions.c | 20 ++++++++++----------
+ libseed/seed-gtype.c      | 29 +++++++++++++++++------------
+ libseed/seed-private.h    |  1 -
+ libseed/seed-signals.c    |  4 ++--
+ libseed/seed-types.c      | 25 +++++++++++++------------
+ libseed/seed-types.h      | 10 +++++-----
+ tests/Makefile.am         |  2 +-
  11 files changed, 75 insertions(+), 68 deletions(-)
 
 commit 46d146d953371347097a280cc3fbcf61ec5c6268
@@ -22176,10 +23548,10 @@ Date:   Tue Nov 11 09:32:32 2008 +0000
     
     svn path=/trunk/; revision=239
 
- libseed/seed-gtype.c    |    4 ++++
- libseed/seed-types.c    |    2 +-
- tests/Makefile.am       |    1 +
- tests/gtype-typerror.js |   16 ++++++++++++++++
+ libseed/seed-gtype.c    |  4 ++++
+ libseed/seed-types.c    |  2 +-
+ tests/Makefile.am       |  1 +
+ tests/gtype-typerror.js | 16 ++++++++++++++++
  4 files changed, 22 insertions(+), 1 deletion(-)
 
 commit 997e8f7efa0584da1f5be5fd42aa06b8c9e22a11
@@ -22190,7 +23562,7 @@ Date:   Tue Nov 11 09:14:56 2008 +0000
     
     svn path=/trunk/; revision=238
 
- libseed/seed-types.c |    5 +++++
+ libseed/seed-types.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 321ed3f8f662d4e1e081ac776008705f3c6b4290
@@ -22202,7 +23574,7 @@ Date:   Tue Nov 11 08:16:07 2008 +0000
     
     svn path=/trunk/; revision=237
 
- examples/ide/ide-window.js |   40 ++++++++++++++++++++++++++++++++++++++++
+ examples/ide/ide-window.js | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit 6577a13fb6155280f560b6df9b6139875f0325dd
@@ -22214,11 +23586,11 @@ Date:   Tue Nov 11 07:36:16 2008 +0000
     
     svn path=/trunk/; revision=236
 
- examples/ide/ide-actions.js    |   11 ++++++-----
- examples/ide/ide-sourceview.js |    3 ++-
- examples/ide/ide-tabheader.js  |    5 +----
- examples/ide/ide-tabview.js    |   34 ++++++++++++++++++++++------------
- examples/ide/main.js           |   33 +++------------------------------
+ examples/ide/ide-actions.js    | 11 ++++++-----
+ examples/ide/ide-sourceview.js |  3 ++-
+ examples/ide/ide-tabheader.js  |  5 +----
+ examples/ide/ide-tabview.js    | 34 ++++++++++++++++++++++------------
+ examples/ide/main.js           | 33 +++------------------------------
  5 files changed, 34 insertions(+), 52 deletions(-)
 
 commit 65a11a643932bfba236058cc8ecdc163bc8b5998
@@ -22231,15 +23603,15 @@ Date:   Tue Nov 11 05:51:05 2008 +0000
     
     svn path=/trunk/; revision=235
 
- aclocal.m4                    |10602 -----------------------------------------
- config.guess                  |    1 -
- config.sub                    |    1 -
- depcomp                       |    1 -
- examples/ide/ide-actions.js   |    2 +-
- examples/ide/ide-tab.js       |    2 +
- examples/ide/ide-tabheader.js |    6 +-
- install-sh                    |    1 -
- missing                       |    1 -
+ aclocal.m4                    | 10602 ----------------------------------------
+ config.guess                  |     1 -
+ config.sub                    |     1 -
+ depcomp                       |     1 -
+ examples/ide/ide-actions.js   |     2 +-
+ examples/ide/ide-tab.js       |     2 +
+ examples/ide/ide-tabheader.js |     6 +-
+ install-sh                    |     1 -
+ missing                       |     1 -
  9 files changed, 8 insertions(+), 10609 deletions(-)
 
 commit bc3f34d9793d48b619d9cd830e8094a95ad26b47
@@ -22282,7 +23654,7 @@ Date:   Mon Nov 10 16:05:33 2008 +0000
     
     svn path=/trunk/; revision=233
 
- tests/gtype-signal2.js |   10 ++++++----
+ tests/gtype-signal2.js | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 66ca20ea452fdd8681be53c52daaafe3a956021a
@@ -22293,9 +23665,9 @@ Date:   Mon Nov 10 13:30:09 2008 +0000
     
     svn path=/trunk/; revision=232
 
- examples/ide/ide-actions.js     |    2 +-
- examples/ide/ide-messagearea.js |   10 +++-------
- examples/ide/ide-sourceview.js  |   14 ++++++++++----
+ examples/ide/ide-actions.js     |  2 +-
+ examples/ide/ide-messagearea.js | 10 +++-------
+ examples/ide/ide-sourceview.js  | 14 ++++++++++----
  3 files changed, 14 insertions(+), 12 deletions(-)
 
 commit 4c67f949607123ba03fbb5de8df2f6a9391c4dc5
@@ -22306,10 +23678,10 @@ Date:   Mon Nov 10 13:18:57 2008 +0000
     
     svn path=/trunk/; revision=231
 
- examples/ide/ide-actions.js     |    4 ++--
- examples/ide/ide-messagearea.js |   46 ++++++++++++++++++++++++++++++++++-----
- examples/ide/ide-sourceview.js  |   18 ++++++++++++++-
- examples/ide/ide-tabview.js     |   25 +++++++++++++++++----
+ examples/ide/ide-actions.js     |  4 ++--
+ examples/ide/ide-messagearea.js | 46 ++++++++++++++++++++++++++++++++++++-----
+ examples/ide/ide-sourceview.js  | 18 +++++++++++++++-
+ examples/ide/ide-tabview.js     | 25 ++++++++++++++++++----
  4 files changed, 81 insertions(+), 12 deletions(-)
 
 commit f6498517893548ee9018dc2bae1e93f389cea2a2
@@ -22320,7 +23692,7 @@ Date:   Mon Nov 10 13:11:29 2008 +0000
     
     svn path=/trunk/; revision=230
 
- libseed/seed-signals.c |    3 ++-
+ libseed/seed-signals.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 3de9184cee2e33499014e3ac28b76b4dc92e136a
@@ -22331,7 +23703,7 @@ Date:   Mon Nov 10 13:10:09 2008 +0000
     
     svn path=/trunk/; revision=229
 
- libseed/seed-gtype.c |    2 +-
+ libseed/seed-gtype.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1a693a5d58142e888aecdf5786caa347d182af16
@@ -22342,7 +23714,7 @@ Date:   Mon Nov 10 13:07:53 2008 +0000
     
     svn path=/trunk/; revision=228
 
- libseed/seed-signals.c |    2 +-
+ libseed/seed-signals.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e967d9d1b3997baf6bb687cde319e9cae861d9f1
@@ -22353,7 +23725,7 @@ Date:   Mon Nov 10 13:02:17 2008 +0000
     
     svn path=/trunk/; revision=227
 
- tests/gtype-signal-exception.js |   46 +++++++++++++++++++++++++++++++++++++++
+ tests/gtype-signal-exception.js | 46 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
 commit e9b1478b22032a7b24a7da3e342e26457c5f6b01
@@ -22366,15 +23738,15 @@ Date:   Mon Nov 10 13:00:08 2008 +0000
     
     svn path=/trunk/; revision=226
 
- examples/pango.js      |    2 +-
- extensions/GObject.js  |   30 +++++
- extensions/Makefile.am |    4 +-
- libseed/seed-closure.h |    2 +
- libseed/seed-gtype.c   |  301 +++++++++++++++++++++++++++++++++++++++++++++++-
- libseed/seed-signals.c |   74 +++++++++++-
- tests/Makefile.am      |    3 +
- tests/gtype-signal.js  |   34 ++++++
- tests/gtype-signal2.js |   32 +++++
+ examples/pango.js      |   2 +-
+ extensions/GObject.js  |  30 +++++
+ extensions/Makefile.am |   4 +-
+ libseed/seed-closure.h |   2 +
+ libseed/seed-gtype.c   | 301 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-signals.c |  74 +++++++++++-
+ tests/Makefile.am      |   3 +
+ tests/gtype-signal.js  |  34 ++++++
+ tests/gtype-signal2.js |  32 ++++++
  9 files changed, 471 insertions(+), 11 deletions(-)
 
 commit 539189290cc872e40cc77557f8da2bcb52a3ac5d
@@ -22385,14 +23757,14 @@ Date:   Mon Nov 10 08:17:25 2008 +0000
     
     svn path=/trunk/; revision=225
 
- examples/ide/ide-actions.js     |   14 +++++++++-
- examples/ide/ide-messagearea.js |   40 ++++++++++++++-------------
- examples/ide/ide-sourceview.js  |    8 ++++--
- examples/ide/ide-tab.js         |   58 +++++++++++++++++++++++++++++----------
- examples/ide/ide-tabheader.js   |    2 +-
- examples/ide/ide-tabview.js     |    7 ++++-
- examples/ide/ide-toolbar.js     |    2 ++
- examples/ide/main.js            |    4 ++-
+ examples/ide/ide-actions.js     | 14 +++++++++-
+ examples/ide/ide-messagearea.js | 40 ++++++++++++++--------------
+ examples/ide/ide-sourceview.js  |  8 ++++--
+ examples/ide/ide-tab.js         | 58 ++++++++++++++++++++++++++++++-----------
+ examples/ide/ide-tabheader.js   |  2 +-
+ examples/ide/ide-tabview.js     |  7 ++++-
+ examples/ide/ide-toolbar.js     |  2 ++
+ examples/ide/main.js            |  4 ++-
  8 files changed, 95 insertions(+), 40 deletions(-)
 
 commit edc485180a4331e5da6a98706a271cb8fa7231ee
@@ -22403,13 +23775,13 @@ Date:   Mon Nov 10 00:39:01 2008 +0000
     
     svn path=/trunk/; revision=224
 
- libseed/seed-engine.c     |  857 ++++++++++++++++++++++-----------------------
- libseed/seed-engine.h     |    1 -
- libseed/seed-exceptions.c |   49 ++-
- libseed/seed-exceptions.h |    6 +-
- libseed/seed-gtype.c      |   10 +-
- libseed/seed-signals.c    |   11 +-
- libseed/seed.h            |    2 +-
+ libseed/seed-engine.c     | 857 +++++++++++++++++++++++-----------------------
+ libseed/seed-engine.h     |   1 -
+ libseed/seed-exceptions.c |  49 ++-
+ libseed/seed-exceptions.h |   6 +-
+ libseed/seed-gtype.c      |  10 +-
+ libseed/seed-signals.c    |  11 +-
+ libseed/seed.h            |   2 +-
  7 files changed, 461 insertions(+), 475 deletions(-)
 
 commit ab760c1de1aecbc696e5a26bbd44647d1325e5b3
@@ -22420,11 +23792,11 @@ Date:   Sun Nov 9 17:07:41 2008 +0000
     
     svn path=/trunk/; revision=223
 
- Makefile.am          |    1 +
- configure.ac         |    1 +
- examples/Makefile.am |    2 ++
- examples/cairo.js    |   40 ++++++++++++++++++++++++++++++++++++++++
- gir/Makefile.am      |   28 ++++++++++++++++++++++++++++
+ Makefile.am          |  1 +
+ configure.ac         |  1 +
+ examples/Makefile.am |  2 ++
+ examples/cairo.js    | 40 ++++++++++++++++++++++++++++++++++++++++
+ gir/Makefile.am      | 28 ++++++++++++++++++++++++++++
  5 files changed, 72 insertions(+)
 
 commit 33d547175e6d82faf8f11e399316047dd48df29f
@@ -22435,14 +23807,14 @@ Date:   Sun Nov 9 09:59:57 2008 +0000
     
     svn path=/trunk/; revision=222
 
- examples/ide/ide-actions.js     |   63 ++++++----------------------
- examples/ide/ide-messagearea.js |   87 +++++++++++++++++++++++++++++++++++++++
- examples/ide/ide-sourceview.js  |   77 +++++++++++++++++++++++++++++++---
- examples/ide/ide-tab.js         |    1 +
- examples/ide/ide-tabview.js     |    8 +++-
- examples/ide/ide-toolbar.js     |    6 +--
- examples/ide/main.js            |    7 +++-
- tests/make-test.py              |    2 +-
+ examples/ide/ide-actions.js     | 63 ++++++-----------------------
+ examples/ide/ide-messagearea.js | 87 +++++++++++++++++++++++++++++++++++++++++
+ examples/ide/ide-sourceview.js  | 77 +++++++++++++++++++++++++++++++++---
+ examples/ide/ide-tab.js         |  1 +
+ examples/ide/ide-tabview.js     |  8 +++-
+ examples/ide/ide-toolbar.js     |  6 +--
+ examples/ide/main.js            |  7 +++-
+ tests/make-test.py              |  2 +-
  8 files changed, 187 insertions(+), 64 deletions(-)
 
 commit bd715e093d7bb7e06b9f572cadfa15bf978fcee0
@@ -22453,7 +23825,7 @@ Date:   Sun Nov 9 08:29:08 2008 +0000
     
     svn path=/trunk/; revision=221
 
- libseed/seed-gtype.c |   16 +++++++++++++++-
+ libseed/seed-gtype.c | 16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 commit 69dc925dba503471cc4bf3b422186ad2a506137f
@@ -22464,8 +23836,8 @@ Date:   Sun Nov 9 07:51:31 2008 +0000
     
     svn path=/trunk/; revision=220
 
- libseed/seed-engine.c             |   13 +------------
- tests/namespace-exception-test.js |    4 ++++
+ libseed/seed-engine.c             | 13 +------------
+ tests/namespace-exception-test.js |  4 ++++
  2 files changed, 5 insertions(+), 12 deletions(-)
 
 commit a4bdd17a0f63ed4fb77e637361ea3eddbc340561
@@ -22476,9 +23848,9 @@ Date:   Sun Nov 9 07:47:46 2008 +0000
     
     svn path=/trunk/; revision=219
 
- libseed/seed-engine.c     |   23 ++++-------------------
- libseed/seed-exceptions.c |   26 ++++++++++++++++++++++++++
- libseed/seed-exceptions.h |    3 +++
+ libseed/seed-engine.c     | 23 ++++-------------------
+ libseed/seed-exceptions.c | 26 ++++++++++++++++++++++++++
+ libseed/seed-exceptions.h |  3 +++
  3 files changed, 33 insertions(+), 19 deletions(-)
 
 commit 721986c4f4104acc496c1575c56358ad643fdfea
@@ -22489,12 +23861,12 @@ Date:   Sun Nov 9 07:14:31 2008 +0000
     
     svn path=/trunk/; revision=218
 
- libseed/seed-exceptions.c |    2 ++
- libseed/seed-exceptions.h |    3 +--
- libseed/seed-private.h    |    1 +
- libseed/seed-signals.c    |   14 ++++++++++++--
- tests/Makefile.am         |    1 +
- tests/signal-exception.js |   12 ++++++++++++
+ libseed/seed-exceptions.c |  2 ++
+ libseed/seed-exceptions.h |  3 +--
+ libseed/seed-private.h    |  1 +
+ libseed/seed-signals.c    | 14 ++++++++++++--
+ tests/Makefile.am         |  1 +
+ tests/signal-exception.js | 12 ++++++++++++
  6 files changed, 29 insertions(+), 4 deletions(-)
 
 commit 90bb583a92ce221e8d738cb8bce9ff936a0d5f92
@@ -22505,13 +23877,13 @@ Date:   Sun Nov 9 06:55:07 2008 +0000
     
     svn path=/trunk/; revision=217
 
- configure.ac              |    2 +-
- libseed/Makefile.am       |    2 +
- libseed/seed-engine.c     |   75 ----------------------------
- libseed/seed-engine.h     |    4 +-
- libseed/seed-exceptions.c |  118 +++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-exceptions.h |   37 ++++++++++++++
- libseed/seed.h            |    1 +
+ configure.ac              |   2 +-
+ libseed/Makefile.am       |   2 +
+ libseed/seed-engine.c     |  75 -----------------------------
+ libseed/seed-engine.h     |   4 +-
+ libseed/seed-exceptions.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-exceptions.h |  37 +++++++++++++++
+ libseed/seed.h            |   1 +
  7 files changed, 161 insertions(+), 78 deletions(-)
 
 commit 28aa183d6333eeb8de2b9fd05a3631978464d238
@@ -22522,8 +23894,8 @@ Date:   Sat Nov 8 14:05:19 2008 +0000
     
     svn path=/trunk/; revision=216
 
- libseed/seed-builtins.c |    3 +--
- src/main.c              |    3 ++-
+ libseed/seed-builtins.c | 3 +--
+ src/main.c              | 3 ++-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit fba7a5b43343aa150c6b3f3f72238a3dddbf46c2
@@ -22534,8 +23906,8 @@ Date:   Sat Nov 8 13:58:45 2008 +0000
     
     svn path=/trunk/; revision=215
 
- libseed/seed-builtins.c |    1 +
- tests/out-test.js       |    2 +-
+ libseed/seed-builtins.c | 1 +
+ tests/out-test.js       | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit ad9b1b24bf51a818a5bdf739b1b4d41e83e89990
@@ -22546,9 +23918,9 @@ Date:   Sat Nov 8 12:13:39 2008 +0000
     
     svn path=/trunk/; revision=214
 
- libseed/seed-engine.c |   41 ++++++++++++++++++++++++++++-------------
- tests/Makefile.am     |    1 +
- tests/out-test.js     |   13 +++++++++++++
+ libseed/seed-engine.c | 41 ++++++++++++++++++++++++++++-------------
+ tests/Makefile.am     |  1 +
+ tests/out-test.js     | 13 +++++++++++++
  3 files changed, 42 insertions(+), 13 deletions(-)
 
 commit 7e22805dc118ad6456cf77212757aa098100fdd2
@@ -22559,9 +23931,9 @@ Date:   Sat Nov 8 11:53:00 2008 +0000
     
     svn path=/trunk/; revision=213
 
- libseed/seed-builtins.c |   26 +-
- libseed/seed-engine.c   |  900 ++++++++++++++++++++++++-----------------------
- libseed/seed-signals.c  |    6 +-
+ libseed/seed-builtins.c |  26 +-
+ libseed/seed-engine.c   | 900 +++++++++++++++++++++++++-----------------------
+ libseed/seed-signals.c  |   6 +-
  3 files changed, 477 insertions(+), 455 deletions(-)
 
 commit 681eaf7838235d01d0cee3950c0531e9e5a4ce62
@@ -22573,7 +23945,7 @@ Date:   Sat Nov 8 08:07:19 2008 +0000
     
     svn path=/trunk/; revision=212
 
- examples/ide/ide-actions.js |    9 ++++++++-
+ examples/ide/ide-actions.js | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 37d41973cdd080689292482da34bd6e7ab8c754d
@@ -22584,7 +23956,7 @@ Date:   Sat Nov 8 07:50:35 2008 +0000
     
     svn path=/trunk/; revision=210
 
- libseed/seed-engine.c |    6 ++++--
+ libseed/seed-engine.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 8f28f1b8d5a95da4488e88b8895b2ea46b1e7150
@@ -22595,7 +23967,7 @@ Date:   Sat Nov 8 07:37:33 2008 +0000
     
     svn path=/trunk/; revision=208
 
- src/main.c |    2 +-
+ src/main.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 81e3ad807f7c53bc20dd342be2af1bfb618874e6
@@ -22606,7 +23978,7 @@ Date:   Sat Nov 8 05:58:27 2008 +0000
     
     svn path=/trunk/; revision=205
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4e2b2b435954f0d7c2941bf2ba9434386f1edaca
@@ -22617,11 +23989,11 @@ Date:   Sat Nov 8 05:51:22 2008 +0000
     
     svn path=/trunk/; revision=201
 
- examples/shader/Makefile.am   |   15 -----------
- examples/shader/ShaderView.js |   45 --------------------------------
- examples/shader/bob.jpg       |  Bin 59229 -> 0 bytes
- examples/shader/default.glsl  |   24 -----------------
- examples/shader/main.js       |   57 -----------------------------------------
+ examples/shader/Makefile.am   |  15 -----------
+ examples/shader/ShaderView.js |  45 ---------------------------------
+ examples/shader/bob.jpg       | Bin 59229 -> 0 bytes
+ examples/shader/default.glsl  |  24 ------------------
+ examples/shader/main.js       |  57 ------------------------------------------
  5 files changed, 141 deletions(-)
 
 commit e7381c9fc6897a841f037976b96ab6d40ec103c7
@@ -22632,7 +24004,7 @@ Date:   Sat Nov 8 05:46:54 2008 +0000
     
     svn path=/trunk/; revision=199
 
- doc/runtime.html |    4 ++++
+ doc/runtime.html | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 9f83b5f1122b63fd10f5b99074865d9d90ee912b
@@ -22643,7 +24015,7 @@ Date:   Sat Nov 8 05:45:22 2008 +0000
     
     svn path=/trunk/; revision=198
 
- examples/clutter-shader/Makefile.am |    2 +-
+ examples/clutter-shader/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9b62a857108a4d2cf4081088a493ad294b01d60f
@@ -22654,17 +24026,17 @@ Date:   Sat Nov 8 05:44:22 2008 +0000
     
     svn path=/trunk/; revision=197
 
- examples/Makefile.am                  |    2 +-
- examples/accelgroup.js                |    1 +
- examples/actions.js                   |    2 +-
- examples/clutter-shader/Makefile.am   |   15 +++++++++
- examples/clutter-shader/ShaderView.js |   45 ++++++++++++++++++++++++++
- examples/clutter-shader/bob.jpg       |  Bin 0 -> 59229 bytes
- examples/clutter-shader/default.glsl  |   24 ++++++++++++++
- examples/clutter-shader/main.js       |   56 +++++++++++++++++++++++++++++++++
- examples/clutter.js                   |    8 +++--
- examples/n-oscillator.js              |    6 ++--
- libseed/seed-builtins.c               |   19 +++++++++++
+ examples/Makefile.am                  |   2 +-
+ examples/accelgroup.js                |   1 +
+ examples/actions.js                   |   2 +-
+ examples/clutter-shader/Makefile.am   |  15 +++++++++
+ examples/clutter-shader/ShaderView.js |  45 +++++++++++++++++++++++++++
+ examples/clutter-shader/bob.jpg       | Bin 0 -> 59229 bytes
+ examples/clutter-shader/default.glsl  |  24 +++++++++++++++
+ examples/clutter-shader/main.js       |  56 ++++++++++++++++++++++++++++++++++
+ examples/clutter.js                   |   8 +++--
+ examples/n-oscillator.js              |   6 ++--
+ libseed/seed-builtins.c               |  19 ++++++++++++
  11 files changed, 171 insertions(+), 7 deletions(-)
 
 commit b52082460d433c7002ce5d5bcc64368b83898a4f
@@ -22676,19 +24048,19 @@ Date:   Sat Nov 8 05:44:16 2008 +0000
     
     svn path=/trunk/; revision=196
 
- doc/tutorial-standalone/1.js          |    2 +-
- doc/tutorial-standalone/2.js          |    2 +-
- doc/tutorial-standalone/3.js          |    2 +-
- doc/tutorial-standalone/tutorial.html |    8 ++++----
- examples/ide/legacy/ide.js            |    2 +-
- examples/ide/legacy/toolbar.js        |    2 +-
- examples/lightsoff/lightsoff.js       |    2 +-
- extensions/Seed.js                    |    2 +-
- tests/constructor-args.js             |    4 ++--
- tests/gerror.js                       |    2 +-
- tests/signal-expects.js               |    4 ++--
- tests/signal-this.js                  |    4 ++--
- tests/signal-userdata.js              |    4 ++--
+ doc/tutorial-standalone/1.js          | 2 +-
+ doc/tutorial-standalone/2.js          | 2 +-
+ doc/tutorial-standalone/3.js          | 2 +-
+ doc/tutorial-standalone/tutorial.html | 8 ++++----
+ examples/ide/legacy/ide.js            | 2 +-
+ examples/ide/legacy/toolbar.js        | 2 +-
+ examples/lightsoff/lightsoff.js       | 2 +-
+ extensions/Seed.js                    | 2 +-
+ tests/constructor-args.js             | 4 ++--
+ tests/gerror.js                       | 2 +-
+ tests/signal-expects.js               | 4 ++--
+ tests/signal-this.js                  | 4 ++--
+ tests/signal-userdata.js              | 4 ++--
  13 files changed, 20 insertions(+), 20 deletions(-)
 
 commit a8ff0410c7cc26685646344da435b5082cab5728
@@ -22699,7 +24071,7 @@ Date:   Sat Nov 8 04:18:52 2008 +0000
     
     svn path=/trunk/; revision=195
 
- libseed/seed-signals.c |   11 ++++++++++-
+ libseed/seed-signals.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 5708babcdd6575772850fce8af5623856e7b7a67
@@ -22710,10 +24082,10 @@ Date:   Sat Nov 8 04:12:22 2008 +0000
     
     svn path=/trunk/; revision=194
 
- libseed/seed-closure.h |   12 ++++++------
- libseed/seed-engine.c  |   49 +++++++++++++++++++++++++++---------------------
- libseed/seed-signals.c |   18 ++++++++----------
- libseed/seed-signals.h |    8 ++++----
+ libseed/seed-closure.h | 12 ++++++------
+ libseed/seed-engine.c  | 49 ++++++++++++++++++++++++++++---------------------
+ libseed/seed-signals.c | 18 ++++++++----------
+ libseed/seed-signals.h |  8 ++++----
  4 files changed, 46 insertions(+), 41 deletions(-)
 
 commit 2bc5a4e5c90424fcbba062f287604da6fbfb9b76
@@ -22724,7 +24096,7 @@ Date:   Sat Nov 8 04:01:24 2008 +0000
     
     svn path=/trunk/; revision=193
 
- libseed/seed-engine.c |    6 ++++--
+ libseed/seed-engine.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 4af00ea77011b00a86ea13338fc61dcba6eb3b96
@@ -22735,9 +24107,9 @@ Date:   Sat Nov 8 03:56:50 2008 +0000
     
     svn path=/trunk/; revision=192
 
- libseed/seed-engine.c     |   30 ++++++++++++++++++++++--------
- tests/Makefile.am         |    1 +
- tests/constructor-args.js |   34 ++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c     | 30 ++++++++++++++++++++++--------
+ tests/Makefile.am         |  1 +
+ tests/constructor-args.js | 34 ++++++++++++++++++++++++++++++++++
  3 files changed, 57 insertions(+), 8 deletions(-)
 
 commit 48372b219f144fcd9cdb87221b0665601159c3fe
@@ -22748,7 +24120,7 @@ Date:   Sat Nov 8 03:54:40 2008 +0000
     
     svn path=/trunk/; revision=191
 
- examples/lightsoff/lightsoff.js |    1 -
+ examples/lightsoff/lightsoff.js | 1 -
  1 file changed, 1 deletion(-)
 
 commit 4ac59f6991977ed5cac0511bbc603573c8dc280a
@@ -22759,10 +24131,10 @@ Date:   Sat Nov 8 03:43:00 2008 +0000
     
     svn path=/trunk/; revision=190
 
- tests/Makefile.am        |    3 +++
- tests/signal-expects.js  |   17 +++++++++++++++++
- tests/signal-this.js     |   17 +++++++++++++++++
- tests/signal-userdata.js |   17 +++++++++++++++++
+ tests/Makefile.am        |  3 +++
+ tests/signal-expects.js  | 17 +++++++++++++++++
+ tests/signal-this.js     | 17 +++++++++++++++++
+ tests/signal-userdata.js | 17 +++++++++++++++++
  4 files changed, 54 insertions(+)
 
 commit 55acacf3dd17da86f83469aae9908c5a22a5ee43
@@ -22773,7 +24145,7 @@ Date:   Sat Nov 8 03:39:38 2008 +0000
     
     svn path=/trunk/; revision=189
 
- libseed/seed-signals.c |    5 ++++-
+ libseed/seed-signals.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 2f46bd495b2bb58e87b4ab7b7dcc4793489d914c
@@ -22784,7 +24156,7 @@ Date:   Sat Nov 8 03:39:03 2008 +0000
     
     svn path=/trunk/; revision=188
 
- examples/lightsoff/lightsoff.js |  120 ++++++++++++++++++++++++---------------
+ examples/lightsoff/lightsoff.js | 120 +++++++++++++++++++++++++---------------
  1 file changed, 75 insertions(+), 45 deletions(-)
 
 commit b6abf43e260fb318c61977e2b0c8f6f6890b8904
@@ -22795,7 +24167,7 @@ Date:   Sat Nov 8 03:10:29 2008 +0000
     
     svn path=/trunk/; revision=187
 
- doc/runtime.html |    6 +++---
+ doc/runtime.html | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 3a03f66ab3a561eaed892b213de6be11e0eb29a3
@@ -22806,9 +24178,9 @@ Date:   Sat Nov 8 03:07:50 2008 +0000
     
     svn path=/trunk/; revision=186
 
- libseed/seed-closure.h |   10 ++++++----
- libseed/seed-signals.c |   23 ++++++++++++++++-------
- libseed/seed-signals.h |    5 +----
+ libseed/seed-closure.h | 10 ++++++----
+ libseed/seed-signals.c | 23 ++++++++++++++++-------
+ libseed/seed-signals.h |  5 +----
  3 files changed, 23 insertions(+), 15 deletions(-)
 
 commit ea0a4f165f6fe038fe017d90f4044cd0aa5de5ea
@@ -22820,13 +24192,13 @@ Date:   Sat Nov 8 01:53:49 2008 +0000
     
     svn path=/trunk/; revision=185
 
- configure.ac              |    5 +++--
- examples/actions.js       |    1 +
- examples/clutter.js       |    3 ++-
- examples/json-packing.js  |    3 ++-
- examples/pango-fontset.js |    4 ++--
- examples/pango.js         |    4 +---
- examples/shader/main.js   |    1 +
+ configure.ac              | 5 +++--
+ examples/actions.js       | 1 +
+ examples/clutter.js       | 3 ++-
+ examples/json-packing.js  | 3 ++-
+ examples/pango-fontset.js | 4 ++--
+ examples/pango.js         | 4 +---
+ examples/shader/main.js   | 1 +
  7 files changed, 12 insertions(+), 9 deletions(-)
 
 commit bc63765b311a6f29051cd0ac0a31bbe7aa312a59
@@ -22858,23 +24230,23 @@ Date:   Sat Nov 8 01:41:15 2008 +0000
     
     svn path=/trunk/; revision=183
 
- libseed/indent.sh       |    5 +
- libseed/seed-builtins.c |  199 +++++++++--------
- libseed/seed-builtins.h |    5 +-
- libseed/seed-closure.c  |  349 +++++++++++++++---------------
- libseed/seed-closure.h  |   24 +--
- libseed/seed-engine.c   |  539 +++++++++++++++++++++++++---------------------
- libseed/seed-engine.h   |   13 +-
- libseed/seed-gtype.c    |  355 +++++++++++++++----------------
- libseed/seed-gtype.h    |    4 +-
- libseed/seed-private.h  |    5 +-
- libseed/seed-signals.c  |   47 ++--
- libseed/seed-signals.h  |   14 +-
- libseed/seed-structs.c  |   25 ++-
- libseed/seed-structs.h  |    4 +-
- libseed/seed-types.c    |  543 ++++++++++++++++++++++++++++-------------------
- libseed/seed-types.h    |   26 +--
- libseed/seed.h          |   78 +++----
+ libseed/indent.sh       |   5 +
+ libseed/seed-builtins.c | 199 ++++++++++--------
+ libseed/seed-builtins.h |   5 +-
+ libseed/seed-closure.c  | 349 ++++++++++++++++---------------
+ libseed/seed-closure.h  |  24 +--
+ libseed/seed-engine.c   | 539 ++++++++++++++++++++++++++---------------------
+ libseed/seed-engine.h   |  13 +-
+ libseed/seed-gtype.c    | 355 +++++++++++++++----------------
+ libseed/seed-gtype.h    |   4 +-
+ libseed/seed-private.h  |   5 +-
+ libseed/seed-signals.c  |  47 +++--
+ libseed/seed-signals.h  |  14 +-
+ libseed/seed-structs.c  |  25 ++-
+ libseed/seed-structs.h  |   4 +-
+ libseed/seed-types.c    | 543 +++++++++++++++++++++++++++++-------------------
+ libseed/seed-types.h    |  26 +--
+ libseed/seed.h          |  78 +++----
  17 files changed, 1233 insertions(+), 1002 deletions(-)
 
 commit 502f763100655ab6dd843a067b7be3d6cdd2a3db
@@ -22885,7 +24257,7 @@ Date:   Sat Nov 8 01:39:16 2008 +0000
     
     svn path=/trunk/; revision=182
 
- tests/Makefile.am |    1 +
+ tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit dea9c366d632d1dfa1f646fe1147f1f47921d52f
@@ -22896,7 +24268,7 @@ Date:   Sat Nov 8 01:32:14 2008 +0000
     
     svn path=/trunk/; revision=181
 
- libseed/seed-engine.c |    7 +++++--
+ libseed/seed-engine.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 17d9ee4b686735344fc44988f03135bbff4eb89e
@@ -22907,9 +24279,9 @@ Date:   Sat Nov 8 01:27:33 2008 +0000
     
     svn path=/trunk/; revision=180
 
- extensions/Gio.js     |   12 ++----------
- libseed/seed-engine.c |   45 ++++++++++++++++++++++++---------------------
- tests/gerror.js       |   18 ++++++++++++++++++
+ extensions/Gio.js     | 12 ++----------
+ libseed/seed-engine.c | 45 ++++++++++++++++++++++++---------------------
+ tests/gerror.js       | 18 ++++++++++++++++++
  3 files changed, 44 insertions(+), 31 deletions(-)
 
 commit 280b119fde24cb8f5d743947c0bd803ab23c097c
@@ -22921,10 +24293,10 @@ Date:   Sat Nov 8 01:26:59 2008 +0000
     
     svn path=/trunk/; revision=179
 
- config.h.in         |    3 +
- configure.ac        |    5 +
- libseed/Makefile.in |  576 ---------------------------------------------------
- src/Makefile.in     |  530 -----------------------------------------------
+ config.h.in         |   3 +
+ configure.ac        |   5 +
+ libseed/Makefile.in | 576 ----------------------------------------------------
+ src/Makefile.in     | 530 -----------------------------------------------
  4 files changed, 8 insertions(+), 1106 deletions(-)
 
 commit 93bcda022cd921c12e98019a6e4d194a6a2179e1
@@ -22935,7 +24307,7 @@ Date:   Sat Nov 8 01:21:32 2008 +0000
     
     svn path=/trunk/; revision=178
 
- libseed/seed-engine.c |   25 ++++++++++++++++++++++---
+ libseed/seed-engine.c | 25 ++++++++++++++++++++++---
  1 file changed, 22 insertions(+), 3 deletions(-)
 
 commit a248d1ebe6c6c451ffc41271f23dde906a9e9d9d
@@ -22947,9 +24319,9 @@ Date:   Sat Nov 8 01:10:43 2008 +0000
     
     svn path=/trunk/; revision=177
 
- configure.ac        |   35 +++++++++++++++++++++++++++++++----
- libseed/Makefile.in |    2 ++
- src/Makefile.in     |    2 ++
+ configure.ac        | 35 +++++++++++++++++++++++++++++++----
+ libseed/Makefile.in |  2 ++
+ src/Makefile.in     |  2 ++
  3 files changed, 35 insertions(+), 4 deletions(-)
 
 commit 1eec31bfe69a88003395b6b2fa86f43f638c3f78
@@ -22961,7 +24333,7 @@ Date:   Sat Nov 8 00:36:08 2008 +0000
     
     svn path=/trunk/; revision=176
 
- extensions/Gio.js |   10 ++++++++++
+ extensions/Gio.js | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit a3bf09926e15e2918cf1a3ad5abe396fd779324a
@@ -22973,7 +24345,7 @@ Date:   Sat Nov 8 00:27:39 2008 +0000
     
     svn path=/trunk/; revision=175
 
- examples/ide/main.js |    2 +-
+ examples/ide/main.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 768f06e2d47ed2bc4a62536569413a56473ebaca
@@ -22984,11 +24356,11 @@ Date:   Sat Nov 8 00:24:42 2008 +0000
     
     svn path=/trunk/; revision=174
 
- examples/ide/ide-actions.js    |   28 +++++++++++++++++++++++++
- examples/ide/ide-sourceview.js |   45 ++++++++++++++++++++++++++++++++++++----
- examples/ide/ide-tabview.js    |    4 +++-
- examples/ide/ide-toolbar.js    |    5 +++++
- examples/ide/main.js           |    8 +++----
+ examples/ide/ide-actions.js    | 28 ++++++++++++++++++++++++++
+ examples/ide/ide-sourceview.js | 45 ++++++++++++++++++++++++++++++++++++++----
+ examples/ide/ide-tabview.js    |  4 +++-
+ examples/ide/ide-toolbar.js    |  5 +++++
+ examples/ide/main.js           |  8 +++-----
  5 files changed, 80 insertions(+), 10 deletions(-)
 
 commit 214e4caf8366c1f28167741b43da8ad0e2475781
@@ -22999,7 +24371,7 @@ Date:   Sat Nov 8 00:19:11 2008 +0000
     
     svn path=/trunk/; revision=173
 
- libseed/seed.h |   11 +++++++++++
+ libseed/seed.h | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 97a7b7baf7a9a09a0e43fa698c4e943ba9d6e8a7
@@ -23011,48 +24383,48 @@ Date:   Sat Nov 8 00:11:11 2008 +0000
     
     svn path=/trunk/; revision=172
 
- examples/HACKING                  |    2 +-
- examples/accelgroup.js            |    2 +-
- examples/actions.js               |    2 +-
- examples/calculator.js            |    2 +-
- examples/clutter.js               |    2 +-
- examples/gconf.js                 |    2 +-
- examples/introspect.js            |    2 +-
- examples/json-packing.js          |    2 +-
- examples/ls.js                    |    2 +-
- examples/mini-browser.js          |    2 +-
- examples/n-oscillator.js          |    2 +-
- examples/notify-test.js           |    2 +-
- examples/pango-fontset.js         |    2 +-
- examples/pango.js                 |    2 +-
- examples/poppler.js               |    2 +-
- examples/quine.js                 |    2 +-
- examples/repl.js                  |    2 +-
- examples/shader/ShaderView.js     |    2 +-
- examples/shader/main.js           |    2 +-
- examples/soup.js                  |    2 +-
- examples/vte-test.js              |    2 +-
- tests/argv.js                     |    4 ++--
- tests/compare.js                  |    2 +-
- tests/enum.js                     |    2 +-
- tests/gobject-scope.js            |    2 +-
- tests/gsuper.js                   |    2 +-
- tests/gtype.js                    |    2 +-
- tests/include.js                  |    2 +-
- tests/json-constructor.js         |    2 +-
- tests/json.js                     |    2 +-
- tests/list-test.js                |    2 +-
- tests/namespace-exception-test.js |    2 +-
- tests/native-closure.js           |    2 +-
- tests/print.js                    |    2 +-
- tests/printf.js                   |    2 +-
- tests/printprint.js               |    2 +-
- tests/property-benchmark.js       |    2 +-
- tests/property-glib-exception.js  |    2 +-
- tests/readline.js                 |    2 +-
- tests/signal.js                   |    2 +-
- tests/syntax-test.js              |    4 ++--
- tests/type-conversion.js          |    2 +-
+ examples/HACKING                  | 2 +-
+ examples/accelgroup.js            | 2 +-
+ examples/actions.js               | 2 +-
+ examples/calculator.js            | 2 +-
+ examples/clutter.js               | 2 +-
+ examples/gconf.js                 | 2 +-
+ examples/introspect.js            | 2 +-
+ examples/json-packing.js          | 2 +-
+ examples/ls.js                    | 2 +-
+ examples/mini-browser.js          | 2 +-
+ examples/n-oscillator.js          | 2 +-
+ examples/notify-test.js           | 2 +-
+ examples/pango-fontset.js         | 2 +-
+ examples/pango.js                 | 2 +-
+ examples/poppler.js               | 2 +-
+ examples/quine.js                 | 2 +-
+ examples/repl.js                  | 2 +-
+ examples/shader/ShaderView.js     | 2 +-
+ examples/shader/main.js           | 2 +-
+ examples/soup.js                  | 2 +-
+ examples/vte-test.js              | 2 +-
+ tests/argv.js                     | 4 ++--
+ tests/compare.js                  | 2 +-
+ tests/enum.js                     | 2 +-
+ tests/gobject-scope.js            | 2 +-
+ tests/gsuper.js                   | 2 +-
+ tests/gtype.js                    | 2 +-
+ tests/include.js                  | 2 +-
+ tests/json-constructor.js         | 2 +-
+ tests/json.js                     | 2 +-
+ tests/list-test.js                | 2 +-
+ tests/namespace-exception-test.js | 2 +-
+ tests/native-closure.js           | 2 +-
+ tests/print.js                    | 2 +-
+ tests/printf.js                   | 2 +-
+ tests/printprint.js               | 2 +-
+ tests/property-benchmark.js       | 2 +-
+ tests/property-glib-exception.js  | 2 +-
+ tests/readline.js                 | 2 +-
+ tests/signal.js                   | 2 +-
+ tests/syntax-test.js              | 4 ++--
+ tests/type-conversion.js          | 2 +-
  42 files changed, 44 insertions(+), 44 deletions(-)
 
 commit f66ebd542e8071dc61e87d79d645d3b07875ddcb
@@ -23063,7 +24435,7 @@ Date:   Fri Nov 7 23:37:49 2008 +0000
     
     svn path=/trunk/; revision=171
 
- libseed/seed-types.c |   22 +---------------------
+ libseed/seed-types.c | 22 +---------------------
  1 file changed, 1 insertion(+), 21 deletions(-)
 
 commit 88a6f8eae39a804bfced6a0530e7788879c7845f
@@ -23076,7 +24448,7 @@ Date:   Fri Nov 7 23:34:47 2008 +0000
     
     svn path=/trunk/; revision=170
 
- libseed/seed-engine.c |   48 ++++++++++++++++++++++++++++++++++++++++--------
+ libseed/seed-engine.c | 48 ++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 40 insertions(+), 8 deletions(-)
 
 commit c37af58774b1c87f7899037844eeefa52fd55a43
@@ -23088,7 +24460,7 @@ Date:   Fri Nov 7 22:32:36 2008 +0000
     
     svn path=/trunk/; revision=169
 
- Makefile.am |    2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 550bd24129ee563419ac62a71ab420520999a1e1
@@ -23101,12 +24473,12 @@ Date:   Fri Nov 7 19:45:24 2008 +0000
     
     svn path=/trunk/; revision=168
 
- examples/ide/ide-actions.js    |   45 ++++++++++++++++++++++++++++++++++++++++
- examples/ide/ide-sourceview.js |   15 ++++++++++----
- examples/ide/ide-tabheader.js  |    5 ++++-
- examples/ide/ide-tabview.js    |    9 ++++++++
- examples/ide/legacy/tabview.js |    2 +-
- examples/ide/main.js           |    4 ++--
+ examples/ide/ide-actions.js    | 45 ++++++++++++++++++++++++++++++++++++++++++
+ examples/ide/ide-sourceview.js | 15 ++++++++++----
+ examples/ide/ide-tabheader.js  |  5 ++++-
+ examples/ide/ide-tabview.js    |  9 +++++++++
+ examples/ide/legacy/tabview.js |  2 +-
+ examples/ide/main.js           |  4 ++--
  6 files changed, 72 insertions(+), 8 deletions(-)
 
 commit 0ea54066cc6ee2ca74fa080cbd1b869472e1978a
@@ -23118,7 +24490,7 @@ Date:   Fri Nov 7 19:02:16 2008 +0000
     
     svn path=/trunk/; revision=167
 
- examples/ide/Makefile.am |   20 ++++++++++++++------
+ examples/ide/Makefile.am | 20 ++++++++++++++------
  1 file changed, 14 insertions(+), 6 deletions(-)
 
 commit 3a136aa2a55b162b1a8ac45573705fde6fe4e74d
@@ -23130,19 +24502,19 @@ Date:   Fri Nov 7 18:58:14 2008 +0000
     
     svn path=/trunk/; revision=166
 
- examples/ide/ide-actions.js    |   70 ++++++++++++++++++
- examples/ide/ide-sourceview.js |   65 +++++++++++++++++
- examples/ide/ide-tab.js        |   34 +++++++++
- examples/ide/ide-tabheader.js  |   23 ++++++
- examples/ide/ide-tabview.js    |   33 +++++++++
- examples/ide/ide-toolbar.js    |   27 +++++++
- examples/ide/ide.js            |  155 ----------------------------------------
- examples/ide/legacy/ide.js     |  155 ++++++++++++++++++++++++++++++++++++++++
- examples/ide/legacy/tabview.js |   77 ++++++++++++++++++++
- examples/ide/legacy/toolbar.js |  143 ++++++++++++++++++++++++++++++++++++
- examples/ide/main.js           |   52 ++++++++++++++
- examples/ide/tabview.js        |   77 --------------------
- examples/ide/toolbar.js        |  143 ------------------------------------
+ examples/ide/ide-actions.js    |  70 +++++++++++++++++++
+ examples/ide/ide-sourceview.js |  65 +++++++++++++++++
+ examples/ide/ide-tab.js        |  34 +++++++++
+ examples/ide/ide-tabheader.js  |  23 ++++++
+ examples/ide/ide-tabview.js    |  33 +++++++++
+ examples/ide/ide-toolbar.js    |  27 +++++++
+ examples/ide/ide.js            | 155 -----------------------------------------
+ examples/ide/legacy/ide.js     | 155 +++++++++++++++++++++++++++++++++++++++++
+ examples/ide/legacy/tabview.js |  77 ++++++++++++++++++++
+ examples/ide/legacy/toolbar.js | 143 +++++++++++++++++++++++++++++++++++++
+ examples/ide/main.js           |  52 ++++++++++++++
+ examples/ide/tabview.js        |  77 --------------------
+ examples/ide/toolbar.js        | 143 -------------------------------------
  13 files changed, 679 insertions(+), 375 deletions(-)
 
 commit 53ca84558223b8862e40a3db8ca5cf8cb3bb9423
@@ -23155,7 +24527,7 @@ Date:   Fri Nov 7 16:45:54 2008 +0000
     
     svn path=/trunk/; revision=165
 
- examples/poppler.js |   49 +++++++++++++++++++++++++++++++------------------
+ examples/poppler.js | 49 +++++++++++++++++++++++++++++++------------------
  1 file changed, 31 insertions(+), 18 deletions(-)
 
 commit 8396a8bd5cae8fadc4b48519c310b9ab92996aec
@@ -23166,8 +24538,8 @@ Date:   Fri Nov 7 16:30:55 2008 +0000
     
     svn path=/trunk/; revision=164
 
- AUTHORS                 |    3 +++
- examples/shader/main.js |   19 ++++++++++++-------
+ AUTHORS                 |  3 +++
+ examples/shader/main.js | 19 ++++++++++++-------
  2 files changed, 15 insertions(+), 7 deletions(-)
 
 commit 334a96463779821b0da7da0c2c7a172a8aa0e471
@@ -23178,7 +24550,7 @@ Date:   Fri Nov 7 16:12:31 2008 +0000
     
     svn path=/trunk/; revision=163
 
- tests/Makefile.am |    2 +-
+ tests/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3b84023f64896afd19d9be465d132132a094894f
@@ -23189,10 +24561,10 @@ Date:   Fri Nov 7 16:10:51 2008 +0000
     
     svn path=/trunk/; revision=162
 
- examples/HACKING        |   20 +++++++++++++++-----
- libseed/Makefile.am.bak |   33 ---------------------------------
- src/Makefile.am.bak     |   31 -------------------------------
- tests/Makefile.am       |    3 ++-
+ examples/HACKING        | 20 +++++++++++++++-----
+ libseed/Makefile.am.bak | 33 ---------------------------------
+ src/Makefile.am.bak     | 31 -------------------------------
+ tests/Makefile.am       |  3 ++-
  4 files changed, 17 insertions(+), 70 deletions(-)
 
 commit cfec197af96215f262507fdce94d80fc14529cf8
@@ -23203,7 +24575,7 @@ Date:   Fri Nov 7 14:14:24 2008 +0000
     
     svn path=/trunk/; revision=161
 
- examples/clutter.js |   27 +++++++++++++++++++++++----
+ examples/clutter.js | 27 +++++++++++++++++++++++----
  1 file changed, 23 insertions(+), 4 deletions(-)
 
 commit 47c25f4c7fc36eefea41fda56578578a7d8085bd
@@ -23214,9 +24586,9 @@ Date:   Fri Nov 7 14:10:37 2008 +0000
     
     svn path=/trunk/; revision=160
 
- configure.ac         |    2 +-
- examples/Makefile.am |    2 +-
- tests/Makefile.am    |    2 +-
+ configure.ac         | 2 +-
+ examples/Makefile.am | 2 +-
+ tests/Makefile.am    | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 515c799889f387118b76ba1ae9843a86d598bfc6
@@ -23227,9 +24599,9 @@ Date:   Fri Nov 7 07:34:11 2008 +0000
     
     svn path=/trunk/; revision=159
 
- tests/Makefile.am |    2 ++
- tests/json.js     |   14 ++++++++++++++
- tests/printf.js   |   11 +++++++++++
+ tests/Makefile.am |  2 ++
+ tests/json.js     | 14 ++++++++++++++
+ tests/printf.js   | 11 +++++++++++
  3 files changed, 27 insertions(+)
 
 commit db4122d774a9515ca0e5ee2a2b4379dd9f7f1aeb
@@ -23241,7 +24613,7 @@ Date:   Fri Nov 7 07:32:49 2008 +0000
     
     svn path=/trunk/; revision=158
 
- Makefile.am |    3 +++
+ Makefile.am | 3 +++
  1 file changed, 3 insertions(+)
 
 commit d20c763ded370182f5b77799b1e84dd619e38f32
@@ -23253,7 +24625,7 @@ Date:   Fri Nov 7 07:26:35 2008 +0000
     
     svn path=/trunk/; revision=157
 
- examples/pango.js |   55 ++++++++++++++++++++++++++++++++++++++++++++++-------
+ examples/pango.js | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
  1 file changed, 48 insertions(+), 7 deletions(-)
 
 commit b29dbdd47a80f69f0ba79303165da98664370a20
@@ -23264,10 +24636,10 @@ Date:   Fri Nov 7 07:20:34 2008 +0000
     
     svn path=/trunk/; revision=156
 
- doc/runtime.html  |   48 +++++++++++++++++++++++++++++++++++++++++++++---
- tests/Makefile.am |    2 +-
- tests/gsuper.js   |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/subclass.js |   53 -----------------------------------------------------
+ doc/runtime.html  | 48 +++++++++++++++++++++++++++++++++++++++++++++---
+ tests/Makefile.am |  2 +-
+ tests/gsuper.js   | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/subclass.js | 53 -----------------------------------------------------
  4 files changed, 99 insertions(+), 57 deletions(-)
 
 commit faa427fc9e276a270b31899c6e077cbed4625b00
@@ -23278,9 +24650,9 @@ Date:   Fri Nov 7 06:38:17 2008 +0000
     
     svn path=/trunk/; revision=155
 
- doc/runtime.html     |    8 +++++++-
- libseed/seed-types.c |    2 +-
- tests/subclass.js    |    6 +++---
+ doc/runtime.html     | 8 +++++++-
+ libseed/seed-types.c | 2 +-
+ tests/subclass.js    | 6 +++---
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 commit 23ccad57a845eca2199728a726d051153f4ec985
@@ -23291,8 +24663,8 @@ Date:   Fri Nov 7 06:04:35 2008 +0000
     
     svn path=/trunk/; revision=154
 
- libseed/seed-gtype.c |   10 ++++++----
- tests/gtype.js       |    6 +++---
+ libseed/seed-gtype.c | 10 ++++++----
+ tests/gtype.js       |  6 +++---
  2 files changed, 9 insertions(+), 7 deletions(-)
 
 commit eaf6f3e2023cdf170fc1449a0d1e52923b021802
@@ -23303,8 +24675,8 @@ Date:   Fri Nov 7 05:06:01 2008 +0000
     
     svn path=/trunk/; revision=153
 
- libseed/seed-gtype.c |   13 ++++++++++++-
- tests/gtype.js       |    8 +++++++-
+ libseed/seed-gtype.c | 13 ++++++++++++-
+ tests/gtype.js       |  8 +++++++-
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 commit a68cd4933f0a3695b2c059d56fce071b0ad8e514
@@ -23316,7 +24688,7 @@ Date:   Fri Nov 7 04:51:23 2008 +0000
     
     svn path=/trunk/; revision=152
 
- tests/make-test.py |   30 +++++++++++++++++-------------
+ tests/make-test.py | 30 +++++++++++++++++-------------
  1 file changed, 17 insertions(+), 13 deletions(-)
 
 commit a64cab405092e6859e67fd517c40e086e7ad9129
@@ -23328,9 +24700,9 @@ Date:   Fri Nov 7 04:42:04 2008 +0000
     
     svn path=/trunk/; revision=151
 
- libseed/seed-gtype.c |    4 ++--
- tests/Makefile.am    |    1 +
- tests/gtype.js       |   28 ++++++++++++++++++++++++++++
+ libseed/seed-gtype.c |  4 ++--
+ tests/Makefile.am    |  1 +
+ tests/gtype.js       | 28 ++++++++++++++++++++++++++++
  3 files changed, 31 insertions(+), 2 deletions(-)
 
 commit 0c5197855527846b68454d6bf859888ee6cddc6b
@@ -23341,8 +24713,8 @@ Date:   Fri Nov 7 04:29:43 2008 +0000
     
     svn path=/trunk/; revision=150
 
- libseed/seed-closure.c |    2 +-
- libseed/seed-gtype.c   |  103 +++++++++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-closure.c |   2 +-
+ libseed/seed-gtype.c   | 103 ++++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 103 insertions(+), 2 deletions(-)
 
 commit a71f2337a2eaa75980294e123fc3d490c352a147
@@ -23355,13 +24727,13 @@ Date:   Fri Nov 7 03:52:59 2008 +0000
     
     svn path=/trunk/; revision=149
 
- libseed/Makefile.am     |    2 +
- libseed/Makefile.in     |    6 ++-
- libseed/seed-builtins.c |   72 ------------------------------
- libseed/seed-engine.c   |   77 ++++++++++++++++----------------
- libseed/seed-gtype.c    |  111 +++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-gtype.h    |   27 ++++++++++++
- libseed/seed-private.h  |    1 +
+ libseed/Makefile.am     |   2 +
+ libseed/Makefile.in     |   6 ++-
+ libseed/seed-builtins.c |  72 -------------------------------
+ libseed/seed-engine.c   |  77 +++++++++++++++++----------------
+ libseed/seed-gtype.c    | 111 ++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-gtype.h    |  27 ++++++++++++
+ libseed/seed-private.h  |   1 +
  7 files changed, 186 insertions(+), 110 deletions(-)
 
 commit 35b456abc0e62ed757dfefddea7c7c269dca99a8
@@ -23373,9 +24745,9 @@ Date:   Thu Nov 6 16:43:56 2008 +0000
     
     svn path=/trunk/; revision=148
 
- libseed/seed-builtins.c |   19 +++++++++++++++++++
- libseed/seed-engine.c   |   12 +++++++-----
- tests/subclass.js       |    4 ++--
+ libseed/seed-builtins.c | 19 +++++++++++++++++++
+ libseed/seed-engine.c   | 12 +++++++-----
+ tests/subclass.js       |  4 ++--
  3 files changed, 28 insertions(+), 7 deletions(-)
 
 commit 696ddeb2a062fe54c02133cd4f47c8b861977a39
@@ -23389,7 +24761,7 @@ Date:   Thu Nov 6 16:35:28 2008 +0000
     
     svn path=/trunk/; revision=147
 
- libseed/seed-builtins.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-builtins.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 52 insertions(+)
 
 commit be188614532324e205761136a46094c9b92140cb
@@ -23400,7 +24772,7 @@ Date:   Thu Nov 6 15:28:37 2008 +0000
     
     svn path=/trunk/; revision=146
 
- tests/subclass.js |   10 +++++++++-
+ tests/subclass.js | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 commit ffe55022802591a65416021ee455a1bc328a3dec
@@ -23412,8 +24784,8 @@ Date:   Thu Nov 6 15:10:29 2008 +0000
     
     svn path=/trunk/; revision=145
 
- tests/Makefile.am |    1 +
- tests/subclass.js |   45 +++++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am |  1 +
+ tests/subclass.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 46 insertions(+)
 
 commit c635ec07f581d893fc36a6e7d525df1eb4c46729
@@ -23426,9 +24798,9 @@ Date:   Thu Nov 6 15:00:39 2008 +0000
     
     svn path=/trunk/; revision=144
 
- libseed/seed-engine.c |    3 ++-
- libseed/seed-types.c  |   46 +++++++++++++++++++++++++++++++++++++++++++---
- libseed/seed-types.h  |    4 ++++
+ libseed/seed-engine.c |  3 ++-
+ libseed/seed-types.c  | 46 +++++++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-types.h  |  4 ++++
  3 files changed, 49 insertions(+), 4 deletions(-)
 
 commit 6e52a26bfa7bcc1695cfe379bb67bc3bb45486b4
@@ -23439,11 +24811,11 @@ Date:   Thu Nov 6 13:15:08 2008 +0000
     
     svn path=/trunk/; revision=143
 
- doc/runtime.html                      |    4 ++--
- doc/tutorial-standalone/1.js          |   10 +++++-----
- doc/tutorial-standalone/2.js          |   10 +++++-----
- doc/tutorial-standalone/3.js          |   12 ++++++------
- doc/tutorial-standalone/tutorial.html |   22 +++++++++++-----------
+ doc/runtime.html                      |  4 ++--
+ doc/tutorial-standalone/1.js          | 10 +++++-----
+ doc/tutorial-standalone/2.js          | 10 +++++-----
+ doc/tutorial-standalone/3.js          | 12 ++++++------
+ doc/tutorial-standalone/tutorial.html | 22 +++++++++++-----------
  5 files changed, 29 insertions(+), 29 deletions(-)
 
 commit 8226fc15d3095d0dacc0c9ecc4138cb31d2637b9
@@ -23454,20 +24826,20 @@ Date:   Thu Nov 6 13:12:58 2008 +0000
     
     svn path=/trunk/; revision=142
 
- examples/actions.js             |    6 +++---
- examples/calculator.js          |    4 ++--
- examples/clutter.js             |    4 ++--
- examples/ide/ide.js             |    2 +-
- examples/ide/tabview.js         |    6 +++---
- examples/ide/toolbar.js         |   12 ++++++------
- examples/lightsoff/lightsoff.js |    6 +++---
- examples/mini-browser.js        |   18 +++++++++---------
- examples/n-oscillator.js        |   10 +++++-----
- examples/notify-test.js         |    2 +-
- examples/pango.js               |   14 +++++++-------
- examples/poppler.js             |   12 ++++++------
- examples/shader/ShaderView.js   |    2 +-
- examples/vte-test.js            |    4 ++--
+ examples/actions.js             |  6 +++---
+ examples/calculator.js          |  4 ++--
+ examples/clutter.js             |  4 ++--
+ examples/ide/ide.js             |  2 +-
+ examples/ide/tabview.js         |  6 +++---
+ examples/ide/toolbar.js         | 12 ++++++------
+ examples/lightsoff/lightsoff.js |  6 +++---
+ examples/mini-browser.js        | 18 +++++++++---------
+ examples/n-oscillator.js        | 10 +++++-----
+ examples/notify-test.js         |  2 +-
+ examples/pango.js               | 14 +++++++-------
+ examples/poppler.js             | 12 ++++++------
+ examples/shader/ShaderView.js   |  2 +-
+ examples/vte-test.js            |  4 ++--
  14 files changed, 51 insertions(+), 51 deletions(-)
 
 commit 946c2ae133b72bbe73d2251db8b616c21332f078
@@ -23478,7 +24850,7 @@ Date:   Thu Nov 6 13:09:51 2008 +0000
     
     svn path=/trunk/; revision=141
 
- tests/signal.js |    2 +-
+ tests/signal.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4781aa7775353f28390b852163f8a6a1c1de3026
@@ -23490,7 +24862,7 @@ Date:   Thu Nov 6 13:09:36 2008 +0000
     
     svn path=/trunk/; revision=140
 
- libseed/seed-signals.c |   35 ++++++++++++++++++++++-------------
+ libseed/seed-signals.c | 35 ++++++++++++++++++++++-------------
  1 file changed, 22 insertions(+), 13 deletions(-)
 
 commit 45ee098238d21e84d6f1895eb73c61c7067eb44a
@@ -23502,7 +24874,7 @@ Date:   Thu Nov 6 07:17:03 2008 +0000
     
     svn path=/trunk/; revision=139
 
- examples/pango.js |  143 ++++++++++++++++++++++++++++++++++++++++++++---------
+ examples/pango.js | 143 +++++++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 121 insertions(+), 22 deletions(-)
 
 commit dba06815ac1b07ea53912f366634d3fbe73b50b9
@@ -23513,7 +24885,7 @@ Date:   Thu Nov 6 06:43:23 2008 +0000
     
     svn path=/trunk/; revision=138
 
- libseed/seed-closure.c |    2 +-
+ libseed/seed-closure.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 346053203652e27e0005a4eac6f3323f443292e5
@@ -23524,8 +24896,8 @@ Date:   Thu Nov 6 06:18:39 2008 +0000
     
     svn path=/trunk/; revision=137
 
- examples/Makefile.am |    2 ++
- examples/actions.js  |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/Makefile.am |  2 ++
+ examples/actions.js  | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 62 insertions(+)
 
 commit 340b12378d6b72c1ba7292b338f219be5ca84e0d
@@ -23536,15 +24908,15 @@ Date:   Thu Nov 6 04:40:16 2008 +0000
     
     svn path=/trunk/; revision=136
 
- README                              |    1 +
- doc/Makefile.am                     |    2 ++
- doc/tutorial-standalone/Makefile.am |   14 ++++++++++++++
- examples/Makefile.am                |   20 ++++++++++++++++++++
- examples/ide/Makefile.am            |    7 +++++++
- examples/lightsoff/Makefile.am      |    5 +++++
- examples/lightsoff/lightsoff.js     |    4 ++--
- examples/shader/Makefile.am         |    7 +++++++
- extensions/Makefile.am              |    2 +-
+ README                              |  1 +
+ doc/Makefile.am                     |  2 ++
+ doc/tutorial-standalone/Makefile.am | 14 ++++++++++++++
+ examples/Makefile.am                | 20 ++++++++++++++++++++
+ examples/ide/Makefile.am            |  7 +++++++
+ examples/lightsoff/Makefile.am      |  5 +++++
+ examples/lightsoff/lightsoff.js     |  4 ++--
+ examples/shader/Makefile.am         |  7 +++++++
+ extensions/Makefile.am              |  2 +-
  9 files changed, 59 insertions(+), 3 deletions(-)
 
 commit fe1fd9855629b07a86c92bc1bff436ac27166d6f
@@ -23556,7 +24928,7 @@ Date:   Thu Nov 6 01:05:52 2008 +0000
     
     svn path=/trunk/; revision=135
 
- examples/ide/toolbar.js |    6 +++---
+ examples/ide/toolbar.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit a9598d859e6f66603aa11bd0da3296c74a59beeb
@@ -23567,8 +24939,8 @@ Date:   Thu Nov 6 00:52:32 2008 +0000
     
     svn path=/trunk/; revision=134
 
- libseed/seed-builtins.c |    4 ++--
- libseed/seed-types.c    |    6 +++---
+ libseed/seed-builtins.c | 4 ++--
+ libseed/seed-types.c    | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 603ad8f21dc5bc85a6481d1f0ac85dc242d31bad
@@ -23580,12 +24952,13 @@ Date:   Wed Nov 5 20:28:47 2008 +0000
     
     svn path=/trunk/; revision=133
 
- libseed/seed-closure.c |    2 +-
- libseed/seed-engine.c  |   28 ++++++++++++++--------------
- libseed/seed-signals.c |    2 +-
- libseed/seed-structs.c |    2 +-
- libseed/seed-types.c   |    6 +++---
- 5 files changed, 20 insertions(+), 20 deletions(-)
+ libseed/seed-closure.c |  2 +-
+ libseed/seed-engine.c  | 28 ++++++++++++++--------------
+ libseed/seed-signals.c |  2 +-
+ libseed/seed-structs.c |  2 +-
+ libseed/seed-types.c   |  6 +++---
+ tests/make-test.py     |  0
+ 6 files changed, 20 insertions(+), 20 deletions(-)
 
 commit 495699d1d6f7ad92d189926ffaa5735e44c95797
 Author: Tim Horton <hortont@src.gnome.org>
@@ -23597,12 +24970,12 @@ Date:   Wed Nov 5 19:59:17 2008 +0000
     
     svn path=/trunk/; revision=132
 
- doc/runtime.html        |  142 ++++++++++++++++++++++++++++++++++++++++++++---
- examples/ide/ide.js     |    1 +
- examples/ide/tabview.js |    4 +-
- examples/ide/toolbar.js |   66 +++++++++++++++++-----
- tests/make-test.py      |   50 +++++++++++++++++
- tests/run-tests.py      |    2 +-
+ doc/runtime.html        | 142 +++++++++++++++++++++++++++++++++++++++++++++---
+ examples/ide/ide.js     |   1 +
+ examples/ide/tabview.js |   4 +-
+ examples/ide/toolbar.js |  66 +++++++++++++++++-----
+ tests/make-test.py      |  50 +++++++++++++++++
+ tests/run-tests.py      |   2 +-
  6 files changed, 240 insertions(+), 25 deletions(-)
 
 commit 96d227a87b69b1a4369ea06d826c25bf98f9a7d8
@@ -23613,9 +24986,9 @@ Date:   Wed Nov 5 14:40:57 2008 +0000
     
     svn path=/trunk/; revision=131
 
- examples/Makefile.am     |    1 +
- examples/json-packing.js |   28 ++++++++++++++++++++++++++++
- examples/vte-test.js     |   10 +++++++++-
+ examples/Makefile.am     |  1 +
+ examples/json-packing.js | 28 ++++++++++++++++++++++++++++
+ examples/vte-test.js     | 10 +++++++++-
  3 files changed, 38 insertions(+), 1 deletion(-)
 
 commit 5768ea68b6ae840a456f437dc8a77d3b5e78b074
@@ -23626,8 +24999,8 @@ Date:   Wed Nov 5 14:39:53 2008 +0000
     
     svn path=/trunk/; revision=130
 
- extensions/Gtk.js      |   26 ++++++++++++++++++++++++++
- extensions/Makefile.am |    2 +-
+ extensions/Gtk.js      | 26 ++++++++++++++++++++++++++
+ extensions/Makefile.am |  2 +-
  2 files changed, 27 insertions(+), 1 deletion(-)
 
 commit e42cb1d1ef20afb86f8db93b94d8d372447c5cfc
@@ -23639,7 +25012,7 @@ Date:   Wed Nov 5 12:34:53 2008 +0000
     
     svn path=/trunk/; revision=129
 
- libseed/seed-closure.c |   10 ++++++++++
+ libseed/seed-closure.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 3240f3960f8377bcd5e4d9c8e8a73970f326c47c
@@ -23651,15 +25024,15 @@ Date:   Wed Nov 5 12:16:43 2008 +0000
     
     svn path=/trunk/; revision=128
 
- libseed/seed-builtins.c |   94 ++++++++++++++++++++++++++++++-----------------
- libseed/seed-engine.c   |   16 ++++----
- libseed/seed-engine.h   |    4 +-
- libseed/seed-signals.c  |    2 +-
- libseed/seed-structs.c  |    3 +-
- libseed/seed-types.c    |   27 +++++++++-----
- libseed/seed-types.h    |    4 +-
- libseed/seed.h          |    4 +-
- src/main.c              |    5 ++-
+ libseed/seed-builtins.c | 94 +++++++++++++++++++++++++++++++------------------
+ libseed/seed-engine.c   | 16 ++++-----
+ libseed/seed-engine.h   |  4 +--
+ libseed/seed-signals.c  |  2 +-
+ libseed/seed-structs.c  |  3 +-
+ libseed/seed-types.c    | 27 ++++++++------
+ libseed/seed-types.h    |  4 +--
+ libseed/seed.h          |  4 +--
+ src/main.c              |  5 +--
  9 files changed, 97 insertions(+), 62 deletions(-)
 
 commit 3dbe21c686de4a6c79a475b5dca01f2353f35b83
@@ -23671,8 +25044,8 @@ Date:   Wed Nov 5 12:11:09 2008 +0000
     
     svn path=/trunk/; revision=127
 
- examples/Makefile.am   |    1 +
- examples/accelgroup.js |   19 +++++++++++++++++++
+ examples/Makefile.am   |  1 +
+ examples/accelgroup.js | 19 +++++++++++++++++++
  2 files changed, 20 insertions(+)
 
 commit 7af5a465684df0763abaeb315f112007be9d32f6
@@ -23685,11 +25058,11 @@ Date:   Wed Nov 5 12:07:29 2008 +0000
     
     svn path=/trunk/; revision=126
 
- libseed/seed-builtins.c |   24 ++++++++----------------
- libseed/seed-closure.c  |   33 +++++++++++++++++++++++++++------
- libseed/seed-closure.h  |   16 +++++++++++++---
- libseed/seed-signals.h  |    7 -------
- libseed/seed-types.c    |   25 ++++++++++++++++++++-----
+ libseed/seed-builtins.c | 24 ++++++++----------------
+ libseed/seed-closure.c  | 33 +++++++++++++++++++++++++++------
+ libseed/seed-closure.h  | 16 +++++++++++++---
+ libseed/seed-signals.h  |  7 -------
+ libseed/seed-types.c    | 25 ++++++++++++++++++++-----
  5 files changed, 68 insertions(+), 37 deletions(-)
 
 commit b448f95c091692395b3ea57c337498e3a8e785be
@@ -23701,8 +25074,8 @@ Date:   Wed Nov 5 11:43:05 2008 +0000
     
     svn path=/trunk/; revision=125
 
- examples/clutter.js    |   18 ++++++++-
- libseed/seed-closure.c |   95 ++++++++++++++++++++++++++++++++++++++++++++++--
+ examples/clutter.js    | 18 +++++++++-
+ libseed/seed-closure.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++---
  2 files changed, 108 insertions(+), 5 deletions(-)
 
 commit 1e445d4fd396ddb35b640441ccf247a00082af13
@@ -23714,8 +25087,8 @@ Date:   Wed Nov 5 11:10:57 2008 +0000
     
     svn path=/trunk/; revision=124
 
- examples/Makefile.am      |    1 +
- examples/pango-fontset.js |   19 +++++++++++++++++++
+ examples/Makefile.am      |  1 +
+ examples/pango-fontset.js | 19 +++++++++++++++++++
  2 files changed, 20 insertions(+)
 
 commit 317c4a3737e8a0d0f9c4f590b408a3e390e7817e
@@ -23729,8 +25102,8 @@ Date:   Wed Nov 5 10:56:45 2008 +0000
     
     svn path=/trunk/; revision=123
 
- libseed/seed-types.c    |    5 ++++-
- tests/native-closure.js |    3 +--
+ libseed/seed-types.c    | 5 ++++-
+ tests/native-closure.js | 3 +--
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit dcb8f84fb0730d6ec7e3adbf4d29deac6c23718c
@@ -23742,15 +25115,15 @@ Date:   Wed Nov 5 10:54:08 2008 +0000
     
     svn path=/trunk/; revision=122
 
- libseed/Makefile.am     |    2 +
- libseed/Makefile.in     |    7 +-
- libseed/seed-builtins.c |  257 +---------------------------------------
- libseed/seed-builtins.h |   10 --
- libseed/seed-closure.c  |  297 +++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-closure.h  |   39 +++++++
- libseed/seed-engine.c   |    1 +
- libseed/seed-private.h  |    1 +
- libseed/seed-types.c    |    5 +
+ libseed/Makefile.am     |   2 +
+ libseed/Makefile.in     |   7 +-
+ libseed/seed-builtins.c | 257 +----------------------------------------
+ libseed/seed-builtins.h |  10 --
+ libseed/seed-closure.c  | 297 ++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-closure.h  |  39 +++++++
+ libseed/seed-engine.c   |   1 +
+ libseed/seed-private.h  |   1 +
+ libseed/seed-types.c    |   5 +
  9 files changed, 352 insertions(+), 267 deletions(-)
 
 commit 4406daf47c42b7c3fa2415a41c3c30ef67dad024
@@ -23762,9 +25135,9 @@ Date:   Wed Nov 5 10:40:09 2008 +0000
     
     svn path=/trunk/; revision=121
 
- libseed/seed-builtins.c |   22 ++++++++++++++--------
- libseed/seed-builtins.h |   11 +++++++++++
- libseed/seed-types.c    |    8 ++++++--
+ libseed/seed-builtins.c | 22 ++++++++++++++--------
+ libseed/seed-builtins.h | 11 +++++++++++
+ libseed/seed-types.c    |  8 ++++++--
  3 files changed, 31 insertions(+), 10 deletions(-)
 
 commit 273a19bd378761d13cc9791ea90549d435ee4994
@@ -23775,8 +25148,8 @@ Date:   Wed Nov 5 10:24:54 2008 +0000
     
     svn path=/trunk/; revision=120
 
- libseed/seed-builtins.c |   26 +++++++++++++++++++++++++-
- libseed/seed-structs.h  |    1 +
+ libseed/seed-builtins.c | 26 +++++++++++++++++++++++++-
+ libseed/seed-structs.h  |  1 +
  2 files changed, 26 insertions(+), 1 deletion(-)
 
 commit 1a0e300a25654fa9f88f55077f8b23047094ae14
@@ -23787,8 +25160,8 @@ Date:   Wed Nov 5 10:19:46 2008 +0000
     
     svn path=/trunk/; revision=119
 
- tests/Makefile.am        |    1 +
- tests/type-conversion.js |   28 ++++++++++++++++++++++++++++
+ tests/Makefile.am        |  1 +
+ tests/type-conversion.js | 28 ++++++++++++++++++++++++++++
  2 files changed, 29 insertions(+)
 
 commit ba174862ad290210bf25b9433bf0f60a970833cc
@@ -23799,8 +25172,8 @@ Date:   Wed Nov 5 10:05:34 2008 +0000
     
     svn path=/trunk/; revision=118
 
- tests/Makefile.am       |    3 ++-
- tests/native-closure.js |   19 +++++++++++++++++++
+ tests/Makefile.am       |  3 ++-
+ tests/native-closure.js | 19 +++++++++++++++++++
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 commit 810df46ca7a89b6df149db8f2dd72fea873a1348
@@ -23816,9 +25189,9 @@ Date:   Wed Nov 5 10:02:24 2008 +0000
     
     svn path=/trunk/; revision=117
 
- libseed/seed-builtins.c |  267 +++++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-private.h  |    2 +
- libseed/seed-types.c    |   37 ++++---
+ libseed/seed-builtins.c | 267 ++++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-private.h  |   2 +
+ libseed/seed-types.c    |  37 ++++---
  3 files changed, 292 insertions(+), 14 deletions(-)
 
 commit ff21955a2e8734fc7c9be79824ce03b284611d95
@@ -23829,7 +25202,7 @@ Date:   Wed Nov 5 06:31:52 2008 +0000
     
     svn path=/trunk/; revision=116
 
- libseed/seed-types.c |    1 -
+ libseed/seed-types.c | 1 -
  1 file changed, 1 deletion(-)
 
 commit 7a3af09e9f0102b58c8bed3365abc31c68b99786
@@ -23840,7 +25213,7 @@ Date:   Wed Nov 5 03:58:35 2008 +0000
     
     svn path=/trunk/; revision=115
 
- libseed/seed-engine.c |    3 ++-
+ libseed/seed-engine.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 8cf0c7943fd2c9998872076dac2aee5126c5d338
@@ -23852,11 +25225,11 @@ Date:   Wed Nov 5 03:53:04 2008 +0000
     
     svn path=/trunk/; revision=114
 
- libseed/seed-builtins.c |   37 +++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.c   |    4 +++-
- libseed/seed-signals.c  |    9 +--------
- libseed/seed-signals.h  |   14 ++++++++++++++
- libseed/seed-types.c    |   11 ++++++++---
+ libseed/seed-builtins.c | 37 +++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c   |  4 +++-
+ libseed/seed-signals.c  |  9 +--------
+ libseed/seed-signals.h  | 14 ++++++++++++++
+ libseed/seed-types.c    | 11 ++++++++---
  5 files changed, 63 insertions(+), 12 deletions(-)
 
 commit 7b72f6b9dfb0394bae499558e6225f5b203f4d9b
@@ -23867,7 +25240,7 @@ Date:   Wed Nov 5 01:47:15 2008 +0000
     
     svn path=/trunk/; revision=113
 
- libseed/seed-engine.c |   16 ++++++++++------
+ libseed/seed-engine.c | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 commit e9ce323843c14e1c1e91c073eb2c2b29ffd328f9
@@ -23878,8 +25251,8 @@ Date:   Wed Nov 5 01:40:01 2008 +0000
     
     svn path=/trunk/; revision=112
 
- libseed/seed-engine.c |   29 +++++++++----------
- libseed/seed-types.c  |   77 ++++++++++++++++++++++++++++++++-----------------
+ libseed/seed-engine.c | 29 ++++++++++---------
+ libseed/seed-types.c  | 77 +++++++++++++++++++++++++++++++++------------------
  2 files changed, 64 insertions(+), 42 deletions(-)
 
 commit 9a3db523dadd9bd5a90f92b21472aff576c6b97d
@@ -23892,13 +25265,13 @@ Date:   Tue Nov 4 23:10:13 2008 +0000
     
     svn path=/trunk/; revision=111
 
- examples/shader/default.glsl |    4 +-
- libseed/seed-builtins.c      |   22 ++---
- libseed/seed-engine.c        |   45 +++++-----
- libseed/seed-signals.c       |    2 +-
- libseed/seed-types.c         |  202 +++++++++++++++++++++---------------------
- libseed/seed-types.h         |   62 ++++++-------
- libseed/seed.h               |   54 ++++++-----
+ examples/shader/default.glsl |   4 +-
+ libseed/seed-builtins.c      |  22 ++---
+ libseed/seed-engine.c        |  45 +++++-----
+ libseed/seed-signals.c       |   2 +-
+ libseed/seed-types.c         | 202 ++++++++++++++++++++++---------------------
+ libseed/seed-types.h         |  62 ++++++-------
+ libseed/seed.h               |  54 ++++++------
  7 files changed, 198 insertions(+), 193 deletions(-)
 
 commit 758e119ab0fd06e7266bb9d55c34b2bf4db74663
@@ -23909,15 +25282,15 @@ Date:   Tue Nov 4 12:22:53 2008 +0000
     
     svn path=/trunk/; revision=110
 
- examples/calculator.js   |   12 ++++++------
- examples/clutter.js      |    6 ++++--
- examples/gconf.js        |    1 +
- examples/introspect.js   |    3 ++-
- examples/ls.js           |    7 +++++--
- examples/mini-browser.js |    6 +++++-
- examples/n-oscillator.js |    5 +++++
- examples/poppler.js      |    8 +++++---
- examples/quine.js        |    2 +-
+ examples/calculator.js   | 12 ++++++------
+ examples/clutter.js      |  6 ++++--
+ examples/gconf.js        |  1 +
+ examples/introspect.js   |  3 ++-
+ examples/ls.js           |  7 +++++--
+ examples/mini-browser.js |  6 +++++-
+ examples/n-oscillator.js |  5 +++++
+ examples/poppler.js      |  8 +++++---
+ examples/quine.js        |  2 +-
  9 files changed, 34 insertions(+), 16 deletions(-)
 
 commit 4641cab933cacffa0bafec8475048dd8a7fce3fa
@@ -23928,9 +25301,9 @@ Date:   Tue Nov 4 11:57:23 2008 +0000
     
     svn path=/trunk/; revision=109
 
- examples/clutter.js          |    6 +++---
- examples/notify-test.js      |    3 ++-
- examples/shader/default.glsl |   33 +++++++++++++++++++++++----------
+ examples/clutter.js          |  6 +++---
+ examples/notify-test.js      |  3 ++-
+ examples/shader/default.glsl | 33 +++++++++++++++++++++++----------
  3 files changed, 28 insertions(+), 14 deletions(-)
 
 commit 3e98c6ba21a220d31db36447abe153e297e38a0a
@@ -23941,8 +25314,8 @@ Date:   Tue Nov 4 10:20:53 2008 +0000
     
     svn path=/trunk/; revision=108
 
- examples/HACKING     |   18 ++++++++++++++++++
- examples/Makefile.am |    3 ++-
+ examples/HACKING     | 18 ++++++++++++++++++
+ examples/Makefile.am |  3 ++-
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit 36d06155b79bf949dc6f73499f4fe9410dfa9368
@@ -23953,8 +25326,8 @@ Date:   Tue Nov 4 10:09:58 2008 +0000
     
     svn path=/trunk/; revision=107
 
- examples/Makefile.am |    1 +
- examples/poppler.js  |  130 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/Makefile.am |   1 +
+ examples/poppler.js  | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 131 insertions(+)
 
 commit 765433c7c6b1bceed858e17b18ba32cde955bc29
@@ -23965,7 +25338,7 @@ Date:   Tue Nov 4 09:11:14 2008 +0000
     
     svn path=/trunk/; revision=106
 
- libseed/seed-engine.c |   15 +++++++++++++++
+ libseed/seed-engine.c | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit ded2614c899c0b5a7126cc45d0a55ec1b2899a3b
@@ -23977,9 +25350,9 @@ Date:   Tue Nov 4 08:52:26 2008 +0000
     
     svn path=/trunk/; revision=105
 
- libseed/seed-engine.c |   31 ++++++++++++++++++++++++++++++-
- libseed/seed-engine.h |    1 +
- libseed/seed-types.c  |    1 +
+ libseed/seed-engine.c | 31 ++++++++++++++++++++++++++++++-
+ libseed/seed-engine.h |  1 +
+ libseed/seed-types.c  |  1 +
  3 files changed, 32 insertions(+), 1 deletion(-)
 
 commit a0f6e0a0221a34fcbca65ecda73999e6093abd94
@@ -23990,7 +25363,7 @@ Date:   Tue Nov 4 07:41:52 2008 +0000
     
     svn path=/trunk/; revision=104
 
- libseed/seed-engine.c |   24 +++++++++++++++++++++---
+ libseed/seed-engine.c | 24 +++++++++++++++++++++---
  1 file changed, 21 insertions(+), 3 deletions(-)
 
 commit e1a1cb2e59f47bc5007dde35c48fcc875396bb3b
@@ -24001,7 +25374,7 @@ Date:   Tue Nov 4 07:24:43 2008 +0000
     
     svn path=/trunk/; revision=103
 
- libseed/seed-engine.c |    9 +++++++++
+ libseed/seed-engine.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 7136b4e6efb2f46d87fd099dae2f592d58e60922
@@ -24037,8 +25410,8 @@ Date:   Tue Nov 4 05:38:35 2008 +0000
     
     svn path=/trunk/; revision=101
 
- examples/clutter.js  |   48 +++++++++++++++++++++++++++++++++++++++---------
- libseed/seed-types.c |   22 ++++++++++++++++++++++
+ examples/clutter.js  | 48 +++++++++++++++++++++++++++++++++++++++---------
+ libseed/seed-types.c | 22 ++++++++++++++++++++++
  2 files changed, 61 insertions(+), 9 deletions(-)
 
 commit f1547f4527399545f0313160562dabd7988799f3
@@ -24049,9 +25422,9 @@ Date:   Tue Nov 4 04:52:31 2008 +0000
     
     svn path=/trunk/; revision=100
 
- examples/pango.js      |    5 ++---
- libseed/seed-structs.c |   35 ++++++++++++++++++++++++++++++-----
- libseed/seed-types.c   |    6 +++++-
+ examples/pango.js      |  5 ++---
+ libseed/seed-structs.c | 35 ++++++++++++++++++++++++++++++-----
+ libseed/seed-types.c   |  6 +++++-
  3 files changed, 37 insertions(+), 9 deletions(-)
 
 commit 34b498edb23135180f492e74d57464d0ca82efa4
@@ -24062,12 +25435,12 @@ Date:   Tue Nov 4 04:29:08 2008 +0000
     
     svn path=/trunk/; revision=99
 
- examples/Makefile.am |    1 -
- examples/json2.js    |  481 -------------------------------------------------
- examples/repl.js     |    1 -
- extensions/Gio.js    |   41 ++---
- extensions/Seed.js   |  490 +++++++++++++++++++++++++++++++++++++++++++++++++-
- src/main.c           |    1 +
+ examples/Makefile.am |   1 -
+ examples/json2.js    | 481 --------------------------------------------------
+ examples/repl.js     |   1 -
+ extensions/Gio.js    |  41 ++---
+ extensions/Seed.js   | 490 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/main.c           |   1 +
  6 files changed, 504 insertions(+), 511 deletions(-)
 
 commit 91bfb9eb82c3d1d265b0dae0ab3de1c95792bb72
@@ -24078,7 +25451,7 @@ Date:   Tue Nov 4 04:12:10 2008 +0000
     
     svn path=/trunk/; revision=98
 
- extensions/Gio.js |   14 ++++++++------
+ extensions/Gio.js | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit fbc56cdfcf4c906a2f1948367f3f65e974d901f2
@@ -24090,8 +25463,8 @@ Date:   Tue Nov 4 03:05:15 2008 +0000
     
     svn path=/trunk/; revision=97
 
- examples/Makefile.am |    1 +
- examples/soup.js     |   11 +++++++++++
+ examples/Makefile.am |  1 +
+ examples/soup.js     | 11 +++++++++++
  2 files changed, 12 insertions(+)
 
 commit d0f1183f119493513039ea4c0daffa66704f985c
@@ -24102,9 +25475,9 @@ Date:   Tue Nov 4 02:49:07 2008 +0000
     
     svn path=/trunk/; revision=96
 
- examples/Makefile.am |    1 +
- examples/gconf.js    |    8 ++++++++
- examples/ide/ide.js  |    6 +++++-
+ examples/Makefile.am | 1 +
+ examples/gconf.js    | 8 ++++++++
+ examples/ide/ide.js  | 6 +++++-
  3 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 9b5c21cf12b14f58179f7b944a0ecd88ca5cf1b3
@@ -24116,9 +25489,9 @@ Date:   Tue Nov 4 02:16:16 2008 +0000
     
     svn path=/trunk/; revision=95
 
- examples/ide/ide.js             |    2 ++
- examples/lightsoff/lightsoff.js |   43 ++++++++++++++++++++++++++++++++++++++-
- libseed/seed-builtins.c         |   41 +++++++++++++++++++++++++++++++++++++
+ examples/ide/ide.js             |  2 ++
+ examples/lightsoff/lightsoff.js | 43 ++++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-builtins.c         | 41 +++++++++++++++++++++++++++++++++++++++
  3 files changed, 85 insertions(+), 1 deletion(-)
 
 commit 85f51ea29bad3b8cd56ecee3f92b6663f7162113
@@ -24129,10 +25502,10 @@ Date:   Tue Nov 4 02:12:31 2008 +0000
     
     svn path=/trunk/; revision=94
 
- Makefile.am                         |    2 +-
- configure.ac                        |    7 +++++++
- doc/tutorial-standalone/Makefile.am |    2 +-
- extensions/Makefile.am              |    2 +-
+ Makefile.am                         | 2 +-
+ configure.ac                        | 7 +++++++
+ doc/tutorial-standalone/Makefile.am | 2 +-
+ extensions/Makefile.am              | 2 +-
  4 files changed, 10 insertions(+), 3 deletions(-)
 
 commit d75f9232a7c9545e71340c2ead97917eddcdc1b7
@@ -24144,17 +25517,19 @@ Date:   Tue Nov 4 02:03:28 2008 +0000
     
     svn path=/trunk/; revision=93
 
- Makefile.am                         |    6 +-
- doc/Makefile.am                     |    7 +++
- doc/runtime.html                    |  115 +++++++++++++++++++++++++++++++++++
- doc/tutorial-standalone/Makefile.am |   15 +++++
- examples/Makefile.am                |   20 ++++++
- examples/ide/Makefile.am            |    8 +++
- examples/lightsoff/Makefile.am      |    7 +++
- examples/pango.js                   |   57 +++++++++++++++++
- examples/shader/Makefile.am         |    8 +++
- tests/Makefile.am                   |   21 +++++++
- 10 files changed, 263 insertions(+), 1 deletion(-)
+ Makefile.am                         |   6 +-
+ doc/Makefile.am                     |   7 +++
+ doc/runtime.html                    | 115 ++++++++++++++++++++++++++++++++++++
+ doc/tutorial-standalone/Makefile.am |  15 +++++
+ examples/Makefile.am                |  20 +++++++
+ examples/ide/Makefile.am            |   8 +++
+ examples/json2.js                   |   0
+ examples/lightsoff/Makefile.am      |   7 +++
+ examples/pango.js                   |  57 ++++++++++++++++++
+ examples/repl.js                    |   0
+ examples/shader/Makefile.am         |   8 +++
+ tests/Makefile.am                   |  21 +++++++
+ 12 files changed, 263 insertions(+), 1 deletion(-)
 
 commit 48c5299f522121773233f96826b301440d3f5993
 Author: Robert Carr <racarr@src.gnome.org>
@@ -24164,15 +25539,15 @@ Date:   Tue Nov 4 01:58:45 2008 +0000
     
     svn path=/trunk/; revision=92
 
- Makefile.am            |    3 +-
- Makefile.am.bak        |   33 -
- Makefile.in            |  762 ---
- configure              |17388 ------------------------------------------------
- configure.ac           |    1 +
- configure.ac.bak       |   42 -
- extensions/Makefile.am |    4 +
- extensions/Seed.js     |  132 +
- libseed/seed-engine.c  |    7 +
+ Makefile.am            |     3 +-
+ Makefile.am.bak        |    33 -
+ Makefile.in            |   762 ---
+ configure              | 17388 -----------------------------------------------
+ configure.ac           |     1 +
+ configure.ac.bak       |    42 -
+ extensions/Makefile.am |     4 +
+ extensions/Seed.js     |   132 +
+ libseed/seed-engine.c  |     7 +
  9 files changed, 146 insertions(+), 18226 deletions(-)
 
 commit 4ad306f7a60fe0038d5992bd300ce0c809cc42e6
@@ -24183,7 +25558,7 @@ Date:   Mon Nov 3 12:22:19 2008 +0000
     
     svn path=/trunk/; revision=91
 
- examples/introspect.js |    7 +++++++
+ examples/introspect.js | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 1246197cfd0aa2b3531b499bf999cda54c2eae5c
@@ -24194,8 +25569,8 @@ Date:   Mon Nov 3 12:13:24 2008 +0000
     
     svn path=/trunk/; revision=90
 
- libseed/seed-builtins.c |   15 +++++++++++++++
- libseed/seed-engine.c   |   14 ++++++--------
+ libseed/seed-builtins.c | 15 +++++++++++++++
+ libseed/seed-engine.c   | 14 ++++++--------
  2 files changed, 21 insertions(+), 8 deletions(-)
 
 commit 23c44ac3c822446c3e7ca0083fd2efcf07f8d42d
@@ -24206,7 +25581,7 @@ Date:   Mon Nov 3 11:52:31 2008 +0000
     
     svn path=/trunk/; revision=89
 
- examples/ide/ide.js |    8 ++++----
+ examples/ide/ide.js | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit cdd7bbdcab4aba376d1bbb493da6ad46e7fb3485
@@ -24217,8 +25592,8 @@ Date:   Mon Nov 3 11:21:54 2008 +0000
     
     svn path=/trunk/; revision=88
 
- examples/json2.js |  481 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- examples/repl.js  |    1 +
+ examples/json2.js | 481 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/repl.js  |   1 +
  2 files changed, 482 insertions(+)
 
 commit e28100fc1879610e84a6fd1607d546e07152b4f9
@@ -24229,13 +25604,13 @@ Date:   Mon Nov 3 10:45:34 2008 +0000
     
     svn path=/trunk/; revision=87
 
- examples/ide/exception.svg |   11 ++++---
- examples/ide/ide.js        |   30 +++++++++++-------
- examples/ide/tabview.js    |   18 ++++-------
- libseed/seed-builtins.c    |   74 ++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-builtins.h    |    8 +++++
- libseed/seed-types.c       |    2 +-
- libseed/seed-types.h       |    2 +-
+ examples/ide/exception.svg | 11 +++----
+ examples/ide/ide.js        | 30 ++++++++++++-------
+ examples/ide/tabview.js    | 18 ++++-------
+ libseed/seed-builtins.c    | 74 ++++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-builtins.h    |  8 +++++
+ libseed/seed-types.c       |  2 +-
+ libseed/seed-types.h       |  2 +-
  7 files changed, 115 insertions(+), 30 deletions(-)
 
 commit 85a4f69f138f3523a0112e996c26afedbed8f19f
@@ -24246,7 +25621,7 @@ Date:   Mon Nov 3 10:38:31 2008 +0000
     
     svn path=/trunk/; revision=86
 
- tests/property-glib-exception.js |   11 +++++++++++
+ tests/property-glib-exception.js | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 4d54aea9f1b9926eccb34110ab5a252d06421893
@@ -24257,8 +25632,8 @@ Date:   Mon Nov 3 10:32:23 2008 +0000
     
     svn path=/trunk/; revision=85
 
- libseed/seed-engine.c |   21 ++++++++++++++++++++-
- libseed/seed-engine.h |    2 +-
+ libseed/seed-engine.c | 21 ++++++++++++++++++++-
+ libseed/seed-engine.h |  2 +-
  2 files changed, 21 insertions(+), 2 deletions(-)
 
 commit 937c6db6cd1f5cefcd0aabfde5d3732ad59a165c
@@ -24269,7 +25644,7 @@ Date:   Mon Nov 3 10:15:26 2008 +0000
     
     svn path=/trunk/; revision=84
 
- libseed/seed-builtins.c |   30 ++++++++++++++++++++++++++++--
+ libseed/seed-builtins.c | 30 ++++++++++++++++++++++++++++--
  1 file changed, 28 insertions(+), 2 deletions(-)
 
 commit 7e00f32777afb355786b7a44d3d156a0532ea920
@@ -24280,7 +25655,7 @@ Date:   Mon Nov 3 10:07:38 2008 +0000
     
     svn path=/trunk/; revision=83
 
- src/main.c |    7 +++----
+ src/main.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit e6770ae69876e7900a4aba695b911e7141697722
@@ -24291,7 +25666,7 @@ Date:   Mon Nov 3 09:52:47 2008 +0000
     
     svn path=/trunk/; revision=82
 
- tests/namespace-exception-test.js |   22 ++++++++++++++++++++++
+ tests/namespace-exception-test.js | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 commit 13a1f5d7d73d7bc2e1b48bf811fa8ca9d8c7fb7b
@@ -24302,7 +25677,7 @@ Date:   Mon Nov 3 09:45:45 2008 +0000
     
     svn path=/trunk/; revision=81
 
- libseed/seed-builtins.c |    7 ++++++-
+ libseed/seed-builtins.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 5b1826ea683723e133c37c1a0e593acc6db6afbd
@@ -24313,8 +25688,8 @@ Date:   Mon Nov 3 09:42:51 2008 +0000
     
     svn path=/trunk/; revision=80
 
- libseed/seed-engine.c |   20 ++++++++++++++++++--
- libseed/seed-engine.h |    2 ++
+ libseed/seed-engine.c | 20 ++++++++++++++++++--
+ libseed/seed-engine.h |  2 ++
  2 files changed, 20 insertions(+), 2 deletions(-)
 
 commit b855ebf74a5a9749a9e3c6b127536bcb787e0db8
@@ -24325,15 +25700,15 @@ Date:   Mon Nov 3 09:31:55 2008 +0000
     
     svn path=/trunk/; revision=79
 
- autom4te.cache/output.0 |17024 ----------------------------------------------
- autom4te.cache/output.1 |17388 ----------------------------------------------
- autom4te.cache/output.2 |17392 -----------------------------------------------
- autom4te.cache/requests |  505 --
- autom4te.cache/traces.0 | 2627 -------
- autom4te.cache/traces.1 |  812 ---
- autom4te.cache/traces.2 | 2729 --------
- libseed/seed-types.c    |   54 +
- tests/list-test.js      |   19 +
+ autom4te.cache/output.0 | 17024 ---------------------------------------------
+ autom4te.cache/output.1 | 17388 ---------------------------------------------
+ autom4te.cache/output.2 | 17392 ----------------------------------------------
+ autom4te.cache/requests |   505 --
+ autom4te.cache/traces.0 |  2627 -------
+ autom4te.cache/traces.1 |   812 ---
+ autom4te.cache/traces.2 |  2729 --------
+ libseed/seed-types.c    |    54 +
+ tests/list-test.js      |    19 +
  9 files changed, 73 insertions(+), 58477 deletions(-)
 
 commit 8fef847084c00f8d46ead4b0281ba9e4bc1ee31b
@@ -24344,7 +25719,7 @@ Date:   Mon Nov 3 08:39:40 2008 +0000
     
     svn path=/trunk/; revision=78
 
- libseed/seed-signals.c |    6 +++++-
+ libseed/seed-signals.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit db4d11bc8ec846a5510a692e7e89ee7be062620b
@@ -24356,9 +25731,9 @@ Date:   Mon Nov 3 08:22:07 2008 +0000
     
     svn path=/trunk/; revision=77
 
- libseed/seed-signals.c |    4 ++--
- libseed/seed-structs.c |   25 ++++++++++++++-----------
- libseed/seed-types.c   |    3 ++-
+ libseed/seed-signals.c |  4 ++--
+ libseed/seed-structs.c | 25 ++++++++++++++-----------
+ libseed/seed-types.c   |  3 ++-
  3 files changed, 18 insertions(+), 14 deletions(-)
 
 commit e0b1ea0e01b42a0da87cf02e7fbe786a4eaa291b
@@ -24370,7 +25745,7 @@ Date:   Mon Nov 3 07:05:33 2008 +0000
     
     svn path=/trunk/; revision=76
 
- examples/clutter.js |   83 +++++++++++++++++++++++++++++++--------------------
+ examples/clutter.js | 83 ++++++++++++++++++++++++++++++++---------------------
  1 file changed, 50 insertions(+), 33 deletions(-)
 
 commit 7960aff27782f0769322f5d6054c62550ed86178
@@ -24381,49 +25756,49 @@ Date:   Mon Nov 3 06:39:34 2008 +0000
     
     svn path=/trunk/; revision=75
 
- doc/tutorial-standalone/1.js          |   64 ++++++
- doc/tutorial-standalone/1.png         |  Bin 0 -> 2935 bytes
- doc/tutorial-standalone/2.js          |   69 +++++++
- doc/tutorial-standalone/2.png         |  Bin 0 -> 5836 bytes
- doc/tutorial-standalone/3.js          |   81 ++++++++
- doc/tutorial-standalone/3.png         |  Bin 0 -> 7456 bytes
- doc/tutorial-standalone/4.png         |  Bin 0 -> 43769 bytes
- doc/tutorial-standalone/packing.png   |  Bin 0 -> 8794 bytes
- doc/tutorial-standalone/packing.svg   |  175 ++++++++++++++++
- doc/tutorial-standalone/tutorial.html |  368 +++++++++++++++++++++++++++++++++
- examples/calculator.js                |  152 ++++++++++++++
- examples/clutter.js                   |   44 ++++
- examples/ide/exception.svg            |   75 +++++++
- examples/ide/ide.js                   |  140 +++++++++++++
- examples/ide/tabview.js               |   85 ++++++++
- examples/ide/toolbar.js               |  105 ++++++++++
- examples/lightsoff/lightsoff.js       |  198 ++++++++++++++++++
- examples/lightsoff/tim-off.svg        |  228 ++++++++++++++++++++
- examples/lightsoff/tim-on.svg         |  204 ++++++++++++++++++
- examples/ls.js                        |   14 ++
- examples/mini-browser.js              |  152 ++++++++++++++
- examples/n-oscillator.js              |  100 +++++++++
- examples/notify-test.js               |   25 +++
- examples/quine.js                     |    7 +
- examples/repl.js                      |   13 ++
- examples/shader/ShaderView.js         |   45 ++++
- examples/shader/bob.jpg               |  Bin 0 -> 59229 bytes
- examples/shader/default.glsl          |   11 +
- examples/shader/main.js               |   51 +++++
- examples/vte-test.js                  |   23 +++
- tests/argv.js                         |    6 +
- tests/compare.js                      |   15 ++
- tests/enum.js                         |   15 ++
- tests/gobject-scope.js                |   15 ++
- tests/include.js                      |    7 +
- tests/json-constructor.js             |   15 ++
- tests/print.js                        |    7 +
- tests/printprint.js                   |    6 +
- tests/property-benchmark.js           |   17 ++
- tests/readline.js                     |    7 +
- tests/run-tests.py                    |   78 +++++++
- tests/signal.js                       |   18 ++
- tests/syntax-test.js                  |   18 ++
+ doc/tutorial-standalone/1.js          |  64 ++++++
+ doc/tutorial-standalone/1.png         | Bin 0 -> 2935 bytes
+ doc/tutorial-standalone/2.js          |  69 +++++++
+ doc/tutorial-standalone/2.png         | Bin 0 -> 5836 bytes
+ doc/tutorial-standalone/3.js          |  81 ++++++++
+ doc/tutorial-standalone/3.png         | Bin 0 -> 7456 bytes
+ doc/tutorial-standalone/4.png         | Bin 0 -> 43769 bytes
+ doc/tutorial-standalone/packing.png   | Bin 0 -> 8794 bytes
+ doc/tutorial-standalone/packing.svg   | 175 ++++++++++++++++
+ doc/tutorial-standalone/tutorial.html | 368 ++++++++++++++++++++++++++++++++++
+ examples/calculator.js                | 152 ++++++++++++++
+ examples/clutter.js                   |  44 ++++
+ examples/ide/exception.svg            |  75 +++++++
+ examples/ide/ide.js                   | 140 +++++++++++++
+ examples/ide/tabview.js               |  85 ++++++++
+ examples/ide/toolbar.js               | 105 ++++++++++
+ examples/lightsoff/lightsoff.js       | 198 ++++++++++++++++++
+ examples/lightsoff/tim-off.svg        | 228 +++++++++++++++++++++
+ examples/lightsoff/tim-on.svg         | 204 +++++++++++++++++++
+ examples/ls.js                        |  14 ++
+ examples/mini-browser.js              | 152 ++++++++++++++
+ examples/n-oscillator.js              | 100 +++++++++
+ examples/notify-test.js               |  25 +++
+ examples/quine.js                     |   7 +
+ examples/repl.js                      |  13 ++
+ examples/shader/ShaderView.js         |  45 +++++
+ examples/shader/bob.jpg               | Bin 0 -> 59229 bytes
+ examples/shader/default.glsl          |  11 +
+ examples/shader/main.js               |  51 +++++
+ examples/vte-test.js                  |  23 +++
+ tests/argv.js                         |   6 +
+ tests/compare.js                      |  15 ++
+ tests/enum.js                         |  15 ++
+ tests/gobject-scope.js                |  15 ++
+ tests/include.js                      |   7 +
+ tests/json-constructor.js             |  15 ++
+ tests/print.js                        |   7 +
+ tests/printprint.js                   |   6 +
+ tests/property-benchmark.js           |  17 ++
+ tests/readline.js                     |   7 +
+ tests/run-tests.py                    |  78 +++++++
+ tests/signal.js                       |  18 ++
+ tests/syntax-test.js                  |  18 ++
  43 files changed, 2653 insertions(+)
 
 commit ca33c344f05c5a193309f52e2e855aad2ed74cd8
@@ -24434,59 +25809,66 @@ Date:   Mon Nov 3 06:35:09 2008 +0000
     
     svn path=/trunk/; revision=74
 
- COPYING                 |  675 ++
- ChangeLog               |    2 +
- INSTALL                 |    1 +
- Makefile.am             |   34 +
- Makefile.am.bak         |   33 +
- Makefile.in             |  762 +++
- aclocal.m4              | 9635 ++++++++++++++++++++++++++
- autogen.sh              |  159 +
- autom4te.cache/output.0 |17024 ++++++++++++++++++++++++++++++++++++++++++++++
- autom4te.cache/output.1 |17388 ++++++++++++++++++++++++++++++++++++++++++++++
- autom4te.cache/output.2 |17392 +++++++++++++++++++++++++++++++++++++++++++++++
- autom4te.cache/requests |  505 ++
- autom4te.cache/traces.0 | 2627 +++++++
- autom4te.cache/traces.1 |  812 +++
- autom4te.cache/traces.2 | 2729 ++++++++
- config.guess            |    1 +
- config.h.in             |   80 +
- config.sub              |    1 +
- configure               |17388 ++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac            |   45 +
- configure.ac.bak        |   42 +
- depcomp                 |    1 +
- extensions/Gio.js       |   28 +
- install-sh              |    1 +
- libseed/Makefile.am     |   34 +
- libseed/Makefile.am.bak |   33 +
- libseed/Makefile.in     |  567 ++
- libseed/seed-builtins.c |  189 +
- libseed/seed-builtins.h |   55 +
- libseed/seed-engine.c   |  952 +++
- libseed/seed-engine.h   |   45 +
- libseed/seed-private.h  |   46 +
- libseed/seed-signals.c  |  225 +
- libseed/seed-signals.h  |   30 +
- libseed/seed-structs.c  |   83 +
- libseed/seed-structs.h  |   27 +
- libseed/seed-types.c    |  950 +++
- libseed/seed-types.h    |   82 +
- libseed/seed.h          |   89 +
- ltmain.sh               | 7880 +++++++++++++++++++++
- missing                 |    1 +
- mkinstalldirs           |  111 +
- po/.cvsignore           |   23 +
- po/LINGUAS              |    2 +
- po/Makefile.in.in       |  217 +
- po/POTFILES.in          |    3 +
- seed.pc.in              |   13 +
- src/.cvsignore          |   17 +
- src/Makefile.am         |   25 +
- src/Makefile.am.bak     |   31 +
- src/Makefile.in         |  528 ++
- src/main.c              |   93 +
- 52 files changed, 99716 insertions(+)
+ AUTHORS                 |     0
+ COPYING                 |   675 ++
+ ChangeLog               |     2 +
+ INSTALL                 |     1 +
+ Makefile.am             |    34 +
+ Makefile.am.bak         |    33 +
+ Makefile.in             |   762 ++
+ NEWS                    |     0
+ README                  |     0
+ aclocal.m4              |  9635 +++++++++++++++++++++++++
+ autogen.sh              |   159 +
+ autom4te.cache/output.0 | 17024 +++++++++++++++++++++++++++++++++++++++++++++
+ autom4te.cache/output.1 | 17388 +++++++++++++++++++++++++++++++++++++++++++++
+ autom4te.cache/output.2 | 17392 ++++++++++++++++++++++++++++++++++++++++++++++
+ autom4te.cache/requests |   505 ++
+ autom4te.cache/traces.0 |  2627 +++++++
+ autom4te.cache/traces.1 |   812 +++
+ autom4te.cache/traces.2 |  2729 ++++++++
+ config.guess            |     1 +
+ config.h.in             |    80 +
+ config.sub              |     1 +
+ configure               | 17388 +++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac            |    45 +
+ configure.ac.bak        |    42 +
+ depcomp                 |     1 +
+ extensions/Gio.js       |    28 +
+ install-sh              |     1 +
+ intltool-extract.in     |     0
+ intltool-merge.in       |     0
+ intltool-update.in      |     0
+ libseed/Makefile.am     |    34 +
+ libseed/Makefile.am.bak |    33 +
+ libseed/Makefile.in     |   567 ++
+ libseed/seed-builtins.c |   189 +
+ libseed/seed-builtins.h |    55 +
+ libseed/seed-engine.c   |   952 +++
+ libseed/seed-engine.h   |    45 +
+ libseed/seed-private.h  |    46 +
+ libseed/seed-signals.c  |   225 +
+ libseed/seed-signals.h  |    30 +
+ libseed/seed-structs.c  |    83 +
+ libseed/seed-structs.h  |    27 +
+ libseed/seed-types.c    |   950 +++
+ libseed/seed-types.h    |    82 +
+ libseed/seed.h          |    89 +
+ ltmain.sh               |  7880 +++++++++++++++++++++
+ missing                 |     1 +
+ mkinstalldirs           |   111 +
+ po/.cvsignore           |    23 +
+ po/ChangeLog            |     0
+ po/LINGUAS              |     2 +
+ po/Makefile.in.in       |   217 +
+ po/POTFILES.in          |     3 +
+ seed.pc.in              |    13 +
+ src/.cvsignore          |    17 +
+ src/Makefile.am         |    25 +
+ src/Makefile.am.bak     |    31 +
+ src/Makefile.in         |   528 ++
+ src/main.c              |    93 +
+ 59 files changed, 99716 insertions(+)
 
 commit 708a7358764a2961c24ead3e81a631c9efbef432
 Author: Robert Carr <racarr@src.gnome.org>
@@ -24496,12 +25878,14 @@ Date:   Mon Nov 3 06:32:02 2008 +0000
     
     svn path=/trunk/; revision=73
 
+ AUTHORS                 |    0
  COPYING                 |  675 ----
  ChangeLog               |    2 -
  INSTALL                 |    1 -
  Makefile.am             |   34 -
  Makefile.am.bak         |   33 -
  Makefile.in             |  762 ----
+ NEWS                    |    0
  aclocal.m4              | 9635 -----------------------------------------------
  autogen.sh              |  159 -
  config.guess            |    1 -
@@ -24511,6 +25895,9 @@ Date:   Mon Nov 3 06:32:02 2008 +0000
  configure.ac.bak        |   42 -
  depcomp                 |    1 -
  install-sh              |    1 -
+ intltool-extract.in     |    0
+ intltool-merge.in       |    0
+ intltool-update.in      |    0
  libseed/Makefile.am     |   34 -
  libseed/Makefile.am.bak |   33 -
  libseed/Makefile.in     |  567 ---
@@ -24535,7 +25922,7 @@ Date:   Mon Nov 3 06:32:02 2008 +0000
  src/Makefile.in         |  528 ---
  src/main.c              |   93 -
  src/seed                |  147 -
- 39 files changed, 24223 deletions(-)
+ 44 files changed, 24223 deletions(-)
 
 commit 50d58a5b6fe5ab70f89bb5e6527411f214b45c93
 Author: Robert Carr <racarr@src.gnome.org>
@@ -24545,44 +25932,49 @@ Date:   Mon Nov 3 06:29:37 2008 +0000
     
     svn path=/trunk/; revision=72
 
- INSTALL                 |    2 +-
- autom4te.cache/output.0 |17024 ----------------------------------------------
- autom4te.cache/output.1 |17388 ----------------------------------------------
- autom4te.cache/output.2 |17392 -----------------------------------------------
- autom4te.cache/requests |  505 --
- autom4te.cache/traces.0 | 2627 -------
- autom4te.cache/traces.1 |  812 ---
- autom4te.cache/traces.2 | 2729 --------
- config.guess            |    2 +-
- config.sub              |    2 +-
- configure               |17388 ----------------------------------------------
- depcomp                 |    2 +-
- install-sh              |    2 +-
- libseed/Makefile.am     |   34 +
- libseed/Makefile.am.bak |   33 +
- libseed/Makefile.in     |  567 ++
- libseed/seed-builtins.c |  189 +
- libseed/seed-builtins.h |   55 +
- libseed/seed-engine.c   |  952 +++
- libseed/seed-engine.h   |   45 +
- libseed/seed-private.h  |   46 +
- libseed/seed-signals.c  |  225 +
- libseed/seed-signals.h  |   30 +
- libseed/seed-structs.c  |   83 +
- libseed/seed-structs.h  |   27 +
- libseed/seed-types.c    |  950 +++
- libseed/seed-types.h    |   82 +
- libseed/seed.h          |   89 +
- missing                 |    2 +-
- po/.cvsignore           |   23 -
- po/LINGUAS              |    2 -
- po/Makefile.in.in       |  217 -
- po/POTFILES.in          |    3 -
- seed.pc.in              |   13 -
- src/.cvsignore          |   17 -
- src/Makefile            |  528 ++
- src/seed                |  147 +
- 37 files changed, 4088 insertions(+), 76146 deletions(-)
+ INSTALL                 |     2 +-
+ README                  |     0
+ autogen.sh              |     0
+ autom4te.cache/output.0 | 17024 ---------------------------------------------
+ autom4te.cache/output.1 | 17388 ---------------------------------------------
+ autom4te.cache/output.2 | 17392 ----------------------------------------------
+ autom4te.cache/requests |   505 --
+ autom4te.cache/traces.0 |  2627 -------
+ autom4te.cache/traces.1 |   812 ---
+ autom4te.cache/traces.2 |  2729 --------
+ config.guess            |     2 +-
+ config.sub              |     2 +-
+ configure               | 17388 ---------------------------------------------
+ depcomp                 |     2 +-
+ install-sh              |     2 +-
+ libseed/Makefile.am     |    34 +
+ libseed/Makefile.am.bak |    33 +
+ libseed/Makefile.in     |   567 ++
+ libseed/seed-builtins.c |   189 +
+ libseed/seed-builtins.h |    55 +
+ libseed/seed-engine.c   |   952 +++
+ libseed/seed-engine.h   |    45 +
+ libseed/seed-private.h  |    46 +
+ libseed/seed-signals.c  |   225 +
+ libseed/seed-signals.h  |    30 +
+ libseed/seed-structs.c  |    83 +
+ libseed/seed-structs.h  |    27 +
+ libseed/seed-types.c    |   950 +++
+ libseed/seed-types.h    |    82 +
+ libseed/seed.h          |    89 +
+ ltmain.sh               |     0
+ missing                 |     2 +-
+ mkinstalldirs           |     0
+ po/.cvsignore           |    23 -
+ po/ChangeLog            |     0
+ po/LINGUAS              |     2 -
+ po/Makefile.in.in       |   217 -
+ po/POTFILES.in          |     3 -
+ seed.pc.in              |    13 -
+ src/.cvsignore          |    17 -
+ src/Makefile            |   528 ++
+ src/seed                |   147 +
+ 42 files changed, 4088 insertions(+), 76146 deletions(-)
 
 commit 1e4e0e338ec04e45eec5250e89b4862a5addea7d
 Author: Robert Carr <racarr@src.gnome.org>
@@ -24592,103 +25984,109 @@ Date:   Mon Nov 3 06:26:32 2008 +0000
     
     svn path=/trunk/; revision=71
 
- AUTHORS                               |    3 -
- ChangeLog                             |    2 +
- INSTALL                               |    1 +
- Makefile                              |   10 -
- Makefile.am                           |   34 +
- Makefile.am.bak                       |   33 +
- Makefile.in                           |  762 ++
- TODO                                  |    1 -
- aclocal.m4                            | 9635 ++++++++++++++++++
- autogen.sh                            |  159 +
- autom4te.cache/output.0               |17024 ++++++++++++++++++++++++++++++++
- autom4te.cache/output.1               |17388 ++++++++++++++++++++++++++++++++
- autom4te.cache/output.2               |17392 +++++++++++++++++++++++++++++++++
- autom4te.cache/requests               |  505 +
- autom4te.cache/traces.0               | 2627 +++++
- autom4te.cache/traces.1               |  812 ++
- autom4te.cache/traces.2               | 2729 ++++++
- config.guess                          |    1 +
- config.h.in                           |   80 +
- config.sub                            |    1 +
- configure                             |17388 ++++++++++++++++++++++++++++++++
- configure.ac                          |   45 +
- configure.ac.bak                      |   42 +
- depcomp                               |    1 +
- doc/tutorial-standalone/1.js          |   64 -
- doc/tutorial-standalone/1.png         |  Bin 2935 -> 0 bytes
- doc/tutorial-standalone/2.js          |   69 -
- doc/tutorial-standalone/2.png         |  Bin 5836 -> 0 bytes
- doc/tutorial-standalone/3.js          |   81 -
- doc/tutorial-standalone/3.png         |  Bin 7456 -> 0 bytes
- doc/tutorial-standalone/4.png         |  Bin 43769 -> 0 bytes
- doc/tutorial-standalone/packing.png   |  Bin 8794 -> 0 bytes
- doc/tutorial-standalone/packing.svg   |  175 -
- doc/tutorial-standalone/tutorial.html |  368 -
- examples/calculator.js                |  152 -
- examples/clutter.js                   |   44 -
- examples/ide/exception.svg            |   75 -
- examples/ide/ide.js                   |  140 -
- examples/ide/tabview.js               |   85 -
- examples/ide/toolbar.js               |  105 -
- examples/lightsoff/lightsoff.js       |  198 -
- examples/lightsoff/tim-off.svg        |  228 -
- examples/lightsoff/tim-on.svg         |  204 -
- examples/ls.js                        |   14 -
- examples/mini-browser.js              |  152 -
- examples/n-oscillator.js              |  100 -
- examples/notify-test.js               |   25 -
- examples/quine.js                     |    7 -
- examples/repl.js                      |   13 -
- examples/shader/ShaderView.js         |   45 -
- examples/shader/bob.jpg               |  Bin 59229 -> 0 bytes
- examples/shader/default.glsl          |   11 -
- examples/shader/main.js               |   51 -
- examples/vte-test.js                  |   23 -
- extensions/Gio.js                     |   28 -
- install-sh                            |    1 +
- libseed/Makefile                      |    5 -
- libseed/seed-builtins.c               |  189 -
- libseed/seed-builtins.h               |   55 -
- libseed/seed-engine.c                 |  952 --
- libseed/seed-engine.h                 |   45 -
- libseed/seed-private.h                |   46 -
- libseed/seed-signals.c                |  225 -
- libseed/seed-signals.h                |   30 -
- libseed/seed-structs.c                |   83 -
- libseed/seed-structs.h                |   27 -
- libseed/seed-types.c                  |  950 --
- libseed/seed-types.h                  |   82 -
- libseed/seed.h                        |   89 -
- ltmain.sh                             | 7880 +++++++++++++++
- main.c                                |   93 -
- missing                               |    1 +
- mkinstalldirs                         |  111 +
- po/.cvsignore                         |   23 +
- po/LINGUAS                            |    2 +
- po/Makefile.in.in                     |  217 +
- po/POTFILES.in                        |    3 +
- seed.pc.in                            |   13 +
- src/.cvsignore                        |   17 +
- src/Makefile.am                       |   25 +
- src/Makefile.am.bak                   |   31 +
- src/Makefile.in                       |  528 +
- src/main.c                            |   93 +
- tests/argv.js                         |    6 -
- tests/compare.js                      |   15 -
- tests/enum.js                         |   15 -
- tests/gobject-scope.js                |   15 -
- tests/include.js                      |    7 -
- tests/json-constructor.js             |   15 -
- tests/print.js                        |    7 -
- tests/printprint.js                   |    6 -
- tests/property-benchmark.js           |   17 -
- tests/readline.js                     |    7 -
- tests/run-tests.py                    |   78 -
- tests/signal.js                       |   18 -
- tests/syntax-test.js                  |   18 -
- 96 files changed, 95606 insertions(+), 5566 deletions(-)
+ AUTHORS                               |     3 -
+ ChangeLog                             |     2 +
+ INSTALL                               |     1 +
+ Makefile                              |    10 -
+ Makefile.am                           |    34 +
+ Makefile.am.bak                       |    33 +
+ Makefile.in                           |   762 ++
+ NEWS                                  |     0
+ README                                |     0
+ TODO                                  |     1 -
+ aclocal.m4                            |  9635 ++++++++++++++++++
+ autogen.sh                            |   159 +
+ autom4te.cache/output.0               | 17024 +++++++++++++++++++++++++++++++
+ autom4te.cache/output.1               | 17388 +++++++++++++++++++++++++++++++
+ autom4te.cache/output.2               | 17392 ++++++++++++++++++++++++++++++++
+ autom4te.cache/requests               |   505 +
+ autom4te.cache/traces.0               |  2627 +++++
+ autom4te.cache/traces.1               |   812 ++
+ autom4te.cache/traces.2               |  2729 +++++
+ config.guess                          |     1 +
+ config.h.in                           |    80 +
+ config.sub                            |     1 +
+ configure                             | 17388 +++++++++++++++++++++++++++++++
+ configure.ac                          |    45 +
+ configure.ac.bak                      |    42 +
+ depcomp                               |     1 +
+ doc/tutorial-standalone/1.js          |    64 -
+ doc/tutorial-standalone/1.png         |   Bin 2935 -> 0 bytes
+ doc/tutorial-standalone/2.js          |    69 -
+ doc/tutorial-standalone/2.png         |   Bin 5836 -> 0 bytes
+ doc/tutorial-standalone/3.js          |    81 -
+ doc/tutorial-standalone/3.png         |   Bin 7456 -> 0 bytes
+ doc/tutorial-standalone/4.png         |   Bin 43769 -> 0 bytes
+ doc/tutorial-standalone/packing.png   |   Bin 8794 -> 0 bytes
+ doc/tutorial-standalone/packing.svg   |   175 -
+ doc/tutorial-standalone/tutorial.html |   368 -
+ examples/calculator.js                |   152 -
+ examples/clutter.js                   |    44 -
+ examples/ide/exception.svg            |    75 -
+ examples/ide/ide.js                   |   140 -
+ examples/ide/tabview.js               |    85 -
+ examples/ide/toolbar.js               |   105 -
+ examples/lightsoff/lightsoff.js       |   198 -
+ examples/lightsoff/tim-off.svg        |   228 -
+ examples/lightsoff/tim-on.svg         |   204 -
+ examples/ls.js                        |    14 -
+ examples/mini-browser.js              |   152 -
+ examples/n-oscillator.js              |   100 -
+ examples/notify-test.js               |    25 -
+ examples/quine.js                     |     7 -
+ examples/repl.js                      |    13 -
+ examples/shader/ShaderView.js         |    45 -
+ examples/shader/bob.jpg               |   Bin 59229 -> 0 bytes
+ examples/shader/default.glsl          |    11 -
+ examples/shader/main.js               |    51 -
+ examples/vte-test.js                  |    23 -
+ extensions/Gio.js                     |    28 -
+ install-sh                            |     1 +
+ intltool-extract.in                   |     0
+ intltool-merge.in                     |     0
+ intltool-update.in                    |     0
+ libseed/Makefile                      |     5 -
+ libseed/seed-builtins.c               |   189 -
+ libseed/seed-builtins.h               |    55 -
+ libseed/seed-engine.c                 |   952 --
+ libseed/seed-engine.h                 |    45 -
+ libseed/seed-private.h                |    46 -
+ libseed/seed-signals.c                |   225 -
+ libseed/seed-signals.h                |    30 -
+ libseed/seed-structs.c                |    83 -
+ libseed/seed-structs.h                |    27 -
+ libseed/seed-types.c                  |   950 --
+ libseed/seed-types.h                  |    82 -
+ libseed/seed.h                        |    89 -
+ ltmain.sh                             |  7880 +++++++++++++++
+ main.c                                |    93 -
+ missing                               |     1 +
+ mkinstalldirs                         |   111 +
+ po/.cvsignore                         |    23 +
+ po/ChangeLog                          |     0
+ po/LINGUAS                            |     2 +
+ po/Makefile.in.in                     |   217 +
+ po/POTFILES.in                        |     3 +
+ seed.pc.in                            |    13 +
+ src/.cvsignore                        |    17 +
+ src/Makefile.am                       |    25 +
+ src/Makefile.am.bak                   |    31 +
+ src/Makefile.in                       |   528 +
+ src/main.c                            |    93 +
+ tests/argv.js                         |     6 -
+ tests/compare.js                      |    15 -
+ tests/enum.js                         |    15 -
+ tests/gobject-scope.js                |    15 -
+ tests/include.js                      |     7 -
+ tests/json-constructor.js             |    15 -
+ tests/print.js                        |     7 -
+ tests/printprint.js                   |     6 -
+ tests/property-benchmark.js           |    17 -
+ tests/readline.js                     |     7 -
+ tests/run-tests.py                    |    78 -
+ tests/signal.js                       |    18 -
+ tests/syntax-test.js                  |    18 -
+ 102 files changed, 95606 insertions(+), 5566 deletions(-)
 
 commit 1ca02ad9ef946b98ccdc13e26f173d52941a3d4a
 Author: Robert Carr <racarr@src.gnome.org>
@@ -24699,8 +26097,8 @@ Date:   Mon Nov 3 05:29:34 2008 +0000
     
     svn path=/trunk/; revision=70
 
- examples/n-oscillator.js |    1 +
- main.c                   |    4 ----
+ examples/n-oscillator.js | 1 +
+ main.c                   | 4 ----
  2 files changed, 1 insertion(+), 4 deletions(-)
 
 commit 54f5c74cc7f87cf1ed05347bb3ac3b4fd3853987
@@ -24711,7 +26109,7 @@ Date:   Mon Nov 3 05:26:04 2008 +0000
     
     svn path=/trunk/; revision=69
 
- examples/shader/default.glsl |   11 +++++++++++
+ examples/shader/default.glsl | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 493e4f3cbf2f310e12b6990a40e26d0f68538a46
@@ -24722,10 +26120,10 @@ Date:   Mon Nov 3 05:18:50 2008 +0000
     
     svn path=/trunk/; revision=68
 
- examples/ide/exception.svg |   75 ++++++++++++++++++++++++
- examples/ide/ide.js        |  140 ++++++++++++++++++++++++++++++++++++++++++++
- examples/ide/tabview.js    |   85 +++++++++++++++++++++++++++
- examples/ide/toolbar.js    |  105 +++++++++++++++++++++++++++++++++
+ examples/ide/exception.svg |  75 ++++++++++++++++++++++++
+ examples/ide/ide.js        | 140 +++++++++++++++++++++++++++++++++++++++++++++
+ examples/ide/tabview.js    |  85 +++++++++++++++++++++++++++
+ examples/ide/toolbar.js    | 105 ++++++++++++++++++++++++++++++++++
  4 files changed, 405 insertions(+)
 
 commit 91d0b338e6100bc1200b442b5f0c728fe9a31a41
@@ -24736,7 +26134,7 @@ Date:   Mon Nov 3 05:18:14 2008 +0000
     
     svn path=/trunk/; revision=67
 
- tests/syntax-test.js |    9 +++++++++
+ tests/syntax-test.js | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 7e00fa7f035af93411386e29b267fba7b226a265
@@ -24751,7 +26149,7 @@ Date:   Mon Nov 3 02:44:42 2008 +0000
     
     svn path=/trunk/; revision=66
 
- libseed/seed-structs.c |    7 +------
+ libseed/seed-structs.c | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 commit 9803083806f16221ac91130dad05e05268d12816
@@ -24763,10 +26161,10 @@ Date:   Sun Nov 2 23:13:10 2008 +0000
     
     svn path=/trunk/; revision=65
 
- examples/bob.jpg              |  Bin 59229 -> 0 bytes
- examples/shader/ShaderView.js |   45 ++++++++++++++++++++++++++++++++++++
- examples/shader/bob.jpg       |  Bin 0 -> 59229 bytes
- examples/shader/main.js       |   51 +++++++++++++++++++++++++++++++++++++++++
+ examples/bob.jpg              | Bin 59229 -> 0 bytes
+ examples/shader/ShaderView.js |  45 +++++++++++++++++++++++++++++++++++++
+ examples/shader/bob.jpg       | Bin 0 -> 59229 bytes
+ examples/shader/main.js       |  51 ++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 96 insertions(+)
 
 commit 0c22ed9f0b408ca11eeb488d9eb94f49bcaeb379
@@ -24777,7 +26175,7 @@ Date:   Sun Nov 2 23:12:42 2008 +0000
     
     svn path=/trunk/; revision=64
 
- extensions/Gio.js |   12 +++++++++++-
+ extensions/Gio.js | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 891073e1c5af616f083e8b3040c1ee40ace404cf
@@ -24788,7 +26186,7 @@ Date:   Sun Nov 2 23:01:47 2008 +0000
     
     svn path=/trunk/; revision=63
 
- tests/syntax-test.js |    9 +++++++++
+ tests/syntax-test.js | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 8633751156eea94ea521ec88e96db802472b8f37
@@ -24801,9 +26199,9 @@ Date:   Sun Nov 2 23:00:24 2008 +0000
     
     svn path=/trunk/; revision=62
 
- libseed/seed-builtins.c |   19 +++++++++++++++++++
- libseed/seed-engine.c   |    6 ++++--
- main.c                  |    3 +++
+ libseed/seed-builtins.c | 19 +++++++++++++++++++
+ libseed/seed-engine.c   |  6 ++++--
+ main.c                  |  3 +++
  3 files changed, 26 insertions(+), 2 deletions(-)
 
 commit 9fd14b04c025df8690f5b7bb186bd92cd4fb5bf4
@@ -24814,7 +26212,7 @@ Date:   Sun Nov 2 22:38:05 2008 +0000
     
     svn path=/trunk/; revision=61
 
- libseed/seed-types.c |    4 ++--
+ libseed/seed-types.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 73a486f3ec8f35d208b8e2066f1523a73125f30e
@@ -24826,7 +26224,7 @@ Date:   Sun Nov 2 10:29:22 2008 +0000
     
     svn path=/trunk/; revision=60
 
- libseed/seed-signals.c |    4 +++-
+ libseed/seed-signals.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 7fc1c8b77ab6cd751fde53539235bdc36c5963be
@@ -24837,7 +26235,7 @@ Date:   Sun Nov 2 10:26:11 2008 +0000
     
     svn path=/trunk/; revision=59
 
- extensions/Gio.js |   14 ++++++++++++--
+ extensions/Gio.js | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 365ff932bcae13393137af7c0e6ec2d35c7ae639
@@ -24852,12 +26250,12 @@ Date:   Sun Nov 2 10:20:42 2008 +0000
     
     svn path=/trunk/; revision=58
 
- examples/bob.jpg       |  Bin 0 -> 59229 bytes
- examples/clutter.js    |   44 ++++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.c  |   37 +++++++++----------------------------
- libseed/seed-structs.c |   33 ++++++++++++++++++++++++++-------
- libseed/seed-structs.h |    4 ++--
- libseed/seed-types.c   |   21 ++++++++++++++++-----
+ examples/bob.jpg       | Bin 0 -> 59229 bytes
+ examples/clutter.js    |  44 ++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.c  |  37 +++++++++----------------------------
+ libseed/seed-structs.c |  33 ++++++++++++++++++++++++++-------
+ libseed/seed-structs.h |   4 ++--
+ libseed/seed-types.c   |  21 ++++++++++++++++-----
  6 files changed, 97 insertions(+), 42 deletions(-)
 
 commit 13846ed314465a7332048a3d4330fc3d2ba129d9
@@ -24868,7 +26266,7 @@ Date:   Sun Nov 2 08:42:44 2008 +0000
     
     svn path=/trunk/; revision=57
 
- libseed/seed-engine.c |    8 +++++++-
+ libseed/seed-engine.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 17c52b670e0c087ec48e64f50538750b731e7d6f
@@ -24880,10 +26278,10 @@ Date:   Sun Nov 2 08:38:08 2008 +0000
     
     svn path=/trunk/; revision=56
 
- libseed/seed-engine.c  |   34 +++++++++++++
- libseed/seed-structs.c |   32 ++++++------
- libseed/seed-structs.h |    5 +-
- libseed/seed-types.c   |  130 ++++++++++++++++++------------------------------
+ libseed/seed-engine.c  |  34 +++++++++++++
+ libseed/seed-structs.c |  32 ++++++------
+ libseed/seed-structs.h |   5 +-
+ libseed/seed-types.c   | 130 +++++++++++++++++++------------------------------
  4 files changed, 100 insertions(+), 101 deletions(-)
 
 commit 6f7876e09483527b9e8a5cd1743fdab908a703eb
@@ -24894,7 +26292,7 @@ Date:   Sun Nov 2 07:24:24 2008 +0000
     
     svn path=/trunk/; revision=55
 
- extensions/Gio.js |    2 +-
+ extensions/Gio.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 75123d7af87375edd0943c19c8c669d35c5ad551
@@ -24905,7 +26303,7 @@ Date:   Sun Nov 2 06:36:11 2008 +0000
     
     svn path=/trunk/; revision=54
 
- doc/tutorial-standalone/tutorial.html |   30 ++++++++++++++++++++----------
+ doc/tutorial-standalone/tutorial.html | 30 ++++++++++++++++++++----------
  1 file changed, 20 insertions(+), 10 deletions(-)
 
 commit c40cd4d05f0e91634cb883bd37f8da0e432dd5f1
@@ -24916,9 +26314,9 @@ Date:   Sun Nov 2 06:12:38 2008 +0000
     
     svn path=/trunk/; revision=53
 
- libseed/seed-engine.c |   21 +++++++++++++++++++++
- libseed/seed.h        |    2 ++
- main.c                |   14 +++++++++-----
+ libseed/seed-engine.c | 21 +++++++++++++++++++++
+ libseed/seed.h        |  2 ++
+ main.c                | 14 +++++++++-----
  3 files changed, 32 insertions(+), 5 deletions(-)
 
 commit 8543b08276b3cebd62816aebae22643a893b06fa
@@ -24929,7 +26327,7 @@ Date:   Sun Nov 2 06:07:22 2008 +0000
     
     svn path=/trunk/; revision=52
 
- libseed/seed-builtins.c |   10 ++++++++--
+ libseed/seed-builtins.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit ed3a2072d7c5e60296eb734eb82c354e2fd4af04
@@ -24946,12 +26344,12 @@ Date:   Sun Nov 2 06:03:37 2008 +0000
     
     svn path=/trunk/; revision=51
 
- Makefile                |    4 +++-
- examples/quine.js       |    4 +---
- extensions/Gio.js       |    8 ++++++++
- libseed/seed-builtins.c |   27 ++++++++++++++++++++++-----
- libseed/seed-engine.c   |   31 ++++++++++++++++++++-----------
- libseed/seed-types.c    |   33 +++++++++++++++++++++++----------
+ Makefile                |  4 +++-
+ examples/quine.js       |  4 +---
+ extensions/Gio.js       |  8 ++++++++
+ libseed/seed-builtins.c | 27 ++++++++++++++++++++++-----
+ libseed/seed-engine.c   | 31 ++++++++++++++++++++-----------
+ libseed/seed-types.c    | 33 +++++++++++++++++++++++----------
  6 files changed, 77 insertions(+), 30 deletions(-)
 
 commit c1e5f36d1795b56d9662e42f5b77921b350af73e
@@ -24962,14 +26360,14 @@ Date:   Sun Nov 2 05:20:04 2008 +0000
     
     svn path=/trunk/; revision=50
 
- doc/tutorial-standalone/1.js          |   64 ++++++++++++
- doc/tutorial-standalone/2.js          |   69 +++++++++++++
- doc/tutorial-standalone/3.js          |   81 +++++++++++++++
- doc/tutorial-standalone/3.png         |  Bin 0 -> 7456 bytes
- doc/tutorial-standalone/4.png         |  Bin 0 -> 43769 bytes
- doc/tutorial-standalone/packing.png   |  Bin 0 -> 8794 bytes
- doc/tutorial-standalone/packing.svg   |  175 +++++++++++++++++++++++++++++++++
- doc/tutorial-standalone/tutorial.html |  145 +++++++++++++++++++++++----
+ doc/tutorial-standalone/1.js          |  64 +++++++++++++
+ doc/tutorial-standalone/2.js          |  69 ++++++++++++++
+ doc/tutorial-standalone/3.js          |  81 ++++++++++++++++
+ doc/tutorial-standalone/3.png         | Bin 0 -> 7456 bytes
+ doc/tutorial-standalone/4.png         | Bin 0 -> 43769 bytes
+ doc/tutorial-standalone/packing.png   | Bin 0 -> 8794 bytes
+ doc/tutorial-standalone/packing.svg   | 175 ++++++++++++++++++++++++++++++++++
+ doc/tutorial-standalone/tutorial.html | 145 ++++++++++++++++++++++++----
  8 files changed, 517 insertions(+), 17 deletions(-)
 
 commit 0d40f91d7623d7eeae0023daad752897997aa1a6
@@ -24980,7 +26378,7 @@ Date:   Sat Nov 1 10:23:31 2008 +0000
     
     svn path=/trunk/; revision=49
 
- libseed/seed-engine.c |    9 ++++++---
+ libseed/seed-engine.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 23c003cebae94d65e0a73ef8eda360fa2053e6e4
@@ -24996,7 +26394,7 @@ Date:   Sat Nov 1 09:57:27 2008 +0000
     
     svn path=/trunk/; revision=48
 
- examples/quine.js |    9 +++++++++
+ examples/quine.js | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 9a645078ca6a81fd89c65a06e00660675059fb6e
@@ -25012,11 +26410,11 @@ Date:   Sat Nov 1 09:54:12 2008 +0000
     
     svn path=/trunk/; revision=47
 
- doc/tutorial.html       |  247 -----------------------------------------------
- libseed/seed-builtins.c |    4 +
- libseed/seed-engine.c   |   59 +++++++----
- libseed/seed-engine.h   |    2 +-
- libseed/seed-types.c    |    2 +-
+ doc/tutorial.html       | 247 ------------------------------------------------
+ libseed/seed-builtins.c |   4 +
+ libseed/seed-engine.c   |  59 ++++++++----
+ libseed/seed-engine.h   |   2 +-
+ libseed/seed-types.c    |   2 +-
  5 files changed, 47 insertions(+), 267 deletions(-)
 
 commit d68755fb770b203a74a432dedb746060af82d279
@@ -25027,11 +26425,11 @@ Date:   Sat Nov 1 08:36:10 2008 +0000
     
     svn path=/trunk/; revision=46
 
- examples/calculator.js   |    3 +-
- examples/clutter-test.js |   13 -----
- examples/ls.js           |    6 ++-
- examples/spacewhale.js   |  119 ----------------------------------------------
- examples/vte-test.js     |   19 +++-----
+ examples/calculator.js   |   3 +-
+ examples/clutter-test.js |  13 ------
+ examples/ls.js           |   6 ++-
+ examples/spacewhale.js   | 119 -----------------------------------------------
+ examples/vte-test.js     |  19 +++-----
  5 files changed, 13 insertions(+), 147 deletions(-)
 
 commit 6c0653ead2b15a129c239faee42953b27c7dad71
@@ -25042,9 +26440,9 @@ Date:   Sat Nov 1 08:21:59 2008 +0000
     
     svn path=/trunk/; revision=45
 
- doc/tutorial-standalone/1.png         |  Bin 0 -> 2935 bytes
- doc/tutorial-standalone/2.png         |  Bin 0 -> 5836 bytes
- doc/tutorial-standalone/tutorial.html |  247 +++++++++++++++++++++++++++++++++
+ doc/tutorial-standalone/1.png         | Bin 0 -> 2935 bytes
+ doc/tutorial-standalone/2.png         | Bin 0 -> 5836 bytes
+ doc/tutorial-standalone/tutorial.html | 247 ++++++++++++++++++++++++++++++++++
  3 files changed, 247 insertions(+)
 
 commit aebd925cc8c7d4081b889cdb0c0a4f2e5f4f6cfe
@@ -25055,13 +26453,13 @@ Date:   Sat Nov 1 08:20:36 2008 +0000
     
     svn path=/trunk/; revision=44
 
- examples/calculator.js    |    6 +++---
- examples/clutter-test.js  |    2 +-
- examples/mini-browser.js  |   22 +++++++---------------
- examples/n-oscillator.js  |    6 +++---
- examples/notify-test.js   |    4 ++--
- tests/gobject-scope.js    |    2 +-
- tests/json-constructor.js |    2 +-
+ examples/calculator.js    |  6 +++---
+ examples/clutter-test.js  |  2 +-
+ examples/mini-browser.js  | 22 +++++++---------------
+ examples/n-oscillator.js  |  6 +++---
+ examples/notify-test.js   |  4 ++--
+ tests/gobject-scope.js    |  2 +-
+ tests/json-constructor.js |  2 +-
  7 files changed, 18 insertions(+), 26 deletions(-)
 
 commit a0b1434c6969bcd4bd143c7997e83016d4595b8c
@@ -25072,7 +26470,7 @@ Date:   Sat Nov 1 07:13:29 2008 +0000
     
     svn path=/trunk/; revision=43
 
- libseed/seed-engine.c |    2 +-
+ libseed/seed-engine.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 118f02d193c9e9c316737f82180ad4355330194e
@@ -25083,8 +26481,8 @@ Date:   Sat Nov 1 07:07:11 2008 +0000
     
     svn path=/trunk/; revision=42
 
- MAINTAINERS           |    2 +-
- libseed/seed-engine.c |    2 +-
+ MAINTAINERS           | 2 +-
+ libseed/seed-engine.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit a49d9aa0ce2e2bd1904e3a32d44c86c38a7df508
@@ -25095,10 +26493,10 @@ Date:   Sun Oct 26 06:26:46 2008 +0000
     
     svn path=/trunk/; revision=41
 
- libseed/seed-engine.c  |    1 -
- libseed/seed-types.c   |   12 +-----------
- tests/gobject-scope.js |   15 +++++++++++++++
- tests/run-tests.py     |    4 ++--
+ libseed/seed-engine.c  |  1 -
+ libseed/seed-types.c   | 12 +-----------
+ tests/gobject-scope.js | 15 +++++++++++++++
+ tests/run-tests.py     |  4 ++--
  4 files changed, 18 insertions(+), 14 deletions(-)
 
 commit 2a0af2d56740268d7f37529de7894d2e0f7d4b82
@@ -25109,7 +26507,7 @@ Date:   Sun Oct 26 05:46:13 2008 +0000
     
     svn path=/trunk/; revision=40
 
- tests/printprint.js |    6 ++++++
+ tests/printprint.js | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 9e48f4ae47419d3002d34ac40f70ad43a721b089
@@ -25120,7 +26518,7 @@ Date:   Sun Oct 26 05:38:14 2008 +0000
     
     svn path=/trunk/; revision=39
 
- tests/argv.js |    6 ++++++
+ tests/argv.js | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit c6fb0a22c2a70977dc8bfdab217887c6928857bd
@@ -25131,12 +26529,12 @@ Date:   Sun Oct 26 05:29:27 2008 +0000
     
     svn path=/trunk/; revision=38
 
- doc/tutorial.html               |    1 -
- examples/lightsoff/lightsoff.js |   59 +++++++++++++++++++++++++++++++++++++--
- libseed/seed-builtins.c         |   22 +++++++++++++--
- libseed/seed-engine.c           |    2 +-
- libseed/seed-types.c            |    2 ++
- main.c                          |   24 ++++++++++++----
+ doc/tutorial.html               |  1 -
+ examples/lightsoff/lightsoff.js | 59 ++++++++++++++++++++++++++++++++++++++---
+ libseed/seed-builtins.c         | 22 ++++++++++++---
+ libseed/seed-engine.c           |  2 +-
+ libseed/seed-types.c            |  2 ++
+ main.c                          | 24 ++++++++++++-----
  6 files changed, 96 insertions(+), 14 deletions(-)
 
 commit 18faf653d58fe3d5e17724ca0feb931ecfc05da9
@@ -25147,7 +26545,7 @@ Date:   Sun Oct 26 04:39:19 2008 +0000
     
     svn path=/trunk/; revision=37
 
- libseed/seed-types.c |    4 ++--
+ libseed/seed-types.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 2d25a38511ffb5855da74b9ef720ee98043088b9
@@ -25158,7 +26556,7 @@ Date:   Sun Oct 26 04:37:42 2008 +0000
     
     svn path=/trunk/; revision=36
 
- libseed/seed-types.c |    4 ++--
+ libseed/seed-types.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 07a8a7aa1ca718aeb825f41833e9a8b5140d76a2
@@ -25169,10 +26567,10 @@ Date:   Fri Oct 24 18:08:54 2008 +0000
     
     svn path=/trunk/; revision=35
 
- Makefile               |    2 +-
- libseed/seed-engine.c  |    2 +-
- libseed/seed-signals.c |    2 +-
- libseed/seed-types.c   |   10 +++++-----
+ Makefile               |  2 +-
+ libseed/seed-engine.c  |  2 +-
+ libseed/seed-signals.c |  2 +-
+ libseed/seed-types.c   | 10 +++++-----
  4 files changed, 8 insertions(+), 8 deletions(-)
 
 commit 3dc9a7940d496f2f99990bf5eec9ca03ebb53286
@@ -25184,11 +26582,11 @@ Date:   Fri Oct 24 18:01:08 2008 +0000
     
     svn path=/trunk/; revision=34
 
- libseed/seed-builtins.c |    4 +-
- libseed/seed-engine.c   |   19 +++---
- libseed/seed-signals.c  |    5 +-
- libseed/seed-structs.c  |  160 ++---------------------------------------------
- libseed/seed-types.c    |   29 ++++-----
+ libseed/seed-builtins.c |   4 +-
+ libseed/seed-engine.c   |  19 +++---
+ libseed/seed-signals.c  |   5 +-
+ libseed/seed-structs.c  | 160 ++----------------------------------------------
+ libseed/seed-types.c    |  29 ++++-----
  5 files changed, 30 insertions(+), 187 deletions(-)
 
 commit fcb92fdede36cc4b5ffa9a5a73bbd3a4cb8440c2
@@ -25199,10 +26597,10 @@ Date:   Fri Oct 24 17:47:37 2008 +0000
     
     svn path=/trunk/; revision=33
 
- Makefile                |    2 +-
- libseed/seed-builtins.c |    3 +--
- libseed/seed-engine.c   |    5 ++---
- libseed/seed-engine.h   |    2 +-
+ Makefile                | 2 +-
+ libseed/seed-builtins.c | 3 +--
+ libseed/seed-engine.c   | 5 ++---
+ libseed/seed-engine.h   | 2 +-
  4 files changed, 5 insertions(+), 7 deletions(-)
 
 commit 2f87b49c59ce59d495a3db99e5f7fd156104f518
@@ -25213,7 +26611,7 @@ Date:   Fri Oct 24 17:44:03 2008 +0000
     
     svn path=/trunk/; revision=32
 
- libseed/seed-types.c |   10 ----------
+ libseed/seed-types.c | 10 ----------
  1 file changed, 10 deletions(-)
 
 commit d03610251e32b80fad02e4560f891d176a76a063
@@ -25224,7 +26622,7 @@ Date:   Fri Oct 24 17:43:14 2008 +0000
     
     svn path=/trunk/; revision=31
 
- libseed/seed-engine.c |   57 ++++++-------------------------------------------
+ libseed/seed-engine.c | 57 +++++++--------------------------------------------
  1 file changed, 7 insertions(+), 50 deletions(-)
 
 commit 479b16a2b05403de582a3c4311fa1b7616ceb548
@@ -25235,7 +26633,7 @@ Date:   Thu Oct 23 11:54:37 2008 +0000
     
     svn path=/trunk/; revision=30
 
- libseed/seed-engine.c |    2 ++
+ libseed/seed-engine.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 70209b10a8eee8b0badc65b40c96575b3f28f926
@@ -25246,7 +26644,7 @@ Date:   Thu Oct 23 11:34:17 2008 +0000
     
     svn path=/trunk/; revision=29
 
- examples/lightsoff/lightsoff.js |    2 +-
+ examples/lightsoff/lightsoff.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cdb57ede03f4ddd540d1da27a19620665fbebbbf
@@ -25257,7 +26655,7 @@ Date:   Thu Oct 23 11:33:23 2008 +0000
     
     svn path=/trunk/; revision=28
 
- examples/lightsoff/lightsoff.js |  104 ++++++++++++++++++++-------------------
+ examples/lightsoff/lightsoff.js | 104 +++++++++++++++++++++-------------------
  1 file changed, 54 insertions(+), 50 deletions(-)
 
 commit c70f031a15bfec5ed7d2394c5de7b6b423da1587
@@ -25268,7 +26666,7 @@ Date:   Thu Oct 23 11:26:53 2008 +0000
     
     svn path=/trunk/; revision=27
 
- examples/lightsoff/lightsoff.js |    4 ++--
+ examples/lightsoff/lightsoff.js | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8a7db899ed1768db2c6de8fe412687cb840a7cbd
@@ -25279,7 +26677,7 @@ Date:   Thu Oct 23 11:25:46 2008 +0000
     
     svn path=/trunk/; revision=26
 
- examples/lightsoff/lightsoff.js |   12 ++++++------
+ examples/lightsoff/lightsoff.js | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit c553308a8293408fbe97d88cbd967ebc5e3a5dee
@@ -25290,7 +26688,7 @@ Date:   Thu Oct 23 11:22:09 2008 +0000
     
     svn path=/trunk/; revision=25
 
- examples/lightsoff/lightsoff.js |    6 +++---
+ examples/lightsoff/lightsoff.js | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 640bf8a43bef615d594e4dda3f372c3279cf2f77
@@ -25301,7 +26699,7 @@ Date:   Thu Oct 23 11:21:30 2008 +0000
     
     svn path=/trunk/; revision=24
 
- examples/lightsoff/lightsoff.js |    3 +--
+ examples/lightsoff/lightsoff.js | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 84dea08146319d2130320576e109a0b5de6ddefb
@@ -25312,7 +26710,7 @@ Date:   Thu Oct 23 11:18:50 2008 +0000
     
     svn path=/trunk/; revision=23
 
- examples/lightsoff/lightsoff.js |    2 +-
+ examples/lightsoff/lightsoff.js | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c9fd77e08efaf5459d3bad9b5e6f71eacc2ba319
@@ -25323,12 +26721,12 @@ Date:   Thu Oct 23 11:16:16 2008 +0000
     
     svn path=/trunk/; revision=22
 
- examples/lightsoff.js           |  126 ----------------------
- examples/lightsoff/lightsoff.js |  142 ++++++++++++++++++++++++
- examples/lightsoff/tim-off.svg  |  228 +++++++++++++++++++++++++++++++++++++++
- examples/lightsoff/tim-on.svg   |  204 +++++++++++++++++++++++++++++++++++
- examples/tim-off.svg            |  228 ---------------------------------------
- examples/tim-on.svg             |  204 -----------------------------------
+ examples/lightsoff.js           | 126 ----------------------
+ examples/lightsoff/lightsoff.js | 142 +++++++++++++++++++++++++
+ examples/lightsoff/tim-off.svg  | 228 ++++++++++++++++++++++++++++++++++++++++
+ examples/lightsoff/tim-on.svg   | 204 +++++++++++++++++++++++++++++++++++
+ examples/tim-off.svg            | 228 ----------------------------------------
+ examples/tim-on.svg             | 204 -----------------------------------
  6 files changed, 574 insertions(+), 558 deletions(-)
 
 commit d9419cbb05cf6a36014c1de77a09adcf943f02a0
@@ -25339,7 +26737,7 @@ Date:   Thu Oct 23 11:12:41 2008 +0000
     
     svn path=/trunk/; revision=21
 
- examples/lightsoff.js |  126 +++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/lightsoff.js | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 126 insertions(+)
 
 commit 40ff5f31a20bb9d0abc233df95985e978fd86a8b
@@ -25350,7 +26748,7 @@ Date:   Thu Oct 23 11:10:34 2008 +0000
     
     svn path=/trunk/; revision=20
 
- examples/lightsoff.js |  126 -------------------------------------------------
+ examples/lightsoff.js | 126 --------------------------------------------------
  1 file changed, 126 deletions(-)
 
 commit 2bbe610a7c6684eece4c26b2480b3449ca4522be
@@ -25361,7 +26759,7 @@ Date:   Thu Oct 23 10:36:38 2008 +0000
     
     svn path=/trunk/; revision=19
 
- examples/lightsoff.js |   28 +++++++++++++++++++++++-----
+ examples/lightsoff.js | 28 +++++++++++++++++++++++-----
  1 file changed, 23 insertions(+), 5 deletions(-)
 
 commit 3160601016f5b08aac74259712ba6d858d6092c9
@@ -25372,11 +26770,11 @@ Date:   Thu Oct 23 07:33:33 2008 +0000
     
     svn path=/trunk/; revision=18
 
- examples/black.png    |  Bin 213 -> 0 bytes
- examples/lightsoff.js |   24 +++---
- examples/tim-off.svg  |  228 +++++++++++++++++++++++++++++++++++++++++++++++++
- examples/tim-on.svg   |  204 +++++++++++++++++++++++++++++++++++++++++++
- examples/white.png    |  Bin 213 -> 0 bytes
+ examples/black.png    | Bin 213 -> 0 bytes
+ examples/lightsoff.js |  24 +++---
+ examples/tim-off.svg  | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/tim-on.svg   | 204 ++++++++++++++++++++++++++++++++++++++++++++
+ examples/white.png    | Bin 213 -> 0 bytes
  5 files changed, 442 insertions(+), 14 deletions(-)
 
 commit a269e2cd4d47a9f299a3d970e4224c9d59f05a0f
@@ -25387,9 +26785,9 @@ Date:   Thu Oct 23 05:25:28 2008 +0000
     
     svn path=/trunk/; revision=17
 
- examples/black.png    |  Bin 0 -> 213 bytes
- examples/lightsoff.js |  112 +++++++++++++++++++++++++++++++++++++++++++++++++
- examples/white.png    |  Bin 0 -> 213 bytes
+ examples/black.png    | Bin 0 -> 213 bytes
+ examples/lightsoff.js | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ examples/white.png    | Bin 0 -> 213 bytes
  3 files changed, 112 insertions(+)
 
 commit f5b959eba78d3daed1eac022000f620618137f10
@@ -25400,8 +26798,8 @@ Date:   Wed Oct 22 23:39:54 2008 +0000
     
     svn path=/trunk/; revision=16
 
- tests/compare.js          |   15 +++++++++++++++
- tests/json-constructor.js |    1 -
+ tests/compare.js          | 15 +++++++++++++++
+ tests/json-constructor.js |  1 -
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 409effe7c1ac85ff2ca445428543b7dae7df5b33
@@ -25412,7 +26810,7 @@ Date:   Wed Oct 22 23:28:29 2008 +0000
     
     svn path=/trunk/; revision=15
 
- libseed/seed-engine.c |    4 ++--
+ libseed/seed-engine.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7f16adf22e51b6086173958285200090a6c85e4e
@@ -25423,8 +26821,8 @@ Date:   Wed Oct 22 23:25:54 2008 +0000
     
     svn path=/trunk/; revision=14
 
- libseed/seed-types.h |    1 -
- libseed/seed.h       |   39 ++++++++++++++++++++++++++++++++++++++-
+ libseed/seed-types.h |  1 -
+ libseed/seed.h       | 39 ++++++++++++++++++++++++++++++++++++++-
  2 files changed, 38 insertions(+), 2 deletions(-)
 
 commit 8ac49ab87bb99f0c460abae45a093118d62643ae
@@ -25435,7 +26833,7 @@ Date:   Wed Oct 22 23:25:08 2008 +0000
     
     svn path=/trunk/; revision=13
 
- libseed/seed-engine.c |   30 ++++++++++++++++++++++++++++--
+ libseed/seed-engine.c | 30 ++++++++++++++++++++++++++++--
  1 file changed, 28 insertions(+), 2 deletions(-)
 
 commit ecba84fc0aa3b41c3a8ccfa11695e53932365794
@@ -25446,11 +26844,11 @@ Date:   Wed Oct 22 23:16:20 2008 +0000
     
     svn path=/trunk/; revision=12
 
- libseed/seed-builtins.c |    2 +-
- libseed/seed-engine.c   |   10 -
- libseed/seed-engine.h   |    1 -
- libseed/seed-types.c    |  973 ++++++++++++++++++++++-------------------------
- tests/run-tests.py      |    7 +-
+ libseed/seed-builtins.c |   2 +-
+ libseed/seed-engine.c   |  10 -
+ libseed/seed-engine.h   |   1 -
+ libseed/seed-types.c    | 973 +++++++++++++++++++++++-------------------------
+ tests/run-tests.py      |   7 +-
  5 files changed, 462 insertions(+), 531 deletions(-)
 
 commit c3b31ae05352386222c186e9fd4a2cdb4ee54306
@@ -25461,12 +26859,12 @@ Date:   Wed Oct 22 20:40:12 2008 +0000
     
     svn path=/trunk/; revision=11
 
- libseed/seed-engine.c  |    8 +-
- libseed/seed-private.h |    1 -
- libseed/seed-types.c   |  255 +++++++++++++++++++++++++++++++++++++++++++-----
- libseed/seed-types.h   |   41 +++++++-
- libseed/seed-utils.c   |   58 -----------
- libseed/seed-utils.h   |   27 -----
+ libseed/seed-engine.c  |   8 +-
+ libseed/seed-private.h |   1 -
+ libseed/seed-types.c   | 255 ++++++++++++++++++++++++++++++++++++++++++++-----
+ libseed/seed-types.h   |  41 +++++++-
+ libseed/seed-utils.c   |  58 -----------
+ libseed/seed-utils.h   |  27 ------
  6 files changed, 273 insertions(+), 117 deletions(-)
 
 commit c2e64f6ce6b3719c570b003019cf54ce6e854b6b
@@ -25477,8 +26875,8 @@ Date:   Wed Oct 22 19:48:03 2008 +0000
     
     svn path=/trunk/; revision=10
 
- doc/tutorial.html        |  198 ++++++++++++++++++++++++++++++++++++++++++----
- examples/mini-browser.js |   48 ++++++++---
+ doc/tutorial.html        | 198 +++++++++++++++++++++++++++++++++++++++++++----
+ examples/mini-browser.js |  48 +++++++++---
  2 files changed, 220 insertions(+), 26 deletions(-)
 
 commit 3894a7ad3d3817db59c3b20930c6a79b491eb009
@@ -25489,7 +26887,7 @@ Date:   Sat Oct 18 03:32:35 2008 +0000
     
     svn path=/trunk/; revision=9
 
- libseed/seed-engine.c |    7 +++----
+ libseed/seed-engine.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 17739edf4fdbcbeb40b22ca796e15ab86e61d57e
@@ -25500,7 +26898,7 @@ Date:   Sat Oct 18 03:31:07 2008 +0000
     
     svn path=/trunk/; revision=8
 
- examples/notify-test.js |   28 ++++++++++++++++++++++------
+ examples/notify-test.js | 28 ++++++++++++++++++++++------
  1 file changed, 22 insertions(+), 6 deletions(-)
 
 commit e2527aa4379bd3b82204d161ea080098fd3ad1bb
@@ -25512,8 +26910,8 @@ Date:   Sat Oct 18 03:06:06 2008 +0000
     
     svn path=/trunk/; revision=7
 
- libseed/seed-engine.c    |    2 +-
- tests/value-exception.js |   11 -----------
+ libseed/seed-engine.c    |  2 +-
+ tests/value-exception.js | 11 -----------
  2 files changed, 1 insertion(+), 12 deletions(-)
 
 commit ff7b82adab410d1c1792bfdccec8cb08bd67ed1b
@@ -25524,10 +26922,10 @@ Date:   Sat Oct 18 02:54:44 2008 +0000
     
     svn path=/trunk/; revision=6
 
- examples/ls.js        |   10 ++++++++++
- libseed/seed-engine.c |    2 +-
- libseed/seed-engine.h |    1 +
- libseed/seed-types.c  |   51 +++++++++++++++++++++++++++++++++++++------------
+ examples/ls.js        | 10 ++++++++++
+ libseed/seed-engine.c |  2 +-
+ libseed/seed-engine.h |  1 +
+ libseed/seed-types.c  | 51 +++++++++++++++++++++++++++++++++++++++------------
  4 files changed, 51 insertions(+), 13 deletions(-)
 
 commit 96ccf6daf7e3568101dbf720740418b277264ab7
@@ -25538,8 +26936,8 @@ Date:   Sat Oct 18 01:15:37 2008 +0000
     
     svn path=/trunk/; revision=5
 
- libseed/seed-engine.c  |   11 ++++++-----
- libseed/seed-signals.c |    2 +-
+ libseed/seed-engine.c  | 11 ++++++-----
+ libseed/seed-signals.c |  2 +-
  2 files changed, 7 insertions(+), 6 deletions(-)
 
 commit 636e672b9feb9a134ba20711bc3b8fcbd81976bb
@@ -25550,8 +26948,8 @@ Date:   Fri Oct 17 22:59:41 2008 +0000
     
     svn path=/trunk/; revision=4
 
- libseed/seed-engine.c |    8 ++++++--
- tests/enum.js         |   12 +++++++++---
+ libseed/seed-engine.c |  8 ++++++--
+ tests/enum.js         | 12 +++++++++---
  2 files changed, 15 insertions(+), 5 deletions(-)
 
 commit 5c00a757273df6eb71adee45b0c3c770358c2612
@@ -25562,44 +26960,44 @@ Date:   Fri Oct 17 21:51:25 2008 +0000
     
     svn path=/trunk/; revision=3
 
- AUTHORS                     |    3 +
- COPYING                     |  675 ++++++++++++++++++++++++++++++++
- Makefile                    |    8 +
- TODO                        |    1 +
- doc/tutorial.html           |   78 ++++
- examples/calculator.js      |  151 ++++++++
- examples/clutter-test.js    |   13 +
- examples/mini-browser.js    |  136 +++++++
- examples/n-oscillator.js    |   99 +++++
- examples/notify-test.js     |    9 +
- examples/repl.js            |   13 +
- examples/spacewhale.js      |  119 ++++++
- examples/vte-test.js        |   30 ++
- libseed/Makefile            |    5 +
- libseed/seed-builtins.c     |  126 ++++++
- libseed/seed-builtins.h     |   55 +++
- libseed/seed-engine.c       |  897 +++++++++++++++++++++++++++++++++++++++++++
- libseed/seed-engine.h       |   45 +++
- libseed/seed-private.h      |   47 +++
- libseed/seed-signals.c      |  224 +++++++++++
- libseed/seed-signals.h      |   30 ++
- libseed/seed-structs.c      |  223 +++++++++++
- libseed/seed-structs.h      |   26 ++
- libseed/seed-types.c        |  812 +++++++++++++++++++++++++++++++++++++++
- libseed/seed-types.h        |   44 +++
- libseed/seed-utils.c        |   58 +++
- libseed/seed-utils.h        |   27 ++
- libseed/seed.h              |   50 +++
- main.c                      |   78 ++++
- tests/enum.js               |    9 +
- tests/include.js            |    7 +
- tests/json-constructor.js   |   16 +
- tests/print.js              |    7 +
- tests/property-benchmark.js |   17 +
- tests/readline.js           |    7 +
- tests/run-tests.py          |   77 ++++
- tests/signal.js             |   18 +
- tests/value-exception.js    |   11 +
+ AUTHORS                     |   3 +
+ COPYING                     | 675 +++++++++++++++++++++++++++++++++
+ Makefile                    |   8 +
+ TODO                        |   1 +
+ doc/tutorial.html           |  78 ++++
+ examples/calculator.js      | 151 ++++++++
+ examples/clutter-test.js    |  13 +
+ examples/mini-browser.js    | 136 +++++++
+ examples/n-oscillator.js    |  99 +++++
+ examples/notify-test.js     |   9 +
+ examples/repl.js            |  13 +
+ examples/spacewhale.js      | 119 ++++++
+ examples/vte-test.js        |  30 ++
+ libseed/Makefile            |   5 +
+ libseed/seed-builtins.c     | 126 +++++++
+ libseed/seed-builtins.h     |  55 +++
+ libseed/seed-engine.c       | 897 ++++++++++++++++++++++++++++++++++++++++++++
+ libseed/seed-engine.h       |  45 +++
+ libseed/seed-private.h      |  47 +++
+ libseed/seed-signals.c      | 224 +++++++++++
+ libseed/seed-signals.h      |  30 ++
+ libseed/seed-structs.c      | 223 +++++++++++
+ libseed/seed-structs.h      |  26 ++
+ libseed/seed-types.c        | 812 +++++++++++++++++++++++++++++++++++++++
+ libseed/seed-types.h        |  44 +++
+ libseed/seed-utils.c        |  58 +++
+ libseed/seed-utils.h        |  27 ++
+ libseed/seed.h              |  50 +++
+ main.c                      |  78 ++++
+ tests/enum.js               |   9 +
+ tests/include.js            |   7 +
+ tests/json-constructor.js   |  16 +
+ tests/print.js              |   7 +
+ tests/property-benchmark.js |  17 +
+ tests/readline.js           |   7 +
+ tests/run-tests.py          |  77 ++++
+ tests/signal.js             |  18 +
+ tests/value-exception.js    |  11 +
  38 files changed, 4251 insertions(+)
 
 commit 4c001fdda92269656be56fe04c9f40dc68ea1762
@@ -25610,5 +27008,5 @@ Date:   Fri Oct 17 21:47:29 2008 +0000
     
     svn path=/trunk/; revision=2
 
- MAINTAINERS |    3 +++
+ MAINTAINERS | 3 +++
  1 file changed, 3 insertions(+)
diff --git a/INSTALL b/INSTALL
index a1e89e1..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./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
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -367,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 30613d0..af1eb02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 
 SUBDIRS = po \
+	jsextensions \
 	libseed \
+	libgjs-private \
 	src \
-	extensions \
 	modules \
 	tests \
 	doc
@@ -24,8 +26,6 @@ man_MANS = doc/seed.1
 
 EXTRA_DIST = $(pkgconfig_DATA)
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
-
 profile-reset:
 	find -name '*.gcda' -delete
 
@@ -56,10 +56,14 @@ if PROFILE_MODULES
 	cd modules/sqlite/.libs ; gcov *.c
 endif
 
+if PROFILE_MODULES
+	cp modules/gjs/system/*.c modules/system/.libs/
+endif
+
 profile-gui: profile
 
 if PROFILE_MODULES
-	lcov --directory libseed/.libs --directory modules/cairo/.libs --directory modules/canvas/.libs --directory modules/dbus/.libs --directory modules/example/.libs --directory modules/gettext/.libs --directory modules/gtkbuilder/.libs --directory modules/libxml/.libs --directory modules/os/.libs --directory modules/readline/.libs --directory modules/sandbox/.libs --directory modules/sqlite/.libs --capture --output-file seed.info
+	lcov --directory libseed/.libs --directory modules/cairo/.libs --directory modules/canvas/.libs --directory modules/dbus/.libs --directory modules/example/.libs --directory modules/system/.libs --directory modules/gettext/.libs --directory modules/gtkbuilder/.libs --directory modules/libxml/.libs --directory modules/os/.libs --directory modules/readline/.libs --directory modules/sandbox/.libs --directory modules/sqlite/.libs --capture --output-file seed.info
 else
 	lcov --directory libseed/.libs --capture --output-file seed.info
 endif
diff --git a/Makefile.in b/Makefile.in
index fa5627a..110d284 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,36 +89,44 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/seed.pc.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
-	install-sh ltmain.sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = seed.pc
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -122,12 +167,38 @@ MANS = $(man_MANS)
 DATA = $(doc_DATA) $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/seed.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+	README compile config.guess config.sub install-sh ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -137,6 +208,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -164,6 +236,7 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -230,6 +303,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -243,6 +318,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -266,8 +342,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -279,6 +364,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -373,6 +459,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -382,10 +469,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 SUBDIRS = po \
+	jsextensions \
 	libseed \
+	libgjs-private \
 	src \
-	extensions \
 	modules \
 	tests \
 	doc
@@ -401,7 +490,6 @@ pkgconfig_DATA = seed.pc
 pkgconfigdir = $(libdir)/pkgconfig
 man_MANS = doc/seed.1
 EXTRA_DIST = $(pkgconfig_DATA)
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -421,7 +509,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -442,8 +529,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -553,22 +640,25 @@ uninstall-pkgconfigDATA:
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -583,57 +673,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -649,12 +694,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -666,15 +706,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -683,24 +719,33 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -769,40 +814,42 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -813,8 +860,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -826,18 +871,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -860,7 +906,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -1000,28 +1046,29 @@ uninstall-am: uninstall-docDATA uninstall-man uninstall-pkgconfigDATA
 
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-docDATA uninstall-man uninstall-man1 \
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-pkgconfigDATA \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-docDATA uninstall-man uninstall-man1 \
 	uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 profile-reset:
 	find -name '*.gcda' -delete
@@ -1049,9 +1096,11 @@ profile: profile-reset check
 @PROFILE_MODULES_TRUE@	cd modules/sandbox/.libs ; gcov *.c
 @PROFILE_MODULES_TRUE@	cd modules/sqlite/.libs ; gcov *.c
 
+@PROFILE_MODULES_TRUE@	cp modules/gjs/system/*.c modules/system/.libs/
+
 profile-gui: profile
 
-@PROFILE_MODULES_TRUE@	lcov --directory libseed/.libs --directory modules/cairo/.libs --directory modules/canvas/.libs --directory modules/dbus/.libs --directory modules/example/.libs --directory modules/gettext/.libs --directory modules/gtkbuilder/.libs --directory modules/libxml/.libs --directory modules/os/.libs --directory modules/readline/.libs --directory modules/sandbox/.libs --directory modules/sqlite/.libs --capture --output-file seed.info
+@PROFILE_MODULES_TRUE@	lcov --directory libseed/.libs --directory modules/cairo/.libs --directory modules/canvas/.libs --directory modules/dbus/.libs --directory modules/example/.libs --directory modules/system/.libs --directory modules/gettext/.libs --directory modules/gtkbuilder/.libs --directory modules/libxml/.libs --directory modules/os/.libs --directory modules/readline/.libs --directory modules/sandbox/.libs --directory modules/sqlite/.libs --capture --output-file seed.info
 @PROFILE_MODULES_FALSE@	lcov --directory libseed/.libs --capture --output-file seed.info
 
 	cp seed.info /tmp/
diff --git a/aclocal.m4 b/aclocal.m4
index 88b71c1..efe018b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 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.
@@ -12,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 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'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -335,9 +335,8 @@ msgstr ""
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -406,7 +405,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
+  ],
+  [[$0: This macro is deprecated. You should use upstream gettext instead.]])
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
@@ -458,8908 +458,116 @@ fi])
 
 
 dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
-  dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
-  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
-  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH([html-dir],
-    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST([HTML_DIR])
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE([gtk-doc],
-    AS_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [[default=no]]]),,
-    [enable_gtk_doc=no])
-
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-    dnl don't check for glib if we build glib
-    if test "x$PACKAGE_NAME" != "xglib"; then
-      dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to build gtk-doc documentation])
-  AC_MSG_RESULT($enable_gtk_doc)
-
-  dnl enable/disable output formats
-  AC_ARG_ENABLE([gtk-doc-html],
-    AS_HELP_STRING([--enable-gtk-doc-html],
-                   [build documentation in html format [[default=yes]]]),,
-    [enable_gtk_doc_html=yes])
-    AC_ARG_ENABLE([gtk-doc-pdf],
-      AS_HELP_STRING([--enable-gtk-doc-pdf],
-                     [build documentation in pdf format [[default=no]]]),,
-      [enable_gtk_doc_pdf=no])
-
-  if test -z "$GTKDOC_MKPDF"; then
-    enable_gtk_doc_pdf=no
-  fi
-
-
-  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
-  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
-  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
-  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])
-
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-# 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 Copyright 2009 Johan Dahlin
 dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
 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
-])
 
+# serial 1
 
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
 [
-  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)
-      ])
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),, 
+                                 [enable_introspection=auto])
+    ])dnl
+
+    AC_MSG_CHECKING([for gobject-introspection])
+
+    dnl presence/version checking
+    AS_CASE([$enable_introspection],
+    [no], [dnl
+        found_introspection="no (disabled, use --enable-introspection to enable)"
+    ],dnl
+    [yes],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+                         found_introspection=yes,
+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+    ],dnl
+    [auto],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
+    ],dnl
+    [dnl	
+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+    ])dnl
+
+    AC_MSG_RESULT([$found_introspection])
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
     fi
+    AC_SUBST(INTROSPECTION_SCANNER)
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
 
-    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*
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 ])
-_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
-
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
 
-# _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],
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
 [
-# 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
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
 ])
-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
-      ;;
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
 
-    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
-],
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
 [
-  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.])
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
 ])
 
-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])])
-
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -9379,32 +587,63 @@ AC_DEFUN([AM_NLS],
   AC_SUBST([USE_NLS])
 ])
 
-# 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])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 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)))?$])
@@ -9426,18 +665,19 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])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
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -9447,8 +687,10 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -9460,10 +702,11 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -9471,19 +714,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])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
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl 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
@@ -9537,27 +778,107 @@ else
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9573,24 +894,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -9609,7 +928,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -9627,30 +946,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 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 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -9669,16 +984,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -9688,7 +1001,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -9701,12 +1014,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -9714,8 +1028,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -9755,16 +1069,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -9773,8 +1087,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -9782,7 +1096,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -9830,7 +1144,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -9840,9 +1154,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -9857,20 +1175,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 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_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -9883,7 +1199,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -9895,21 +1211,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -9927,7 +1241,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -9937,18 +1251,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 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 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -9961,7 +1278,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9990,33 +1307,42 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -10025,34 +1351,82 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -10074,21 +1448,18 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -10096,16 +1467,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -10122,20 +1491,17 @@ 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.
+# Copyright (C) 1996-2014 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
+# 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]),
@@ -10146,10 +1512,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 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]))
+    [AS_HELP_STRING([--]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
@@ -10157,18 +1524,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-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.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -10186,7 +1549,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -10211,52 +1574,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -10264,11 +1589,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -10281,54 +1605,22 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 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 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2014 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_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -10338,7 +1630,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -10352,24 +1644,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 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_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -10380,32 +1730,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -10415,31 +1773,50 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -10457,7 +1834,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
@@ -10474,44 +1851,40 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -10525,18 +1898,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -10546,77 +1917,122 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gtk-doc.m4])
+m4_include([m4/intltool.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])
diff --git a/compile b/compile
index 862a14e..a85b723 100755
--- a/compile
+++ b/compile
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -113,6 +112,11 @@ func_cl_dashl ()
       lib=$dir/$lib.lib
       break
     fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
   done
   IFS=$save_IFS
 
diff --git a/config.guess b/config.guess
index d622a44..1659250 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2015-08-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # 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.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches@gnu.org>.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -153,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -182,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -192,13 +221,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -216,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -302,7 +338,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -560,8 +596,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -801,10 +838,13 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -852,21 +892,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +919,57 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -950,54 +988,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1248,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,19 +1277,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1318,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,157 +1392,6 @@ EOF
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/config.h.in b/config.h.in
index 17f2ef0..b73e58d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -27,6 +27,9 @@
 /* Define to 1 if you have the `webkitgtk-3.0' library (-lwebkitgtk-3.0). */
 #undef HAVE_LIBWEBKITGTK_3_0
 
+/* Define to 1 if you have the `webkitgtk-4.0' library (-lwebkitgtk-4.0). */
+#undef HAVE_LIBWEBKITGTK_4_0
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
@@ -57,13 +60,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE
 
diff --git a/config.sub b/config.sub
index 6205f84..1acc966 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2012-04-18'
+timestamp='2015-08-20'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 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.
+# 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, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
 # 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.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,8 +116,8 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -156,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -259,21 +252,25 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| ba \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -287,26 +284,29 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -314,6 +314,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -328,7 +329,10 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -370,26 +374,29 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -403,28 +410,33 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -432,6 +444,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -508,6 +521,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+        asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -769,6 +785,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -788,11 +807,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -820,6 +843,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -828,7 +855,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1019,7 +1046,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1346,29 +1377,29 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1492,9 +1523,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1543,6 +1571,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
diff --git a/configure b/configure
index 82eb1bf..7897bb8 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 seed 3.8.1.
+# Generated by GNU Autoconf 2.69 for seed 4.0.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='seed'
 PACKAGE_TARNAME='seed'
-PACKAGE_VERSION='3.8.1'
-PACKAGE_STRING='seed 3.8.1'
+PACKAGE_VERSION='4.0.0'
+PACKAGE_STRING='seed 4.0.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -642,11 +642,14 @@ GTK_DOC_BUILD_HTML_FALSE
 GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
+HAVE_GTK_DOC_FALSE
+HAVE_GTK_DOC_TRUE
 GTKDOC_DEPS_LIBS
 GTKDOC_DEPS_CFLAGS
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
+GTKDOC_CHECK_PATH
 GTKDOC_CHECK
 SEED_DEBUG_CFLAGS
 PROFILE_MODULES_FALSE
@@ -677,6 +680,7 @@ BUILD_LIBXML_MODULE_TRUE
 LIBXML_LDFLAGS
 LIBXML_LIBS
 LIBXML_CFLAGS
+LIBDL
 BUILD_FFI_MODULE
 BUILD_FFI_MODULE_FALSE
 BUILD_FFI_MODULE_TRUE
@@ -721,6 +725,8 @@ GDK_CFLAGS
 CAIRO_LDFLAGS
 CAIRO_LIBS
 CAIRO_CFLAGS
+GMODULE_LIBS
+GMODULE_CFLAGS
 GIO_LIBS
 GIO_CFLAGS
 GTHREAD_LIBS
@@ -732,6 +738,16 @@ GOBJECT_INTROSPECTION_VERSION
 GOBJECT_INTROSPECTION_LDFLAGS
 GOBJECT_INTROSPECTION_LIBS
 GOBJECT_INTROSPECTION_CFLAGS
+HAVE_INTROSPECTION_FALSE
+HAVE_INTROSPECTION_TRUE
+INTROSPECTION_MAKEFILE
+INTROSPECTION_LIBS
+INTROSPECTION_CFLAGS
+INTROSPECTION_TYPELIBDIR
+INTROSPECTION_GIRDIR
+INTROSPECTION_GENERATE
+INTROSPECTION_COMPILER
+INTROSPECTION_SCANNER
 SEED_GTK_VERSION
 WEBKIT_LDFLAGS
 WEBKIT_PC
@@ -788,14 +804,11 @@ MSGFMT_OPTS
 MSGFMT
 USE_NLS
 GETTEXT_PACKAGE
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 CPP
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -845,6 +858,10 @@ build
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -887,6 +904,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -909,18 +927,20 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_shared
 enable_static
 with_pic
 enable_fast_install
+with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
-enable_silent_rules
 enable_nls
 with_webkit
+enable_introspection
 enable_canvas_module
 enable_readline_module
 enable_multiprocessing_module
@@ -952,6 +972,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+LT_SYS_LIBRARY_PATH
 CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
@@ -968,6 +989,8 @@ GTHREAD_CFLAGS
 GTHREAD_LIBS
 GIO_CFLAGS
 GIO_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
 GDK_CFLAGS
@@ -1024,6 +1047,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1276,6 +1300,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1413,7 +1446,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1526,7 +1559,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 seed 3.8.1 to adapt to many kinds of systems.
+\`configure' configures seed 4.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1566,6 +1599,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1596,7 +1630,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of seed 3.8.1:";;
+     short | recursive ) echo "Configuration of seed 4.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1604,18 +1638,23 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-maintainer-mode  disable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-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-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
   --disable-nls           do not use Native Language Support
+  --enable-introspection=[no/auto/yes]
+                          Enable introspection for this build
   --enable-canvas-module  enable the canvas Seed module. [default=yes]
   --enable-readline-module
                           enable the readline Seed module. [default=yes]
@@ -1649,10 +1688,14 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
   --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-webkit=[3.0/1.0] Select the Webkit backend, default=3.0
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+  --with-webkit=[4.0/3.0/1.0]
+                          Select the Webkit backend, default=4.0
   --with-html-dir=PATH    path to installed docs
 
 Some influential environment variables:
@@ -1663,6 +1706,8 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
@@ -1689,6 +1734,10 @@ Some influential environment variables:
               linker flags for GTHREAD, overriding pkg-config
   GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
   GIO_LIBS    linker flags for GIO, overriding pkg-config
+  GMODULE_CFLAGS
+              C compiler flags for GMODULE, overriding pkg-config
+  GMODULE_LIBS
+              linker flags for GMODULE, overriding pkg-config
   CAIRO_CFLAGS
               C compiler flags for CAIRO, overriding pkg-config
   CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
@@ -1782,7 +1831,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-seed configure 3.8.1
+seed configure 4.0.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2147,7 +2196,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 seed $as_me 3.8.1, which was
+It was created by seed $as_me 4.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2496,7 +2545,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.11'
+am__api_version='1.15'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2622,9 +2671,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2635,32 +2681,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2672,6 +2726,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2682,8 +2746,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2694,15 +2758,15 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2711,10 +2775,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2853,12 +2917,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2941,6 +2999,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2963,7 +3060,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='seed'
- VERSION='3.8.1'
+ VERSION='4.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2991,12 +3088,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
@@ -3004,6 +3111,49 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+
 { $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.
@@ -3029,6 +3179,7 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -3889,6 +4040,65 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3908,7 +4118,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3964,8 +4174,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -4000,16 +4210,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4018,8 +4228,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -4027,7 +4237,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4081,131 +4291,6 @@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 case `pwd` in
   *\ * | *\	*)
@@ -4215,8 +4300,8 @@ esac
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -4230,7 +4315,7 @@ macro_revision='1.3337'
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
@@ -4279,7 +4364,7 @@ func_echo_all ()
     $ECHO ""
 }
 
-case "$ECHO" in
+case $ECHO in
   printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 $as_echo "printf" >&6; } ;;
   print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -4602,19 +4687,19 @@ test -z "$GREP" && GREP=grep
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets 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` ;;
@@ -4628,7 +4713,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
       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"
+      test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -4639,7 +4724,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     with_gnu_ld=unknown
     ;;
   esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -4650,32 +4735,32 @@ if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
+    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"
+      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 no != "$with_gnu_ld" && break
 	;;
       *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
-  IFS="$lt_save_ifs"
+  IFS=$lt_save_ifs
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -4718,33 +4803,38 @@ if ${lt_cv_path_NM+:} false; then :
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  lt_cv_path_NM=$NM
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
+  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
+    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"
+      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
+      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:
+	# 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'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
-	  break
+	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
-	    break
+	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -4755,15 +4845,15 @@ else
 	esac
       fi
     done
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
   if test -n "$DUMPBIN"; then :
@@ -4869,9 +4959,9 @@ esac
   fi
 fi
 
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
     *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
+      DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
     *)
       DUMPBIN=:
@@ -4879,8 +4969,8 @@ fi
     esac
   fi
 
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
@@ -4931,7 +5021,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
-  teststring="ABCD"
+  teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
@@ -4971,7 +5061,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # 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`
@@ -5021,22 +5111,23 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$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
+      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` \
+      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
+	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
@@ -5054,7 +5145,7 @@ else
 
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
@@ -5072,30 +5163,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
@@ -5218,13 +5285,13 @@ esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
+    if test yes != "$GCC"; then
       reload_cmds=false
     fi
     ;;
   darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -5352,13 +5419,13 @@ 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.
+# '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.
+# that 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]*)
@@ -5385,8 +5452,7 @@ 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
+  if ( 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
@@ -5422,10 +5488,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5464,7 +5526,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
   ;;
 
@@ -5486,8 +5548,8 @@ newos6*)
   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
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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)$'
@@ -5540,6 +5602,9 @@ sysv4 | sysv4.3*)
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
 esac
 
 fi
@@ -5697,8 +5762,8 @@ else
 
 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
+  # two different shell functions defined in ltmain.sh;
+  # decide which one 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
@@ -5710,7 +5775,7 @@ cygwin* | mingw* | pw32* | cegcc*)
   ;;
 *)
   # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 
@@ -5865,7 +5930,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
+      if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -5873,7 +5938,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
+	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
@@ -5886,7 +5951,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 $as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
@@ -6103,7 +6168,7 @@ old_postuninstall_cmds=
 
 if test -n "$RANLIB"; then
   case $host_os in
-  openbsd*)
+  bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
@@ -6193,7 +6258,7 @@ cygwin* | mingw* | pw32* | cegcc*)
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     symcode='[ABCDEGRST]'
   fi
   ;;
@@ -6226,14 +6291,44 @@ case `$NM -V 2>&1` in
   symcode='[ABCDGIRSTW]' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
 # 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'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$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'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6251,21 +6346,24 @@ for ac_symprfx in "" "_"; do
 
   # 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.
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported 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};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 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))}"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,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'"
@@ -6313,11 +6411,11 @@ _LT_EOF
 	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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
@@ -6343,7 +6441,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
@@ -6363,13 +6461,13 @@ _LT_EOF
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
+	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
@@ -6390,7 +6488,7 @@ _LT_EOF
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
+  if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
@@ -6443,6 +6541,16 @@ fi
 
 
 
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
@@ -6455,9 +6563,9 @@ fi
 
 
 lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
  yes)
-   if test "$GCC" = yes; then
+   if test yes = "$GCC"; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
@@ -6467,8 +6575,8 @@ case ${with_sysroot} in #(
  no|'')
    ;; #(
  *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
@@ -6480,18 +6588,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || 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.
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6500,24 +6689,25 @@ ia64-*-hpux*)
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
@@ -6546,9 +6736,50 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6562,9 +6793,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -6583,7 +6824,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -6601,7 +6845,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
+  SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -6641,13 +6885,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+  if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
+    CFLAGS=$SAVE_CFLAGS
   fi
   ;;
 *-*solaris*)
-  # Find out which ABI we are using.
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -6659,7 +6904,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*)
+        i?86-*-solaris*|x86_64-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
@@ -6668,7 +6913,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
         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"
+          LD=${LD-ld}_sol2
         fi
         ;;
       *)
@@ -6684,7 +6929,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
   ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -6795,7 +7040,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 $as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 
@@ -7298,7 +7543,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
+      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
@@ -7316,7 +7561,7 @@ else
 	  cat conftest.err >&5
 	# 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
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7355,7 +7600,7 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -7384,7 +7629,7 @@ _LT_EOF
       _lt_result=$?
       if test -s conftest.err && $GREP force_load conftest.err; then
 	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7397,32 +7642,32 @@ fi
 $as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+      _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' ;;
+	  _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' ;;
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+    if test yes = "$lt_cv_apple_cc_single_mod"; 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'
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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}'
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -7430,6 +7675,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
     ;;
   esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7733,14 +8013,14 @@ if test "${enable_shared+set}" = set; then :
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -7764,14 +8044,14 @@ if test "${enable_static+set}" = set; then :
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -7795,14 +8075,14 @@ if test "${with_pic+set}" = set; then :
     *)
       pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -7810,8 +8090,6 @@ else
 fi
 
 
-test -z "$pic_mode" && pic_mode=default
-
 
 
 
@@ -7827,14 +8105,14 @@ if test "${enable_fast_install+set}" = set; then :
     *)
       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,"
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
-      IFS="$lt_save_ifs"
+      IFS=$lt_save_ifs
       ;;
     esac
 else
@@ -7848,11 +8126,63 @@ fi
 
 
 
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
 
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7901,7 +8231,7 @@ test -z "$LN_S" && LN_S="ln -s"
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
@@ -7940,7 +8270,7 @@ 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
+  if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
@@ -7951,14 +8281,14 @@ esac
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# 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"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -7967,15 +8297,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; 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-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -7990,22 +8313,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  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
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
       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"
+	  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
 	    :
@@ -8028,13 +8351,13 @@ _LT_EOF
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -8056,22 +8379,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  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
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
+    IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
       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"
+	  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
 	    :
@@ -8094,13 +8417,13 @@ _LT_EOF
       break
     fi
   done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -8121,7 +8444,7 @@ esac
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8175,11 +8498,15 @@ _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=
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -8195,7 +8522,7 @@ else
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
    # 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
@@ -8225,7 +8552,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
     :
@@ -8243,17 +8570,18 @@ lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
 
-  if test "$GCC" = yes; then
+  if test yes = "$GCC"; then
     lt_prog_compiler_wl='-Wl,'
     lt_prog_compiler_static='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
+      lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
@@ -8264,8 +8592,8 @@ lt_prog_compiler_static=
         ;;
       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'.
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
             lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
@@ -8281,6 +8609,11 @@ lt_prog_compiler_static=
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -8351,7 +8684,7 @@ lt_prog_compiler_static=
     case $host_os in
     aix*)
       lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
@@ -8359,10 +8692,29 @@ lt_prog_compiler_static=
       fi
       ;;
 
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+      esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -8378,7 +8730,7 @@ lt_prog_compiler_static=
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      lt_prog_compiler_static='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
@@ -8387,9 +8739,9 @@ 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.
+      # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -8414,6 +8766,12 @@ lt_prog_compiler_static=
 	lt_prog_compiler_pic='-PIC'
 	lt_prog_compiler_static='-Bstatic'
 	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -8511,7 +8869,7 @@ lt_prog_compiler_static=
       ;;
 
     sysv4*MP*)
-      if test -d /usr/nec ;then
+      if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
       fi
@@ -8540,7 +8898,7 @@ lt_prog_compiler_static=
   fi
 
 case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
+  # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
@@ -8572,7 +8930,7 @@ else
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # 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
@@ -8602,7 +8960,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8634,7 +8992,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -8653,13 +9011,13 @@ else
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
@@ -8779,8 +9137,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -8792,9 +9150,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -8837,9 +9195,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   # included in the symbol list
   include_expsyms=
   # 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'.
+  # 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'.
   exclude_expsyms='_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
@@ -8854,7 +9212,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     # 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
+    if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
@@ -8862,7 +9220,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
-  openbsd*)
+  openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   linux* | k*bsd*-gnu | gnu*)
@@ -8875,7 +9233,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   # 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
+  if test yes = "$with_gnu_ld"; then
     case $host_os in
       aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
@@ -8897,24 +9255,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     esac
   fi
 
-  if test "$lt_use_gnu_ld_interface" = yes; then
+  if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
+    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
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$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
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>&1` in
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 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 ...
@@ -8927,7 +9285,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     case $host_os in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
+      if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
@@ -8946,7 +9304,7 @@ _LT_EOF
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -8962,7 +9320,7 @@ _LT_EOF
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -8972,7 +9330,7 @@ _LT_EOF
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
@@ -8980,61 +9338,89 @@ _LT_EOF
       exclude_expsyms='[_]+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
-        archive_cmds='$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...
-	archive_expsym_cmds='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'
+        archive_cmds='$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, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; 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
 	ld_shlibs=no
       fi
       ;;
 
     haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       link_all_deplibs=yes
       ;;
 
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$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.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='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'
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='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
+      if test linux-dietlibc = "$host_os"; 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
+	 && test no = "$tmp_diet"
       then
 	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${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'
+	  whole_archive_flag_spec='$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
-	  whole_archive_flag_spec='${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'
+	  whole_archive_flag_spec='$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' ;;
@@ -9045,42 +9431,47 @@ _LT_EOF
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-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
-	  whole_archive_flag_spec='${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'
+	  whole_archive_flag_spec='$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'
 	  compiler_needs_object=yes
 	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${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'
+	  whole_archive_flag_spec='$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'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
-        if test "x$supports_anon_versioning" = xyes; then
+        if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='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'
+            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
+	tcc*)
+	  export_dynamic_flag_spec='-rdynamic'
+	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
+	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='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'
+              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
@@ -9094,8 +9485,8 @@ _LT_EOF
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -9113,8 +9504,8 @@ _LT_EOF
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9126,7 +9517,7 @@ _LT_EOF
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** 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
@@ -9141,9 +9532,9 @@ _LT_EOF
 	  # 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
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -9160,15 +9551,15 @@ _LT_EOF
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
-    if test "$ld_shlibs" = no; then
+    if test no = "$ld_shlibs"; then
       runpath_var=
       hardcode_libdir_flag_spec=
       export_dynamic_flag_spec=
@@ -9184,7 +9575,7 @@ _LT_EOF
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -9192,34 +9583,57 @@ _LT_EOF
       ;;
 
     aix[4-9]*)
-      if test "$host_cpu" = ia64; then
+      if test ia64 = "$host_cpu"; 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=""
+	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".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
 	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
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
 	  ;;
 	esac
 
@@ -9238,13 +9652,21 @@ _LT_EOF
       hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+      esac
 
-      if test "$GCC" = yes; then
+      if test yes = "$GCC"; 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`
+	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
@@ -9263,36 +9685,42 @@ _LT_EOF
 	  ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
 	fi
-	link_all_deplibs=no
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; 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'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
 	  else
-	    shared_flag='${wl}-bM:SRE'
+	    shared_flag='$wl-bM:SRE'
 	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
-      export_dynamic_flag_spec='${wl}-bexpall'
+      export_dynamic_flag_spec='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
+        if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
@@ -9327,7 +9755,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
@@ -9335,17 +9763,17 @@ fi
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$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"
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; 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
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$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"
+	  archive_expsym_cmds="\$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.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
+	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
@@ -9380,7 +9808,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
+    lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
@@ -9388,21 +9816,33 @@ fi
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 hardcode_libdir_flag_spec='$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.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
+	  no_undefined_flag=' $wl-bernotok'
+	  allow_undefined_flag=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
 	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 	  else
 	    # Exported symbols can be pulled into shared objects from archives
 	    whole_archive_flag_spec='$convenience'
 	  fi
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$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'
+	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
@@ -9411,7 +9851,7 @@ fi
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
@@ -9441,16 +9881,17 @@ fi
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='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='
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $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, )='true'
 	enable_shared_with_static_runtimes=yes
@@ -9459,18 +9900,18 @@ fi
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
 	postlink_cmds='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'
+          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
@@ -9479,7 +9920,7 @@ fi
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$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.
@@ -9498,24 +9939,24 @@ fi
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
   else
     whole_archive_flag_spec=''
   fi
   link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
+  allow_undefined_flag=$_lt_dar_allow_undefined
   case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
-  if test "$_lt_dar_can_shared" = "yes"; then
+  if test yes = "$_lt_dar_can_shared"; then
     output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="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}"
-    module_expsym_cmds="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}"
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="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"
+    module_expsym_cmds="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"
 
   else
   ld_shlibs=no
@@ -9557,33 +9998,33 @@ fi
       ;;
 
     hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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'
+      if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
-	archive_cmds='$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'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
+      export_dynamic_flag_spec='$wl-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
+	export_dynamic_flag_spec='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -9591,25 +10032,25 @@ fi
       ;;
 
     hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+      if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$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*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 
@@ -9621,7 +10062,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
+   save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9640,14 +10081,14 @@ else
      fi
    fi
    $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
+   LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 $as_echo "$lt_cv_prog_compiler__b" >&6; }
 
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 else
     archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 fi
@@ -9655,8 +10096,8 @@ fi
 	  ;;
 	esac
       fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
@@ -9667,7 +10108,7 @@ fi
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
+	  export_dynamic_flag_spec='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
@@ -9678,8 +10119,8 @@ fi
       ;;
 
     irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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'
+      if test yes = "$GCC"; then
+	archive_cmds='$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.
@@ -9689,8 +10130,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
 if ${lt_cv_irix_exported_symbol+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+  save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (void) { return 0; }
@@ -9702,24 +10143,35 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
+           LDFLAGS=$save_LDFLAGS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 $as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$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'
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$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
+	link_all_deplibs=no
       else
-	archive_cmds='$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'
-	archive_expsym_cmds='$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'
+	archive_cmds='$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'
+	archive_expsym_cmds='$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
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
     netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -9734,7 +10186,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
     newsos6)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
@@ -9742,27 +10194,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
     *nto* | *qnx*)
       ;;
 
-    openbsd*)
+    openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	  export_dynamic_flag_spec='$wl-E'
 	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs=no
@@ -9773,33 +10217,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$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'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
       ;;
 
     osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$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
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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'
+	archive_cmds='$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
       archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$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'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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'
+	archive_cmds='$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'
 	archive_expsym_cmds='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'
+          $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
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -9810,24 +10274,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 
     solaris*)
       no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='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'
+          $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=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds='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'
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  wlarc='$wl'
+	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='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'
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
@@ -9837,11 +10301,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       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 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
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 	fi
@@ -9851,10 +10315,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       ;;
 
     sunos4*)
-      if test "x$host_vendor" = xsequent; then
+      if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -9903,43 +10367,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
+      no_undefined_flag='$wl-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$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
+      # Note: We CANNOT 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.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
+      export_dynamic_flag_spec='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -9954,10 +10418,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       ;;
     esac
 
-    if test x$host_vendor = xsni; then
+    if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
@@ -9965,7 +10429,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
@@ -9991,7 +10455,7 @@ x|xyes)
   # Assume -lc should be added
   archive_cmds_need_lc=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+  if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
@@ -10206,14 +10670,14 @@ esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
   case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
+    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" ;;
+    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
@@ -10229,28 +10693,35 @@ if test "$GCC" = yes; then
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
+  # 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`
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
   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
+    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"
+    elif test -n "$lt_multi_os_dir"; then
       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;
+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;
+          lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
@@ -10264,7 +10735,7 @@ BEGIN {RS=" "; FS="/|\n";} {
   # 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'` ;;
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
   esac
   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
@@ -10273,7 +10744,7 @@ fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -10290,14 +10761,16 @@ hardcode_into_libs=no
 # 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'
+  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'
+  soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
@@ -10305,41 +10778,91 @@ aix[4-9]*)
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
+  if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    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
+    # 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
+	   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
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot 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
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
       # 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
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
       # 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
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
     shlibpath_var=LIBPATH
   fi
   ;;
@@ -10349,18 +10872,18 @@ amigaos*)
   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}'
+    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'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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}'
+  library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
@@ -10368,8 +10891,8 @@ beos*)
 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'
+  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"
@@ -10381,7 +10904,7 @@ bsdi[45]*)
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
-  shrext_cmds=".dll"
+  shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
@@ -10390,8 +10913,8 @@ cygwin* | mingw* | pw32* | cegcc*)
     # 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'\''`~
+    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~
@@ -10407,17 +10930,17 @@ cygwin* | mingw* | pw32* | cegcc*)
     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}'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 
       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}'
+      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}'
+      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'
@@ -10426,8 +10949,8 @@ cygwin* | mingw* | pw32* | cegcc*)
   *,cl*)
     # Native MSVC
     libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
 
     case $build_os in
     mingw*)
@@ -10454,7 +10977,7 @@ cygwin* | mingw* | pw32* | cegcc*)
       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"
+      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'`
@@ -10467,8 +10990,8 @@ cygwin* | mingw* | pw32* | cegcc*)
     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'\''`~
+    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'
@@ -10481,7 +11004,7 @@ cygwin* | mingw* | pw32* | cegcc*)
 
   *)
     # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
   esac
@@ -10494,8 +11017,8 @@ darwin* | rhapsody*)
   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'
+  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`'
@@ -10508,8 +11031,8 @@ 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'
+  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
   ;;
 
@@ -10527,12 +11050,13 @@ freebsd* | dragonfly*)
   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}'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
@@ -10557,26 +11081,15 @@ 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
   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'
+  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
+  shlibpath_overrides_runpath=no
   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
@@ -10594,14 +11107,15 @@ hpux9* | hpux10* | hpux11*)
     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
+    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 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -10609,8 +11123,8 @@ hpux9* | hpux10* | hpux11*)
     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'
+    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
     ;;
@@ -10619,8 +11133,8 @@ hpux9* | hpux10* | hpux11*)
     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'
+    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, ...
@@ -10633,8 +11147,8 @@ 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'
+  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
@@ -10645,7 +11159,7 @@ irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
@@ -10653,8 +11167,8 @@ irix5* | irix6* | nonstopux*)
   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}'
+  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=
@@ -10673,8 +11187,8 @@ irix5* | irix6* | nonstopux*)
   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}"
+  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
   ;;
 
@@ -10683,13 +11197,33 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # 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
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
 # 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
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  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
@@ -10733,7 +11267,12 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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"
@@ -10765,12 +11304,12 @@ netbsd*)
   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'
+    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'
+    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
@@ -10780,7 +11319,7 @@ netbsd*)
 
 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}'
+  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
   ;;
@@ -10789,58 +11328,68 @@ newsos6)
   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'
+  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*)
+openbsd* | bitrig*)
   version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
+  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
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
   else
-    shlibpath_overrides_runpath=yes
+    need_version=yes
   fi
+  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
+  shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
-  shrext_cmds=".dll"
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
   need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  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'
   ;;
 
 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}'
+  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"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
@@ -10851,8 +11400,8 @@ 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'
+  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
@@ -10862,11 +11411,11 @@ solaris*)
 
 sunos4*)
   version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  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
+  if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
@@ -10874,8 +11423,8 @@ sunos4*)
 
 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'
+  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)
@@ -10896,24 +11445,24 @@ sysv4 | sysv4.3*)
   ;;
 
 sysv4*MP*)
-  if test -d /usr/nec ;then
+  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'
+    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
+  version_type=sco
   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'
+  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
+  if test yes = "$with_gnu_ld"; 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'
@@ -10931,7 +11480,7 @@ tpf*)
   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}'
+  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
@@ -10939,8 +11488,8 @@ tpf*)
 
 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'
+  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
   ;;
 
@@ -10950,20 +11499,35 @@ uts4*)
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; 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"
+if test set = "${lt_cv_sys_lib_search_path_spec+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"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
 
 
 
@@ -11060,15 +11624,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
+   test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
+  if test no != "$hardcode_direct" &&
      # 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, )" != no &&
-     test "$hardcode_minus_L" != no; then
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
@@ -11083,12 +11647,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
   # Fast installation is not supported
   enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -11098,7 +11662,7 @@ fi
 
 
 
-  if test "x$enable_dlopen" != xyes; then
+  if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -11108,23 +11672,23 @@ else
 
   case $host_os in
   beos*)
-    lt_cv_dlopen="load_add_on"
+    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=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
-    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
-  # if libdl is installed we need to link against it
+    # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -11162,10 +11726,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
-    lt_cv_dlopen="dyld"
+    lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
@@ -11173,10 +11737,18 @@ fi
 
     ;;
 
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
+  lt_cv_dlopen=shl_load
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -11215,11 +11787,11 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
+  lt_cv_dlopen=dlopen
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -11258,7 +11830,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -11297,7 +11869,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -11336,7 +11908,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
@@ -11357,21 +11929,21 @@ fi
     ;;
   esac
 
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
+  if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
+  else
+    enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
-    save_LDFLAGS="$LDFLAGS"
+    save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
-    save_LIBS="$LIBS"
+    save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11379,7 +11951,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11426,9 +11998,9 @@ else
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -11458,7 +12030,7 @@ _LT_EOF
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -11478,14 +12050,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
-    if test "x$lt_cv_dlopen_self" = xyes; then
+    if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  	  if test "$cross_compiling" = yes; then :
+  	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11532,9 +12104,9 @@ else
 #  endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -11564,7 +12136,7 @@ _LT_EOF
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -11585,9 +12157,9 @@ fi
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
     ;;
   esac
 
@@ -11631,7 +12203,7 @@ else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
-    if test -n "$STRIP" ; then
+    if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -11659,7 +12231,7 @@ fi
 
 
 
-  # Report which library types will actually be built
+  # Report what library types will actually be built
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -11667,13 +12239,13 @@ $as_echo "$can_build_shared" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
+  test no = "$can_build_shared" && 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
+    test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
@@ -11681,8 +12253,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
     ;;
 
   aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
     fi
     ;;
   esac
@@ -11692,7 +12268,7 @@ $as_echo "$enable_shared" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
+  test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
@@ -11706,7 +12282,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC="$lt_save_CC"
+CC=$lt_save_CC
 
 
 
@@ -11857,10 +12433,10 @@ if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -13158,44 +13734,6 @@ fi
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
 
 
 
@@ -13379,7 +13917,7 @@ fi
 if test "${with_webkit+set}" = set; then :
   withval=$with_webkit;
 else
-  with_webkit=3.0
+  with_webkit=4.0
 fi
 
 
@@ -13475,6 +14013,97 @@ fi
 fi
 
 	 ;; #(
+  4.0) :
+
+		WEBKIT_PC=webkitgtk-4.0
+		SEED_GTK_VERSION=-gtk4
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSContextGroupCreate in -lwebkitgtk-4.0" >&5
+$as_echo_n "checking for JSContextGroupCreate in -lwebkitgtk-4.0... " >&6; }
+if ${ac_cv_lib_webkitgtk_4_0_JSContextGroupCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lwebkitgtk-4.0  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char JSContextGroupCreate ();
+int
+main ()
+{
+return JSContextGroupCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_webkitgtk_4_0_JSContextGroupCreate=yes
+else
+  ac_cv_lib_webkitgtk_4_0_JSContextGroupCreate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_webkitgtk_4_0_JSContextGroupCreate" >&5
+$as_echo "$ac_cv_lib_webkitgtk_4_0_JSContextGroupCreate" >&6; }
+if test "x$ac_cv_lib_webkitgtk_4_0_JSContextGroupCreate" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBWEBKITGTK_4_0 1
+_ACEOF
+
+  LIBS="-lwebkitgtk-4.0 $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSContextGroupCreate in -ljavascriptcoregtk-4.0" >&5
+$as_echo_n "checking for JSContextGroupCreate in -ljavascriptcoregtk-4.0... " >&6; }
+if ${ac_cv_lib_javascriptcoregtk_4_0_JSContextGroupCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljavascriptcoregtk-4.0  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char JSContextGroupCreate ();
+int
+main ()
+{
+return JSContextGroupCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_javascriptcoregtk_4_0_JSContextGroupCreate=yes
+else
+  ac_cv_lib_javascriptcoregtk_4_0_JSContextGroupCreate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_javascriptcoregtk_4_0_JSContextGroupCreate" >&5
+$as_echo "$ac_cv_lib_javascriptcoregtk_4_0_JSContextGroupCreate" >&6; }
+if test "x$ac_cv_lib_javascriptcoregtk_4_0_JSContextGroupCreate" = xyes; then :
+  WEBKIT_PC=javascriptcoregtk-4.0
+fi
+
+fi
+
+	 ;; #(
   1.0) :
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSContextGroupCreate in -lwebkitgtk-1.0" >&5
@@ -13704,6 +14333,100 @@ fi
 
 
 
+
+                # Check whether --enable-introspection was given.
+if test "${enable_introspection+set}" = set; then :
+  enableval=$enable_introspection;
+else
+  enable_introspection=auto
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
+$as_echo_n "checking for gobject-introspection... " >&6; }
+
+        case $enable_introspection in #(
+  no) :
+            found_introspection="no (disabled, use --enable-introspection to enable)"
+     ;; #(
+      yes) :
+            if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  :
+else
+  as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+fi
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.41.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.41.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  found_introspection=yes
+else
+  as_fn_error $? "You need to have gobject-introspection >= 1.41.4 installed to build seed" "$LINENO" 5
+fi
+     ;; #(
+      auto) :
+            if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.41.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.41.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  found_introspection=yes
+else
+  found_introspection=no
+fi
+		enable_introspection=$found_introspection
+     ;; #(
+  *) :
+                as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+     ;;
+esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+$as_echo "$found_introspection" >&6; }
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+
+
+
+
+
+
+
+
+
+     if test "x$found_introspection" = "xyes"; then
+  HAVE_INTROSPECTION_TRUE=
+  HAVE_INTROSPECTION_FALSE='#'
+else
+  HAVE_INTROSPECTION_TRUE='#'
+  HAVE_INTROSPECTION_FALSE=
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
 $as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
@@ -14082,6 +14805,98 @@ $as_echo "yes" >&6; }
 
 fi
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
+$as_echo_n "checking for GMODULE... " >&6; }
+
+if test -n "$GMODULE_CFLAGS"; then
+    pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-no-export-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GMODULE_LIBS"; then
+    pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-no-export-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-no-export-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-no-export-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-no-export-2.0" 2>&1`
+        else
+	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-no-export-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GMODULE_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gmodule-no-export-2.0) were not met:
+
+$GMODULE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GMODULE_CFLAGS
+and GMODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GMODULE_CFLAGS
+and GMODULE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
 # Check whether --enable-canvas-module was given.
 if test "${enable_canvas_module+set}" = set; then :
   enableval=$enable_canvas_module; want_canvas_module=$enableval
@@ -14928,6 +15743,89 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lc" >&5
+$as_echo_n "checking for dlsym in -lc... " >&6; }
+if ${ac_cv_lib_c_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlsym ();
+int
+main ()
+{
+return dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c_dlsym=yes
+else
+  ac_cv_lib_c_dlsym=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_dlsym" >&5
+$as_echo "$ac_cv_lib_c_dlsym" >&6; }
+if test "x$ac_cv_lib_c_dlsym" = xyes; then :
+  LIBDL=""
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
+$as_echo_n "checking for dlsym in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlsym ();
+int
+main ()
+{
+return dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlsym=yes
+else
+  ac_cv_lib_dl_dlsym=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
+$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
+  LIBDL="-ldl"
+fi
+
+fi
+
+
+
 # Check whether --enable-libxml-module was given.
 if test "${enable_libxml_module+set}" = set; then :
   enableval=$enable_libxml_module; want_libxml_module=$enableval
@@ -15091,7 +15989,7 @@ fi
 
 
 if test x"$want_gtkbuilder_module" = x"yes" ; then
-   if test x"$with_webkit" = x"3.0" ; then
+   if test x"$with_webkit" = x"3.0" || test x"$with_webkit" = x"4.0" ; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
@@ -15609,16 +16507,78 @@ done
 
 
 
-    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+  gtk_doc_requires="gtk-doc >= 1.9"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
+$as_echo_n "checking for gtk-doc... " >&6; }
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_gtk_doc=yes
+else
+  have_gtk_doc=no
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5
+$as_echo "$have_gtk_doc" >&6; }
+
+  if test "$have_gtk_doc" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&5
+$as_echo "$as_me: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&2;}
+  fi
+
+            # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; 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_GTKDOC_CHECK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GTKDOC_CHECK"; then
+  ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # 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_GTKDOC_CHECK="gtkdoc-check.test"
+    $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
+GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
+if test -n "$GTKDOC_CHECK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+$as_echo "$GTKDOC_CHECK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; 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_path_GTKDOC_CHECK+:} false; then :
+if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GTKDOC_CHECK in
+  case $GTKDOC_CHECK_PATH in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+  ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -15628,7 +16588,7 @@ do
   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_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -15639,10 +16599,10 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-if test -n "$GTKDOC_CHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-$as_echo "$GTKDOC_CHECK" >&6; }
+GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
+if test -n "$GTKDOC_CHECK_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
+$as_echo "$GTKDOC_CHECK_PATH" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15755,18 +16715,19 @@ else
 fi
 
 
-  if test x$enable_gtk_doc = xyes; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.9\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.9") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
-else
-  as_fn_error $? "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5
-fi
-        if test "x$PACKAGE_NAME" != "xglib"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
+
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    as_fn_error $? "
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5
+  fi
+
+    if test "x$PACKAGE_NAME" != "xglib"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
@@ -15826,31 +16787,11 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0) were not met:
-
-$GTKDOC_DEPS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	:
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	:
 else
 	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
 	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -15858,14 +16799,8 @@ else
 $as_echo "yes" >&6; }
 
 fi
-    fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-$as_echo "$enable_gtk_doc" >&6; }
-
     # Check whether --enable-gtk-doc-html was given.
 if test "${enable_gtk_doc_html+set}" = set; then :
   enableval=$enable_gtk_doc_html;
@@ -15885,6 +16820,18 @@ fi
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+
+
+   if test x$have_gtk_doc = xyes; then
+  HAVE_GTK_DOC_TRUE=
+  HAVE_GTK_DOC_FALSE='#'
+else
+  HAVE_GTK_DOC_TRUE='#'
+  HAVE_GTK_DOC_FALSE=
+fi
 
    if test x$enable_gtk_doc = xyes; then
   ENABLE_GTK_DOC_TRUE=
@@ -15928,7 +16875,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files seed.pc Makefile doc/index.html doc/conventions.html doc/runtime.html doc/tutorial-standalone/tutorial.html doc/modules/canvas/canvas.html doc/modules/multiprocessing/multiprocessing.html doc/modules/canvas/Makefile doc/modules/multiprocessing/Makefile doc/modules/readline/Makefile doc/modules/gtkbuilder/Makefile doc/modules/sqlite/Makefile doc/modules/sandbox/Makefile doc/mapping/mapping.html libseed/Makefile po/Makefile.in src/Makefile extensions/Makefile tests/Makefile tests/javascript/Makefile tests/javascript/gtypes/Makefile tests/javascript/signals/Makefile tests/javascript/structs/Makefile tests/c/Makefile doc/Makefile doc/modules/Makefile doc/modules/version.xml doc/tutorial-standalone/Makefile doc/reference/Makefile doc/reference/version.xml doc/mapping/Makefile modules/Makefile modules/example/Makefile modules/sqlite/Makefile modules/xorg/Makefile modules/canvas/Makefile modules/readline/Makefile modules/multiprocessing/Makefile modules/sandbox/Makefile modules/os/Makefile modules/dbus/Makefile modules/dbus/util/Makefile modules/libxml/Makefile modules/cairo/Makefile modules/gtkbuilder/Makefile modules/gettext/Makefile modules/mpfr/Makefile modules/ffi/Makefile modules/DynamicObject/Makefile libseed/seed-path.h"
+ac_config_files="$ac_config_files seed.pc Makefile doc/index.html doc/conventions.html doc/runtime.html doc/tutorial-standalone/tutorial.html doc/modules/canvas/canvas.html doc/modules/multiprocessing/multiprocessing.html doc/modules/canvas/Makefile doc/modules/multiprocessing/Makefile doc/modules/readline/Makefile doc/modules/gtkbuilder/Makefile doc/modules/sqlite/Makefile doc/modules/sandbox/Makefile doc/mapping/mapping.html libseed/Makefile libgjs-private/Makefile po/Makefile.in src/Makefile jsextensions/Makefile tests/Makefile tests/javascript/Makefile tests/javascript/gtypes/Makefile tests/javascript/signals/Makefile tests/javascript/structs/Makefile tests/c/Makefile doc/Makefile doc/modules/Makefile doc/modules/version.xml doc/tutorial-standalone/Makefile doc/reference/Makefile doc/reference/version.xml doc/mapping/Makefile modules/Makefile modules/example/Makefile modules/sqlite/Makefile modules/xorg/Makefile modules/canvas/Makefile modules/readline/Makefile modules/multiprocessing/Makefile modules/sandbox/Makefile modules/os/Makefile modules/dbus/Makefile modules/dbus/util/Makefile modules/libxml/Makefile modules/cairo/Makefile modules/gtkbuilder/Makefile modules/gettext/Makefile modules/mpfr/Makefile modules/ffi/Makefile modules/DynamicObject/Makefile modules/gjs/system/Makefile modules/gjs/_gi/Makefile modules/gjs/Makefile libseed/seed-path.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16039,6 +16986,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -16063,6 +17018,10 @@ fi
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_CANVAS_MODULE_TRUE}" && test -z "${BUILD_CANVAS_MODULE_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_CANVAS_MODULE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16131,6 +17090,10 @@ if test -z "${PROFILE_MODULES_TRUE}" && test -z "${PROFILE_MODULES_FALSE}"; then
   as_fn_error $? "conditional \"PROFILE_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16548,7 +17511,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 seed $as_me 3.8.1, which was
+This file was extended by seed $as_me 4.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16614,7 +17577,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-seed config.status 3.8.1
+seed config.status 4.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16749,6 +17712,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $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"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $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"`'
@@ -16798,10 +17762,13 @@ 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_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $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"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $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"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $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"`'
@@ -16866,7 +17833,8 @@ 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"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $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"`'
@@ -16917,9 +17885,12 @@ CFLAGS \
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
 nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
@@ -16954,7 +17925,7 @@ old_striplib \
 striplib; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16981,10 +17952,11 @@ postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16993,19 +17965,16 @@ sys_lib_dlsearch_path_spec; do
 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
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
     RM='$RM'
     ofile='$ofile'
 
@@ -17041,9 +18010,10 @@ do
     "doc/modules/sandbox/Makefile") CONFIG_FILES="$CONFIG_FILES doc/modules/sandbox/Makefile" ;;
     "doc/mapping/mapping.html") CONFIG_FILES="$CONFIG_FILES doc/mapping/mapping.html" ;;
     "libseed/Makefile") CONFIG_FILES="$CONFIG_FILES libseed/Makefile" ;;
+    "libgjs-private/Makefile") CONFIG_FILES="$CONFIG_FILES libgjs-private/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "extensions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Makefile" ;;
+    "jsextensions/Makefile") CONFIG_FILES="$CONFIG_FILES jsextensions/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/javascript/Makefile") CONFIG_FILES="$CONFIG_FILES tests/javascript/Makefile" ;;
     "tests/javascript/gtypes/Makefile") CONFIG_FILES="$CONFIG_FILES tests/javascript/gtypes/Makefile" ;;
@@ -17075,6 +18045,9 @@ do
     "modules/mpfr/Makefile") CONFIG_FILES="$CONFIG_FILES modules/mpfr/Makefile" ;;
     "modules/ffi/Makefile") CONFIG_FILES="$CONFIG_FILES modules/ffi/Makefile" ;;
     "modules/DynamicObject/Makefile") CONFIG_FILES="$CONFIG_FILES modules/DynamicObject/Makefile" ;;
+    "modules/gjs/system/Makefile") CONFIG_FILES="$CONFIG_FILES modules/gjs/system/Makefile" ;;
+    "modules/gjs/_gi/Makefile") CONFIG_FILES="$CONFIG_FILES modules/gjs/_gi/Makefile" ;;
+    "modules/gjs/Makefile") CONFIG_FILES="$CONFIG_FILES modules/gjs/Makefile" ;;
     "libseed/seed-path.h") CONFIG_FILES="$CONFIG_FILES libseed/seed-path.h" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
@@ -17673,7 +18646,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -17686,7 +18659,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -17720,21 +18693,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -17769,55 +18740,53 @@ $as_echo X"$file" |
  ;;
     "libtool":C)
 
-    # See if we are running on zsh, and set the options which allow our
+    # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
+    if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
-    cfgfile="${ofile}T"
+    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
+# Generated automatically by $as_me ($PACKAGE) $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.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 of the License, or
+# (at your option) any later version.
 #
-#   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.
+# 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
+# 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags=""
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -17837,6 +18806,9 @@ pic_mode=$pic_mode
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
@@ -17954,18 +18926,27 @@ 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 into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # 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
 
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
 # 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.
+# The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
@@ -18056,8 +19037,11 @@ 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
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -18150,13 +19134,13 @@ 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
+# 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
+# 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
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -18208,13 +19192,72 @@ hardcode_action=$hardcode_action
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_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
+if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
@@ -18223,7 +19266,7 @@ _LT_EOF
   esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
@@ -18233,165 +19276,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
   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"
diff --git a/configure.ac b/configure.ac
index fad3309..b468285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
 AC_PREREQ(2.59)
-AC_INIT(seed, 3.8.1)
+AC_INIT(seed, 4.0.0)
 
 AM_INIT_AUTOMAKE([1.7 -Wno-portability])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
 
@@ -73,15 +74,15 @@ AC_SUBST(FFI_LDFLAGS)
 AC_SUBST(FFI_CFLAGS)
 
 dnl ==============================WebKit=======================================
-m4_define([webkit_default], [3.0])
+m4_define([webkit_default], [4.0])
 
 AC_ARG_WITH([webkit],
-            [AC_HELP_STRING([--with-webkit=@<:@3.0/1.0@:>@],
-                            [Select the Webkit backend, default=3.0])],
+            [AC_HELP_STRING([--with-webkit=@<:@4.0/3.0/1.0@:>@],
+                            [Select the Webkit backend, default=4.0])],
 	    [],
             [with_webkit=webkit_default])
 
-dnl=== support both 1.0 and 3.0 (default 3.0) ==
+dnl=== support all 1.0, 3.0 and 4.0 (default 3.0) ==
 AS_CASE([$with_webkit],
 	[3.0], [
 		WEBKIT_PC=webkitgtk-3.0
@@ -89,6 +90,12 @@ AS_CASE([$with_webkit],
 		AC_CHECK_LIB(webkitgtk-3.0, JSContextGroupCreate,,
 	                AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-3.0)) 
 	],
+	[4.0], [
+		WEBKIT_PC=webkitgtk-4.0
+		SEED_GTK_VERSION=-gtk4
+		AC_CHECK_LIB(webkitgtk-4.0, JSContextGroupCreate,,
+	                AC_CHECK_LIB(javascriptcoregtk-4.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-4.0))
+	],
 	[1.0], [
 		AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=webkitgtk-1.0,
 	                AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-1.0, 
@@ -105,6 +112,7 @@ AC_SUBST(WEBKIT_LDFLAGS)
 AC_SUBST(SEED_GTK_VERSION)
 
 dnl =========================Introspection=====================================
+GOBJECT_INTROSPECTION_CHECK([1.41.4])
 
 PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= 0.6.3)
 AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS)
@@ -128,6 +136,9 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 dnl ========================GIO================================================
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
+dnl ========================GModule================================================
+PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
+
 dnl =============================Modules=======================================
 dnl ==== canvas ====
 AC_ARG_ENABLE(canvas-module,
@@ -267,6 +278,11 @@ AC_ARG_ENABLE(ffi-module,
 AM_CONDITIONAL(BUILD_FFI_MODULE, test "x$want_ffi_module" = "xyes")
 AC_SUBST(BUILD_FFI_MODULE)
 
+dnl ==== libdl ====
+AC_CHECK_LIB([c], [dlsym], [LIBDL=""],
+	[AC_CHECK_LIB([dl], [dlsym], [LIBDL="-ldl"])])
+AC_SUBST(LIBDL)
+
 dnl ==== libxml ====
 AC_ARG_ENABLE(libxml-module,
 			  AC_HELP_STRING([--enable-libxml-module],
@@ -311,7 +327,7 @@ AC_ARG_ENABLE(gtkbuilder-module,
 			  [want_gtkbuilder_module=$enableval],[want_gtkbuilder_module="yes"])
 
 if test x"$want_gtkbuilder_module" = x"yes" ; then
-   if test x"$with_webkit" = x"3.0" ; then
+   if test x"$with_webkit" = x"3.0" || test x"$with_webkit" = x"4.0" ; then
 	PKG_CHECK_MODULES(GTK, gtk+-3.0)
    else
 	PKG_CHECK_MODULES(GTK, gtk+-2.0)
@@ -457,9 +473,11 @@ doc/modules/sandbox/Makefile
 doc/mapping/mapping.html
 
 libseed/Makefile
+libgjs-private/Makefile
+
 po/Makefile.in
 src/Makefile
-extensions/Makefile
+jsextensions/Makefile
 tests/Makefile
 tests/javascript/Makefile
 tests/javascript/gtypes/Makefile
@@ -492,6 +510,10 @@ modules/mpfr/Makefile
 modules/ffi/Makefile
 modules/DynamicObject/Makefile
 
+modules/gjs/system/Makefile
+modules/gjs/_gi/Makefile
+modules/gjs/Makefile
+
 libseed/seed-path.h
 ])
 AC_OUTPUT
diff --git a/depcomp b/depcomp
index 25a39e6..fc98710 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -57,11 +56,65 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -86,32 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -134,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -143,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -157,15 +216,14 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -174,15 +232,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -200,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -209,7 +266,6 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -217,19 +273,15 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -247,9 +299,8 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -262,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -273,65 +322,113 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -342,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -355,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -366,76 +461,61 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -446,8 +526,7 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -473,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -524,13 +604,14 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -583,10 +664,12 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -622,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -657,15 +740,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 703e87b..7e9e099 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,32 +89,41 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/conventions.html.in $(srcdir)/index.html.in \
-	$(srcdir)/runtime.html.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = index.html conventions.html runtime.html
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -114,12 +160,34 @@ am__installdirs = "$(DESTDIR)$(docdir)"
 DATA = $(doc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/conventions.html.in \
+	$(srcdir)/index.html.in $(srcdir)/runtime.html.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -208,6 +276,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -221,6 +291,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -244,8 +315,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -257,6 +337,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -351,6 +432,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -386,7 +468,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -439,22 +520,25 @@ uninstall-docDATA:
 	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -469,57 +553,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -535,12 +574,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -552,15 +586,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -569,6 +599,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -732,22 +777,23 @@ ps-am:
 
 uninstall-am: uninstall-docDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-docDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-docDATA
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-docDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-docDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/mapping/Makefile.in b/doc/mapping/Makefile.in
index 5a046f4..9e78633 100644
--- a/doc/mapping/Makefile.in
+++ b/doc/mapping/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,22 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/mapping
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/mapping.html.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = mapping.html
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(tutorialdir)"
 DATA = $(tutorial_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/mapping.html.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -167,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -180,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -203,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -216,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -310,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -342,7 +404,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/mapping/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/mapping/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -389,11 +450,11 @@ uninstall-tutorialDATA:
 	@list='$(tutorial_DATA)'; test -n "$(tutorialdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(tutorialdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -532,16 +593,19 @@ uninstall-am: uninstall-tutorialDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-tutorialDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-tutorialDATA
+	cscopelist-am ctags-am 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-strip install-tutorialDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-tutorialDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/modules/Makefile.in b/doc/modules/Makefile.in
index 230ef79..8bf9241 100644
--- a/doc/modules/Makefile.in
+++ b/doc/modules/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,31 +89,41 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -113,12 +160,33 @@ am__installdirs = "$(DESTDIR)$(bookdir)"
 DATA = $(book_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -207,6 +275,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -220,6 +290,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -243,8 +314,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +336,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -350,6 +431,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -378,7 +460,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -427,22 +508,25 @@ uninstall-bookDATA:
 	dir='$(DESTDIR)$(bookdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -457,57 +541,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -523,12 +562,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -540,15 +574,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -557,6 +587,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -722,23 +767,23 @@ ps-am:
 
 uninstall-am: uninstall-bookDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-bookDATA \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-bookDATA
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-bookDATA install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-bookDATA
+
+.PRECIOUS: Makefile
 
 
 @ENABLE_GTK_DOC_TRUE@html/index.html: version.xml book.xml sqlite/sqlite.xml sqlite/sqlite-funcs.xml readline/readline.xml readline/readline-funcs.xml make-functions.js gtkbuilder/gtkbuilder-funcs.xml gtkbuilder/gtkbuilder.xml sandbox/sandbox.xml sandbox/sandbox-funcs.xml
diff --git a/doc/modules/canvas/Makefile.in b/doc/modules/canvas/Makefile.in
index 044a46a..9120eda 100644
--- a/doc/modules/canvas/Makefile.in
+++ b/doc/modules/canvas/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,22 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules/canvas
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/canvas.html.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = canvas.html
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(modulesdir)"
 DATA = $(modules_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/canvas.html.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -167,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -180,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -203,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -216,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -310,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -340,7 +402,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/canvas/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/canvas/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -387,11 +448,11 @@ uninstall-modulesDATA:
 	@list='$(modules_DATA)'; test -n "$(modulesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(modulesdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -530,16 +591,18 @@ uninstall-am: uninstall-modulesDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-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-modulesDATA \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-modulesDATA
+	cscopelist-am ctags-am 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-modulesDATA install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-modulesDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/modules/gtkbuilder/Makefile.in b/doc/modules/gtkbuilder/Makefile.in
index 36ca28c..536c4b5 100644
--- a/doc/modules/gtkbuilder/Makefile.in
+++ b/doc/modules/gtkbuilder/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,21 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules/gtkbuilder
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(gtkbuilderdocsdir)"
 DATA = $(gtkbuilderdocs_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -166,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -179,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -202,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -215,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -309,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -343,7 +406,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/gtkbuilder/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/gtkbuilder/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -388,11 +450,11 @@ uninstall-gtkbuilderdocsDATA:
 	@list='$(gtkbuilderdocs_DATA)'; test -n "$(gtkbuilderdocsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(gtkbuilderdocsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -532,16 +594,19 @@ uninstall-am: uninstall-gtkbuilderdocsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-gtkbuilderdocsDATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-gtkbuilderdocsDATA
+	cscopelist-am ctags-am 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-gtkbuilderdocsDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-gtkbuilderdocsDATA
+
+.PRECIOUS: Makefile
 
 
 gtkbuilder-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/gtkbuilder/gtkbuilder.js $(top_srcdir)/doc/modules/gtkbuilder/example.ui $(top_srcdir)/doc/modules/gtkbuilder/example.js
diff --git a/doc/modules/multiprocessing/Makefile.in b/doc/modules/multiprocessing/Makefile.in
index 681c95c..bfc1c2e 100644
--- a/doc/modules/multiprocessing/Makefile.in
+++ b/doc/modules/multiprocessing/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,22 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules/multiprocessing
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/multiprocessing.html.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = multiprocessing.html
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +150,9 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(modulesdir)"
 DATA = $(modules_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/multiprocessing.html.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -167,6 +216,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -180,6 +231,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -203,8 +255,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -216,6 +277,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -310,6 +372,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -340,7 +403,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/multiprocessing/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/multiprocessing/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -387,11 +449,11 @@ uninstall-modulesDATA:
 	@list='$(modules_DATA)'; test -n "$(modulesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(modulesdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -530,16 +592,18 @@ uninstall-am: uninstall-modulesDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-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-modulesDATA \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-modulesDATA
+	cscopelist-am ctags-am 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-modulesDATA install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-modulesDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/modules/readline/Makefile.in b/doc/modules/readline/Makefile.in
index 697798c..8c66228 100644
--- a/doc/modules/readline/Makefile.in
+++ b/doc/modules/readline/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,21 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules/readline
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(readlinedocsdir)"
 DATA = $(readlinedocs_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -166,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -179,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -202,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -215,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -309,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -340,7 +403,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/readline/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/readline/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -385,11 +447,11 @@ uninstall-readlinedocsDATA:
 	@list='$(readlinedocs_DATA)'; test -n "$(readlinedocsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(readlinedocsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -529,17 +591,19 @@ uninstall-am: uninstall-readlinedocsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-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 \
+	cscopelist-am ctags-am 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-readlinedocsDATA 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-readlinedocsDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-readlinedocsDATA
+
+.PRECIOUS: Makefile
 
 
 readline-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/readline/readline.js
diff --git a/doc/modules/sandbox/Makefile.in b/doc/modules/sandbox/Makefile.in
index e04e33e..cf83565 100644
--- a/doc/modules/sandbox/Makefile.in
+++ b/doc/modules/sandbox/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,21 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules/sandbox
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(sandboxdocsdir)"
 DATA = $(sandboxdocs_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -166,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -179,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -202,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -215,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -309,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -340,7 +403,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/sandbox/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/sandbox/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -385,11 +447,11 @@ uninstall-sandboxdocsDATA:
 	@list='$(sandboxdocs_DATA)'; test -n "$(sandboxdocsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(sandboxdocsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -529,17 +591,19 @@ uninstall-am: uninstall-sandboxdocsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-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 \
+	cscopelist-am ctags-am 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-sandboxdocsDATA 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-sandboxdocsDATA
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-sandboxdocsDATA
+
+.PRECIOUS: Makefile
 
 
 sandbox-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/sandbox/sandbox.js 
diff --git a/doc/modules/sqlite/Makefile.in b/doc/modules/sqlite/Makefile.in
index 2d76217..acbc657 100644
--- a/doc/modules/sqlite/Makefile.in
+++ b/doc/modules/sqlite/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,21 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/modules/sqlite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(sqlitedocsdir)"
 DATA = $(sqlitedocs_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -166,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -179,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -202,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -215,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -309,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -340,7 +403,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/modules/sqlite/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/modules/sqlite/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -385,11 +447,11 @@ uninstall-sqlitedocsDATA:
 	@list='$(sqlitedocs_DATA)'; test -n "$(sqlitedocsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(sqlitedocsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -529,16 +591,19 @@ uninstall-am: uninstall-sqlitedocsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-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-sqlitedocsDATA \
-	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-sqlitedocsDATA
+	cscopelist-am ctags-am 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-sqlitedocsDATA install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-sqlitedocsDATA
+
+.PRECIOUS: Makefile
 
 
 sqlite-funcs.xml: $(top_builddir)/src/seed $(top_srcdir)/doc/modules/sqlite/sqlite.js
diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
index 84000cf..58cf4e3 100644
--- a/doc/reference/Makefile.in
+++ b/doc/reference/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 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.
@@ -21,23 +20,61 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,23 +93,32 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
 subdir = doc/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -80,6 +126,9 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \
+	$(top_srcdir)/gtk-doc.make
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -143,6 +192,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -156,6 +207,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -179,8 +231,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -192,6 +253,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -286,6 +348,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -380,6 +443,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -390,9 +454,9 @@ SETUP_FILES = \
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -406,11 +470,42 @@ REPORT_FILES = \
 	$(DOC_MODULE)-undeclared.txt \
 	$(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
+@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
+@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
+@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
+@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -426,7 +521,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/reference/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/reference/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -435,7 +529,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/gtk-doc.make:
+$(top_srcdir)/gtk-doc.make $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -453,11 +547,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -495,6 +589,7 @@ distdir: $(DISTFILES)
 	  dist-hook
 check-am: all-am
 check: check-am
+@ENABLE_GTK_DOC_FALSE@all-local:
 all-am: Makefile all-local
 installdirs:
 install: install-am
@@ -598,59 +693,60 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distclean-local distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
+	clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+	distclean distclean-generic distclean-libtool distclean-local \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
+.PRECIOUS: Makefile
 
-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-@ENABLE_GTK_DOC_FALSE@all-local:
+
+gtkdoc-check.test: Makefile
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+		chmod +x $@
+
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file`; \
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
-	@touch setup-build.stamp
+	$(AM_V_at)touch setup-build.stamp
 
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    echo "  DOC   Introspecting gobjects"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -662,59 +758,44 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '  DOC   Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '  DOC   Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo "<!ENTITY package \"$(PACKAGE)\">"; \
+		echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
+		echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
+		echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
+		echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
+		echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
+		echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
+	) > $@
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -727,18 +808,14 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
-#### pdf ####
-
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -753,23 +830,28 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 clean-local:
 	@rm -f *~ *.bak
 	@rm -rf .libs
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+	  rm -f $(DOC_MODULE).types; \
+	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -805,15 +887,15 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-@ENABLE_GTK_DOC_FALSE@	@false
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	@mkdir $(distdir)/tmpl
+@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
+@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@HAVE_GTK_DOC_FALSE@	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
+@HAVE_GTK_DOC_FALSE@	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
+@HAVE_GTK_DOC_FALSE@	@echo "*** please install gtk-doc and rerun 'configure'. ***"
+@HAVE_GTK_DOC_FALSE@	@false
+
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/doc/reference/html/GtkBuilder-module.html b/doc/reference/html/GtkBuilder-module.html
index 9380f20..ea0c630 100644
--- a/doc/reference/html/GtkBuilder-module.html
+++ b/doc/reference/html/GtkBuilder-module.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GtkBuilder</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>GtkBuilder: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="modules.html" title="Part IV. Seed Module Reference">
 <link rel="prev" href="sqlite-module.html" title="SQLite">
 <link rel="next" href="Sandbox-module.html" title="Sandbox">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="sqlite-module.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="modules.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="Sandbox-module.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="modules.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="sqlite-module.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="Sandbox-module.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div>
@@ -33,7 +33,7 @@
 </div></div>
 </div></div>
 <div class="refsect1">
-<a name="idp9134864"></a><h2>API Reference</h2>
+<a name="id-1.5.5.3"></a><h2>API Reference</h2>
 <p>
       The GtkBuilder extends Gtk.GtkBuilder.prototype to implement a custom automatic signal connection function, which is useful in Seed. It does not provide any methods or types, so there is no need to save it's namespace, as of such it can be imported as follows.
       </p>
@@ -42,30 +42,10 @@
       </pre>
 <p>
     </p>
-<p>
-</p>
-<div class="refsect2">
-<a name="gtkbuilder-connect-signals"></a><h3>builder.connect_signals (object, user_data)</h3>
-<p>Connects the signals present in the GtkBuilder to the functions present in <em class="parameter"><code>object</code></em>. That is to say, a signal with handler name, 'ok_button_clicked' will be connected to the 'ok_button_clicked' property of object.</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p>
-</p>
+<span style="color: red">&lt;xi:include&gt;&lt;/xi:include&gt;</span>
 </div>
 <div class="refsect1">
-<a name="idp7941616"></a><h2>Examples</h2>
+<a name="id-1.5.5.4"></a><h2>Examples</h2>
 <p>Below are several examples of using the Seed GtkBuilder module. For additional resources, consult the examples/ folder of the Seed source</p>
 <div class="example">
 <a name="GtkBuilder-xml-example"></a><p class="title"><b>Example 16. </b></p>
@@ -122,7 +102,6 @@ Gtk.main();
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/Sandbox-module.html b/doc/reference/html/Sandbox-module.html
index bfb063d..e635083 100644
--- a/doc/reference/html/Sandbox-module.html
+++ b/doc/reference/html/Sandbox-module.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Sandbox</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Sandbox: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="modules.html" title="Part IV. Seed Module Reference">
 <link rel="prev" href="GtkBuilder-module.html" title="GtkBuilder">
 <link rel="next" href="ix01.html" title="Index">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="GtkBuilder-module.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="modules.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="modules.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="GtkBuilder-module.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="ix01.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div>
@@ -33,7 +33,7 @@
 </div></div>
 </div></div>
 <div class="refsect1">
-<a name="idp6701488"></a><h2>API Reference</h2>
+<a name="id-1.5.6.3"></a><h2>API Reference</h2>
 <p>
       The sandbox module allows the creation of isolated JSCore contexts with individual global objects. It is useful as a literal "sandbox" or in a variety of other contexts. 
       </p>
@@ -42,52 +42,10 @@
       </pre>
 <p>
     </p>
-<p>
-</p>
-<div class="refsect2">
-<a name="sandbox-context"></a><h3>new sandbox.Context()</h3>
-<p>Creates a new sandbox context object, which wraps a Seed JavaScript context with it's own global object. By default this global object contains only default JSCore globals (Array, Object, etc...) and has no ability to interact with the outside system. Note the context must be manually destroyed with the <em class="parameter"><code>destroy</code></em> method.</p>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="sandbox-eval"></a><h3>context.eval(source)</h3>
-<p>Evaluates a string <em class="parameter"><code>source</code></em> with context, returns the result.</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>source</code></em></span></p></td>
-<td>undefined</td>
-</tr></tbody>
-</table></div>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="sandbox-addglobals"></a><h3>context.add_globals()</h3>
-<p>Adds the default Seed globals to the context, including the 'Seed' global object, and the imports object.</p>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="sandbox-destroy"></a><h3>context.destroy()</h3>
-<p>Destroys the internal context object, and any further usage of the wrapper is an exception</p>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="sandbox-global"></a><h3>context.global</h3>
-<p>A project, representing the literal global object of the context, may be freely read from and assigned to</p>
-</div>
-<p>
-</p>
+<span style="color: red">&lt;xi:include&gt;&lt;/xi:include&gt;</span>
 </div>
 <div class="refsect1">
-<a name="idp10155600"></a><h2>Examples</h2>
+<a name="id-1.5.6.4"></a><h2>Examples</h2>
 <p>Below are several examples of using the Seed Sandbox module. For additional resources, consult the examples/ folder of the Seed source</p>
 <div class="example">
 <a name="sandbox-example"></a><p class="title"><b>Example 17. </b></p>
@@ -105,7 +63,6 @@ ctx.eval("b.show()");
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/api.html b/doc/reference/html/api.html
index 925e029..0fa9725 100644
--- a/doc/reference/html/api.html
+++ b/doc/reference/html/api.html
@@ -2,29 +2,29 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Part III. Seed API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Part III. Seed API Reference: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="index.html" title="Seed Reference Manual">
 <link rel="prev" href="seed-importer.html" title="Importer">
 <link rel="next" href="seed-Initialization.html" title="Initialization">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed-importer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Initialization.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="seed-importer.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Initialization.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="api"></a>Part III. Seed API Reference</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="seed-Initialization.html">Initialization</a></span><span class="refpurpose"> — Overall setup of the Seed engine</span>
 </dt>
@@ -69,7 +69,6 @@
 <p>This is the documentation for the C API of Seed, used for embedding, and creating native C modules.</p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/home.png b/doc/reference/html/home.png
index fb60b55..9346b33 100644
--- a/doc/reference/html/home.png
+++ b/doc/reference/html/home.png
diff --git a/doc/reference/html/index.html b/doc/reference/html/index.html
index b7ad436..f5db5f8 100644
--- a/doc/reference/html/index.html
+++ b/doc/reference/html/index.html
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Seed Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Seed Reference Manual: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="next" href="seed.html" title="Part I. Seed Overview">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Seed Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      Documentation for Seed 3.8.1
+      Documentation for Seed 4.0.0
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://library.gnome.org/devel/seed/unstable/" target="_top">http://library.gnome.org/devel/seed/unstable/</a>.
@@ -23,7 +23,7 @@
 </div>
 <hr>
 </div>
-<div class="toc"><dl>
+<div class="toc"><dl class="toc">
 <dt><span class="part"><a href="seed.html">I. Seed Overview</a></span></dt>
 <dd><dl>
 <dt>
@@ -101,7 +101,6 @@ Importing gobject-introspection namespaces, native modules, and JavaScript modul
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/index.sgml b/doc/reference/html/index.sgml
deleted file mode 100644
index 7278609..0000000
--- a/doc/reference/html/index.sgml
+++ /dev/null
@@ -1,204 +0,0 @@
-<ONLINE href="http://library.gnome.org/devel/seed/unstable/">
-<ANCHOR id="seed-introduction" href="seed/seed-introduction.html">
-<ANCHOR id="seed-building" href="seed/seed-building.html">
-<ANCHOR id="building" href="seed/seed-building.html#building">
-<ANCHOR id="dependencies" href="seed/seed-building.html#dependencies">
-<ANCHOR id="moddependencies" href="seed/seed-building.html#moddependencies">
-<ANCHOR id="optdependencies" href="seed/seed-building.html#optdependencies">
-<ANCHOR id="extra-configuration-options" href="seed/seed-building.html#extra-configuration-options">
-<ANCHOR id="seed-contact" href="seed/seed-contact.html">
-<ANCHOR id="build" href="seed/seed-contact.html#build">
-<ANCHOR id="git" href="seed/seed-contact.html#git">
-<ANCHOR id="bugs" href="seed/seed-contact.html#bugs">
-<ANCHOR id="seed-importer" href="seed/seed-importer.html">
-<ANCHOR id="git" href="seed/seed-importer.html#git">
-<ANCHOR id="seed-Initialization" href="seed/seed-Initialization.html">
-<ANCHOR id="seed-Initialization.synopsis" href="seed/seed-Initialization.html#seed-Initialization.synopsis">
-<ANCHOR id="seed-Initialization.description" href="seed/seed-Initialization.html#seed-Initialization.description">
-<ANCHOR id="seed-Initialization.details" href="seed/seed-Initialization.html#seed-Initialization.details">
-<ANCHOR id="SeedEngine" href="seed/seed-Initialization.html#SeedEngine">
-<ANCHOR id="seed-init" href="seed/seed-Initialization.html#seed-init">
-<ANCHOR id="seed-init-with-context-group" href="seed/seed-Initialization.html#seed-init-with-context-group">
-<ANCHOR id="seed-engine-set-search-path" href="seed/seed-Initialization.html#seed-engine-set-search-path">
-<ANCHOR id="seed-engine-get-search-path" href="seed/seed-Initialization.html#seed-engine-get-search-path">
-<ANCHOR id="seed-Contexts" href="seed/seed-Contexts.html">
-<ANCHOR id="seed-Contexts.synopsis" href="seed/seed-Contexts.html#seed-Contexts.synopsis">
-<ANCHOR id="seed-Contexts.description" href="seed/seed-Contexts.html#seed-Contexts.description">
-<ANCHOR id="seed-Contexts.details" href="seed/seed-Contexts.html#seed-Contexts.details">
-<ANCHOR id="SeedContext" href="seed/seed-Contexts.html#SeedContext">
-<ANCHOR id="SeedGlobalContext" href="seed/seed-Contexts.html#SeedGlobalContext">
-<ANCHOR id="SeedContextGroup" href="seed/seed-Contexts.html#SeedContextGroup">
-<ANCHOR id="seed-context-create" href="seed/seed-Contexts.html#seed-context-create">
-<ANCHOR id="seed-context-ref" href="seed/seed-Contexts.html#seed-context-ref">
-<ANCHOR id="seed-context-unref" href="seed/seed-Contexts.html#seed-context-unref">
-<ANCHOR id="seed-context-collect" href="seed/seed-Contexts.html#seed-context-collect">
-<ANCHOR id="seed-context-get-global-object" href="seed/seed-Contexts.html#seed-context-get-global-object">
-<ANCHOR id="seed-prepare-global-context" href="seed/seed-Contexts.html#seed-prepare-global-context">
-<ANCHOR id="seed-importer-add-global" href="seed/seed-Contexts.html#seed-importer-add-global">
-<ANCHOR id="seed-importer-set-search-path" href="seed/seed-Contexts.html#seed-importer-set-search-path">
-<ANCHOR id="seed-Evaluation" href="seed/seed-Evaluation.html">
-<ANCHOR id="seed-Evaluation.synopsis" href="seed/seed-Evaluation.html#seed-Evaluation.synopsis">
-<ANCHOR id="seed-Evaluation.description" href="seed/seed-Evaluation.html#seed-Evaluation.description">
-<ANCHOR id="seed-Evaluation.details" href="seed/seed-Evaluation.html#seed-Evaluation.details">
-<ANCHOR id="SeedScript" href="seed/seed-Evaluation.html#SeedScript">
-<ANCHOR id="seed-make-script" href="seed/seed-Evaluation.html#seed-make-script">
-<ANCHOR id="seed-evaluate" href="seed/seed-Evaluation.html#seed-evaluate">
-<ANCHOR id="seed-simple-evaluate" href="seed/seed-Evaluation.html#seed-simple-evaluate">
-<ANCHOR id="seed-script-new-from-file" href="seed/seed-Evaluation.html#seed-script-new-from-file">
-<ANCHOR id="seed-script-exception" href="seed/seed-Evaluation.html#seed-script-exception">
-<ANCHOR id="seed-script-destroy" href="seed/seed-Evaluation.html#seed-script-destroy">
-<ANCHOR id="seed-Exceptions" href="seed/seed-Exceptions.html">
-<ANCHOR id="seed-Exceptions.synopsis" href="seed/seed-Exceptions.html#seed-Exceptions.synopsis">
-<ANCHOR id="seed-Exceptions.description" href="seed/seed-Exceptions.html#seed-Exceptions.description">
-<ANCHOR id="seed-Exceptions.details" href="seed/seed-Exceptions.html#seed-Exceptions.details">
-<ANCHOR id="SeedException" href="seed/seed-Exceptions.html#SeedException">
-<ANCHOR id="seed-make-exception" href="seed/seed-Exceptions.html#seed-make-exception">
-<ANCHOR id="seed-exception-get-name" href="seed/seed-Exceptions.html#seed-exception-get-name">
-<ANCHOR id="seed-exception-get-message" href="seed/seed-Exceptions.html#seed-exception-get-message">
-<ANCHOR id="seed-exception-get-line" href="seed/seed-Exceptions.html#seed-exception-get-line">
-<ANCHOR id="seed-exception-get-file" href="seed/seed-Exceptions.html#seed-exception-get-file">
-<ANCHOR id="seed-exception-to-string" href="seed/seed-Exceptions.html#seed-exception-to-string">
-<ANCHOR id="seed-Signals" href="seed/seed-Signals.html">
-<ANCHOR id="seed-Signals.synopsis" href="seed/seed-Signals.html#seed-Signals.synopsis">
-<ANCHOR id="seed-Signals.description" href="seed/seed-Signals.html#seed-Signals.description">
-<ANCHOR id="seed-Signals.details" href="seed/seed-Signals.html#seed-Signals.details">
-<ANCHOR id="seed-signal-connect" href="seed/seed-Signals.html#seed-signal-connect">
-<ANCHOR id="seed-signal-connect-value" href="seed/seed-Signals.html#seed-signal-connect-value">
-<ANCHOR id="seed-Native-Type-Conversion" href="seed/seed-Native-Type-Conversion.html">
-<ANCHOR id="seed-Native-Type-Conversion.synopsis" href="seed/seed-Native-Type-Conversion.html#seed-Native-Type-Conversion.synopsis">
-<ANCHOR id="seed-Native-Type-Conversion.description" href="seed/seed-Native-Type-Conversion.html#seed-Native-Type-Conversion.description">
-<ANCHOR id="seed-Native-Type-Conversion.details" href="seed/seed-Native-Type-Conversion.html#seed-Native-Type-Conversion.details">
-<ANCHOR id="SeedValue" href="seed/seed-Native-Type-Conversion.html#SeedValue">
-<ANCHOR id="SeedType" href="seed/seed-Native-Type-Conversion.html#SeedType">
-<ANCHOR id="seed-make-undefined" href="seed/seed-Native-Type-Conversion.html#seed-make-undefined">
-<ANCHOR id="seed-make-null" href="seed/seed-Native-Type-Conversion.html#seed-make-null">
-<ANCHOR id="seed-value-to-boolean" href="seed/seed-Native-Type-Conversion.html#seed-value-to-boolean">
-<ANCHOR id="seed-value-from-boolean" href="seed/seed-Native-Type-Conversion.html#seed-value-from-boolean">
-<ANCHOR id="seed-value-to-uint" href="seed/seed-Native-Type-Conversion.html#seed-value-to-uint">
-<ANCHOR id="seed-value-from-uint" href="seed/seed-Native-Type-Conversion.html#seed-value-from-uint">
-<ANCHOR id="seed-value-to-int" href="seed/seed-Native-Type-Conversion.html#seed-value-to-int">
-<ANCHOR id="seed-value-from-int" href="seed/seed-Native-Type-Conversion.html#seed-value-from-int">
-<ANCHOR id="seed-value-to-char" href="seed/seed-Native-Type-Conversion.html#seed-value-to-char">
-<ANCHOR id="seed-value-from-char" href="seed/seed-Native-Type-Conversion.html#seed-value-from-char">
-<ANCHOR id="seed-value-to-uchar" href="seed/seed-Native-Type-Conversion.html#seed-value-to-uchar">
-<ANCHOR id="seed-value-from-uchar" href="seed/seed-Native-Type-Conversion.html#seed-value-from-uchar">
-<ANCHOR id="seed-value-to-long" href="seed/seed-Native-Type-Conversion.html#seed-value-to-long">
-<ANCHOR id="seed-value-from-long" href="seed/seed-Native-Type-Conversion.html#seed-value-from-long">
-<ANCHOR id="seed-value-to-ulong" href="seed/seed-Native-Type-Conversion.html#seed-value-to-ulong">
-<ANCHOR id="seed-value-from-ulong" href="seed/seed-Native-Type-Conversion.html#seed-value-from-ulong">
-<ANCHOR id="seed-value-to-int64" href="seed/seed-Native-Type-Conversion.html#seed-value-to-int64">
-<ANCHOR id="seed-value-from-int64" href="seed/seed-Native-Type-Conversion.html#seed-value-from-int64">
-<ANCHOR id="seed-value-to-uint64" href="seed/seed-Native-Type-Conversion.html#seed-value-to-uint64">
-<ANCHOR id="seed-value-from-uint64" href="seed/seed-Native-Type-Conversion.html#seed-value-from-uint64">
-<ANCHOR id="seed-value-to-float" href="seed/seed-Native-Type-Conversion.html#seed-value-to-float">
-<ANCHOR id="seed-value-from-float" href="seed/seed-Native-Type-Conversion.html#seed-value-from-float">
-<ANCHOR id="seed-value-to-double" href="seed/seed-Native-Type-Conversion.html#seed-value-to-double">
-<ANCHOR id="seed-value-from-double" href="seed/seed-Native-Type-Conversion.html#seed-value-from-double">
-<ANCHOR id="seed-value-to-string" href="seed/seed-Native-Type-Conversion.html#seed-value-to-string">
-<ANCHOR id="seed-value-from-string" href="seed/seed-Native-Type-Conversion.html#seed-value-from-string">
-<ANCHOR id="seed-value-from-binary-string" href="seed/seed-Native-Type-Conversion.html#seed-value-from-binary-string">
-<ANCHOR id="seed-value-to-object" href="seed/seed-Native-Type-Conversion.html#seed-value-to-object">
-<ANCHOR id="seed-value-from-object" href="seed/seed-Native-Type-Conversion.html#seed-value-from-object">
-<ANCHOR id="seed-value-to-filename" href="seed/seed-Native-Type-Conversion.html#seed-value-to-filename">
-<ANCHOR id="seed-value-from-filename" href="seed/seed-Native-Type-Conversion.html#seed-value-from-filename">
-<ANCHOR id="seed-value-to-format" href="seed/seed-Native-Type-Conversion.html#seed-value-to-format">
-<ANCHOR id="seed-pointer-get-pointer" href="seed/seed-Native-Type-Conversion.html#seed-pointer-get-pointer">
-<ANCHOR id="seed-make-pointer" href="seed/seed-Native-Type-Conversion.html#seed-make-pointer">
-<ANCHOR id="SeedString" href="seed/seed-Native-Type-Conversion.html#SeedString">
-<ANCHOR id="seed-string-ref" href="seed/seed-Native-Type-Conversion.html#seed-string-ref">
-<ANCHOR id="seed-string-unref" href="seed/seed-Native-Type-Conversion.html#seed-string-unref">
-<ANCHOR id="seed-string-get-maximum-size" href="seed/seed-Native-Type-Conversion.html#seed-string-get-maximum-size">
-<ANCHOR id="seed-string-to-utf8-buffer" href="seed/seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer">
-<ANCHOR id="seed-string-is-equal" href="seed/seed-Native-Type-Conversion.html#seed-string-is-equal">
-<ANCHOR id="seed-string-is-equal-utf8" href="seed/seed-Native-Type-Conversion.html#seed-string-is-equal-utf8">
-<ANCHOR id="seed-Operating-on-Native-Types" href="seed/seed-Operating-on-Native-Types.html">
-<ANCHOR id="seed-Operating-on-Native-Types.synopsis" href="seed/seed-Operating-on-Native-Types.html#seed-Operating-on-Native-Types.synopsis">
-<ANCHOR id="seed-Operating-on-Native-Types.description" href="seed/seed-Operating-on-Native-Types.html#seed-Operating-on-Native-Types.description">
-<ANCHOR id="seed-Operating-on-Native-Types.details" href="seed/seed-Operating-on-Native-Types.html#seed-Operating-on-Native-Types.details">
-<ANCHOR id="seed-value-unprotect" href="seed/seed-Operating-on-Native-Types.html#seed-value-unprotect">
-<ANCHOR id="seed-value-protect" href="seed/seed-Operating-on-Native-Types.html#seed-value-protect">
-<ANCHOR id="seed-value-is-undefined" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-undefined">
-<ANCHOR id="seed-value-is-null" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-null">
-<ANCHOR id="seed-value-is-function" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-function">
-<ANCHOR id="seed-value-is-number" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-number">
-<ANCHOR id="seed-value-is-string" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-string">
-<ANCHOR id="seed-value-is-object-of-class" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-object-of-class">
-<ANCHOR id="seed-value-is-object" href="seed/seed-Operating-on-Native-Types.html#seed-value-is-object">
-<ANCHOR id="seed-value-get-type" href="seed/seed-Operating-on-Native-Types.html#seed-value-get-type">
-<ANCHOR id="seed-JS-Objects" href="seed/seed-JS-Objects.html">
-<ANCHOR id="seed-JS-Objects.synopsis" href="seed/seed-JS-Objects.html#seed-JS-Objects.synopsis">
-<ANCHOR id="seed-JS-Objects.description" href="seed/seed-JS-Objects.html#seed-JS-Objects.description">
-<ANCHOR id="seed-JS-Objects.details" href="seed/seed-JS-Objects.html#seed-JS-Objects.details">
-<ANCHOR id="SeedObject" href="seed/seed-JS-Objects.html#SeedObject">
-<ANCHOR id="seed-make-object" href="seed/seed-JS-Objects.html#seed-make-object">
-<ANCHOR id="seed-make-array" href="seed/seed-JS-Objects.html#seed-make-array">
-<ANCHOR id="seed-object-call" href="seed/seed-JS-Objects.html#seed-object-call">
-<ANCHOR id="seed-object-set-property-at-index" href="seed/seed-JS-Objects.html#seed-object-set-property-at-index">
-<ANCHOR id="seed-object-get-property-at-index" href="seed/seed-JS-Objects.html#seed-object-get-property-at-index">
-<ANCHOR id="seed-object-is-of-class" href="seed/seed-JS-Objects.html#seed-object-is-of-class">
-<ANCHOR id="seed-object-get-private" href="seed/seed-JS-Objects.html#seed-object-get-private">
-<ANCHOR id="seed-object-set-private" href="seed/seed-JS-Objects.html#seed-object-set-private">
-<ANCHOR id="seed-object-get-property" href="seed/seed-JS-Objects.html#seed-object-get-property">
-<ANCHOR id="seed-object-set-property" href="seed/seed-JS-Objects.html#seed-object-set-property">
-<ANCHOR id="seed-object-get-prototype" href="seed/seed-JS-Objects.html#seed-object-get-prototype">
-<ANCHOR id="seed-object-copy-property-names" href="seed/seed-JS-Objects.html#seed-object-copy-property-names">
-<ANCHOR id="SeedObjectInitializeCallback" href="seed/seed-JS-Objects.html#SeedObjectInitializeCallback">
-<ANCHOR id="SeedObjectFinalizeCallback" href="seed/seed-JS-Objects.html#SeedObjectFinalizeCallback">
-<ANCHOR id="SeedObjectHasPropertyCallback" href="seed/seed-JS-Objects.html#SeedObjectHasPropertyCallback">
-<ANCHOR id="SeedObjectGetPropertyCallback" href="seed/seed-JS-Objects.html#SeedObjectGetPropertyCallback">
-<ANCHOR id="SeedObjectSetPropertyCallback" href="seed/seed-JS-Objects.html#SeedObjectSetPropertyCallback">
-<ANCHOR id="SeedObjectDeletePropertyCallback" href="seed/seed-JS-Objects.html#SeedObjectDeletePropertyCallback">
-<ANCHOR id="SeedObjectGetPropertyNamesCallback" href="seed/seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback">
-<ANCHOR id="SeedObjectCallAsFunctionCallback" href="seed/seed-JS-Objects.html#SeedObjectCallAsFunctionCallback">
-<ANCHOR id="SeedObjectHasInstanceCallback" href="seed/seed-JS-Objects.html#SeedObjectHasInstanceCallback">
-<ANCHOR id="SeedObjectConvertToTypeCallback" href="seed/seed-JS-Objects.html#SeedObjectConvertToTypeCallback">
-<ANCHOR id="SeedObjectCallAsConstructorCallback" href="seed/seed-JS-Objects.html#SeedObjectCallAsConstructorCallback">
-<ANCHOR id="seed-Native-Functions" href="seed/seed-Native-Functions.html">
-<ANCHOR id="seed-Native-Functions.synopsis" href="seed/seed-Native-Functions.html#seed-Native-Functions.synopsis">
-<ANCHOR id="seed-Native-Functions.description" href="seed/seed-Native-Functions.html#seed-Native-Functions.description">
-<ANCHOR id="seed-Native-Functions.details" href="seed/seed-Native-Functions.html#seed-Native-Functions.details">
-<ANCHOR id="SeedFunctionCallback" href="seed/seed-Native-Functions.html#SeedFunctionCallback">
-<ANCHOR id="seed-make-function" href="seed/seed-Native-Functions.html#seed-make-function">
-<ANCHOR id="seed-create-function" href="seed/seed-Native-Functions.html#seed-create-function">
-<ANCHOR id="seed-JavaScript-Classes" href="seed/seed-JavaScript-Classes.html">
-<ANCHOR id="seed-JavaScript-Classes.synopsis" href="seed/seed-JavaScript-Classes.html#seed-JavaScript-Classes.synopsis">
-<ANCHOR id="seed-JavaScript-Classes.description" href="seed/seed-JavaScript-Classes.html#seed-JavaScript-Classes.description">
-<ANCHOR id="seed-JavaScript-Classes.details" href="seed/seed-JavaScript-Classes.html#seed-JavaScript-Classes.details">
-<ANCHOR id="SeedPropertyAttributes" href="seed/seed-JavaScript-Classes.html#SeedPropertyAttributes">
-<ANCHOR id="SeedClassAttributes" href="seed/seed-JavaScript-Classes.html#SeedClassAttributes">
-<ANCHOR id="SeedClass" href="seed/seed-JavaScript-Classes.html#SeedClass">
-<ANCHOR id="seed-empty-class" href="seed/seed-JavaScript-Classes.html#seed-empty-class">
-<ANCHOR id="seed-create-class" href="seed/seed-JavaScript-Classes.html#seed-create-class">
-<ANCHOR id="seed-make-constructor" href="seed/seed-JavaScript-Classes.html#seed-make-constructor">
-<ANCHOR id="seed-SeedClosure" href="seed/seed-SeedClosure.html">
-<ANCHOR id="seed-SeedClosure.synopsis" href="seed/seed-SeedClosure.html#seed-SeedClosure.synopsis">
-<ANCHOR id="seed-SeedClosure.description" href="seed/seed-SeedClosure.html#seed-SeedClosure.description">
-<ANCHOR id="seed-SeedClosure.details" href="seed/seed-SeedClosure.html#seed-SeedClosure.details">
-<ANCHOR id="SeedClosure" href="seed/seed-SeedClosure.html#SeedClosure">
-<ANCHOR id="seed-closure-new" href="seed/seed-SeedClosure.html#seed-closure-new">
-<ANCHOR id="seed-closure-get-callable" href="seed/seed-SeedClosure.html#seed-closure-get-callable">
-<ANCHOR id="seed-closure-invoke" href="seed/seed-SeedClosure.html#seed-closure-invoke">
-<ANCHOR id="seed-closure-invoke-with-context" href="seed/seed-SeedClosure.html#seed-closure-invoke-with-context">
-<ANCHOR id="seed-closure-warn-exception" href="seed/seed-SeedClosure.html#seed-closure-warn-exception">
-<ANCHOR id="seed-Modules" href="seed/seed-Modules.html">
-<ANCHOR id="seed-Modules.synopsis" href="seed/seed-Modules.html#seed-Modules.synopsis">
-<ANCHOR id="seed-Modules.description" href="seed/seed-Modules.html#seed-Modules.description">
-<ANCHOR id="seed-Modules.details" href="seed/seed-Modules.html#seed-Modules.details">
-<ANCHOR id="CHECK-ARG-COUNT:CAPS" href="seed/seed-Modules.html#CHECK-ARG-COUNT:CAPS">
-<ANCHOR id="DEFINE-ENUM-MEMBER:CAPS" href="seed/seed-Modules.html#DEFINE-ENUM-MEMBER:CAPS">
-<ANCHOR id="DEFINE-ENUM-MEMBER-EXT:CAPS" href="seed/seed-Modules.html#DEFINE-ENUM-MEMBER-EXT:CAPS">
-<ANCHOR id="SeedModuleInitCallback" href="seed/seed-Modules.html#SeedModuleInitCallback">
-<ANCHOR id="readline-readline" href="seed/readline-module.html#readline-readline">
-<ANCHOR id="readline-bind" href="seed/readline-module.html#readline-bind">
-<ANCHOR id="readline-done" href="seed/readline-module.html#readline-done">
-<ANCHOR id="readline-buffer" href="seed/readline-module.html#readline-buffer">
-<ANCHOR id="readline-insert" href="seed/readline-module.html#readline-insert">
-<ANCHOR id="sqlite-database" href="seed/sqlite-module.html#sqlite-database">
-<ANCHOR id="sqlite-exec" href="seed/sqlite-module.html#sqlite-exec">
-<ANCHOR id="sqlite-close" href="seed/sqlite-module.html#sqlite-close">
-<ANCHOR id="gtkbuilder-connect-signals" href="seed/GtkBuilder-module.html#gtkbuilder-connect-signals">
-<ANCHOR id="sandbox-context" href="seed/Sandbox-module.html#sandbox-context">
-<ANCHOR id="sandbox-eval" href="seed/Sandbox-module.html#sandbox-eval">
-<ANCHOR id="sandbox-addglobals" href="seed/Sandbox-module.html#sandbox-addglobals">
-<ANCHOR id="sandbox-destroy" href="seed/Sandbox-module.html#sandbox-destroy">
-<ANCHOR id="sandbox-global" href="seed/Sandbox-module.html#sandbox-global">
diff --git a/doc/reference/html/ix01.html b/doc/reference/html/ix01.html
index 2037c59..cc6980f 100644
--- a/doc/reference/html/ix01.html
+++ b/doc/reference/html/ix01.html
@@ -2,340 +2,339 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Index</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Index: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="index.html" title="Seed Reference Manual">
 <link rel="prev" href="Sandbox-module.html" title="Sandbox">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="Sandbox-module.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td> </td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="Sandbox-module.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
 </tr></table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="idp3803440"></a>Index</h2></div></div></div>
-<div class="index">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.6"></a>Index</h1></div></div></div>
+<div xmlns:xlink="http://www.w3.org/1999/xlink" class="index">
 <div class="indexdiv">
 <h3>C</h3>
 <dl>
-<dt>CHECK_ARG_COUNT, <a class="indexterm" href="seed-Modules.html#CHECK-ARG-COUNT:CAPS">CHECK_ARG_COUNT()</a>
+<dt id="ientry-idm45529388784272">CHECK_ARG_COUNT, <a class="indexterm" href="seed-Modules.html#CHECK-ARG-COUNT:CAPS">CHECK_ARG_COUNT()</a>
 </dt>
-<dt>SeedClass, <a class="indexterm" href="seed-JavaScript-Classes.html#SeedClass">SeedClass</a>
+<dt id="ientry-idm45529388933312">SeedClass, <a class="indexterm" href="seed-JavaScript-Classes.html#SeedClass">SeedClass</a>
 </dt>
-<dt>SeedClassAttributes, <a class="indexterm" href="seed-JavaScript-Classes.html#SeedClassAttributes">enum SeedClassAttributes</a>
+<dt id="ientry-idm45529389800128">SeedClassAttributes, <a class="indexterm" href="seed-JavaScript-Classes.html#SeedClassAttributes">enum SeedClassAttributes</a>
 </dt>
-<dt>SeedClosure, <a class="indexterm" href="seed-SeedClosure.html#SeedClosure">struct SeedClosure</a>
+<dt id="ientry-idm45529384583248">SeedClosure, <a class="indexterm" href="seed-SeedClosure.html#SeedClosure">struct SeedClosure</a>
 </dt>
-<dt>seed_closure_get_callable, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-get-callable">seed_closure_get_callable ()</a>
+<dt id="ientry-idm45529384682448">seed_closure_get_callable, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-get-callable">seed_closure_get_callable ()</a>
 </dt>
-<dt>seed_closure_invoke, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-invoke">seed_closure_invoke ()</a>
+<dt id="ientry-idm45529384617392">seed_closure_invoke, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-invoke">seed_closure_invoke ()</a>
 </dt>
-<dt>seed_closure_invoke_with_context, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-invoke-with-context">seed_closure_invoke_with_context ()</a>
+<dt id="ientry-idm45529384606720">seed_closure_invoke_with_context, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-invoke-with-context">seed_closure_invoke_with_context ()</a>
 </dt>
-<dt>seed_closure_new, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-new">seed_closure_new ()</a>
+<dt id="ientry-idm45529384693232">seed_closure_new, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-new">seed_closure_new ()</a>
 </dt>
-<dt>seed_closure_warn_exception, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-warn-exception">seed_closure_warn_exception ()</a>
+<dt id="ientry-idm45529384594512">seed_closure_warn_exception, <a class="indexterm" href="seed-SeedClosure.html#seed-closure-warn-exception">seed_closure_warn_exception ()</a>
 </dt>
-<dt>SeedContext, <a class="indexterm" href="seed-Contexts.html#SeedContext">SeedContext</a>
+<dt id="ientry-idm45529388419360">SeedContext, <a class="indexterm" href="seed-Contexts.html#SeedContext">SeedContext</a>
 </dt>
-<dt>SeedContextGroup, <a class="indexterm" href="seed-Contexts.html#SeedContextGroup">SeedContextGroup</a>
+<dt id="ientry-idm45529388410768">SeedContextGroup, <a class="indexterm" href="seed-Contexts.html#SeedContextGroup">SeedContextGroup</a>
 </dt>
-<dt>seed_context_collect, <a class="indexterm" href="seed-Contexts.html#seed-context-collect">seed_context_collect ()</a>
+<dt id="ientry-idm45529388485904">seed_context_collect, <a class="indexterm" href="seed-Contexts.html#seed-context-collect">seed_context_collect ()</a>
 </dt>
-<dt>seed_context_create, <a class="indexterm" href="seed-Contexts.html#seed-context-create">seed_context_create ()</a>
+<dt id="ientry-idm45529388547328">seed_context_create, <a class="indexterm" href="seed-Contexts.html#seed-context-create">seed_context_create ()</a>
 </dt>
-<dt>seed_context_get_global_object, <a class="indexterm" href="seed-Contexts.html#seed-context-get-global-object">seed_context_get_global_object ()</a>
+<dt id="ientry-idm45529388470416">seed_context_get_global_object, <a class="indexterm" href="seed-Contexts.html#seed-context-get-global-object">seed_context_get_global_object ()</a>
 </dt>
-<dt>seed_context_ref, <a class="indexterm" href="seed-Contexts.html#seed-context-ref">seed_context_ref ()</a>
+<dt id="ientry-idm45529388520480">seed_context_ref, <a class="indexterm" href="seed-Contexts.html#seed-context-ref">seed_context_ref ()</a>
 </dt>
-<dt>seed_context_unref, <a class="indexterm" href="seed-Contexts.html#seed-context-unref">seed_context_unref ()</a>
+<dt id="ientry-idm45529388501920">seed_context_unref, <a class="indexterm" href="seed-Contexts.html#seed-context-unref">seed_context_unref ()</a>
 </dt>
-<dt>seed_create_class, <a class="indexterm" href="seed-JavaScript-Classes.html#seed-create-class">seed_create_class ()</a>
+<dt id="ientry-idm45529388644048">seed_create_class, <a class="indexterm" href="seed-JavaScript-Classes.html#seed-create-class">seed_create_class ()</a>
 </dt>
-<dt>seed_create_function, <a class="indexterm" href="seed-Native-Functions.html#seed-create-function">seed_create_function ()</a>
+<dt id="ientry-idm45529386174944">seed_create_function, <a class="indexterm" href="seed-Native-Functions.html#seed-create-function">seed_create_function ()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt>DEFINE_ENUM_MEMBER, <a class="indexterm" href="seed-Modules.html#DEFINE-ENUM-MEMBER:CAPS">DEFINE_ENUM_MEMBER()</a>
+<dt id="ientry-idm45529384750944">DEFINE_ENUM_MEMBER, <a class="indexterm" href="seed-Modules.html#DEFINE-ENUM-MEMBER:CAPS">DEFINE_ENUM_MEMBER()</a>
 </dt>
-<dt>DEFINE_ENUM_MEMBER_EXT, <a class="indexterm" href="seed-Modules.html#DEFINE-ENUM-MEMBER-EXT:CAPS">DEFINE_ENUM_MEMBER_EXT()</a>
+<dt id="ientry-idm45529384567392">DEFINE_ENUM_MEMBER_EXT, <a class="indexterm" href="seed-Modules.html#DEFINE-ENUM-MEMBER-EXT:CAPS">DEFINE_ENUM_MEMBER_EXT()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>E</h3>
 <dl>
-<dt>seed_empty_class, <a class="indexterm" href="seed-JavaScript-Classes.html#seed-empty-class">seed_empty_class</a>
+<dt id="ientry-idm45529388928992">seed_empty_class, <a class="indexterm" href="seed-JavaScript-Classes.html#seed-empty-class">seed_empty_class</a>
 </dt>
-<dt>SeedEngine, <a class="indexterm" href="seed-Initialization.html#SeedEngine">struct SeedEngine</a>
+<dt id="ientry-idm45529388553328">SeedEngine, <a class="indexterm" href="seed-Initialization.html#SeedEngine">struct SeedEngine</a>
 </dt>
-<dt>seed_engine_get_search_path, <a class="indexterm" href="seed-Initialization.html#seed-engine-get-search-path">seed_engine_get_search_path ()</a>
+<dt id="ientry-idm45529388573072">seed_engine_get_search_path, <a class="indexterm" href="seed-Initialization.html#seed-engine-get-search-path">seed_engine_get_search_path ()</a>
 </dt>
-<dt>seed_engine_set_search_path, <a class="indexterm" href="seed-Initialization.html#seed-engine-set-search-path">seed_engine_set_search_path ()</a>
+<dt id="ientry-idm45529388593248">seed_engine_set_search_path, <a class="indexterm" href="seed-Initialization.html#seed-engine-set-search-path">seed_engine_set_search_path ()</a>
 </dt>
-<dt>seed_evaluate, <a class="indexterm" href="seed-Evaluation.html#seed-evaluate">seed_evaluate ()</a>
+<dt id="ientry-idm45529390533248">seed_evaluate, <a class="indexterm" href="seed-Evaluation.html#seed-evaluate">seed_evaluate ()</a>
 </dt>
-<dt>SeedException, <a class="indexterm" href="seed-Exceptions.html#SeedException">SeedException</a>
+<dt id="ientry-idm45529385968560">SeedException, <a class="indexterm" href="seed-Exceptions.html#SeedException">SeedException</a>
 </dt>
-<dt>seed_exception_get_file, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-file">seed_exception_get_file ()</a>
+<dt id="ientry-idm45529386017456">seed_exception_get_file, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-file">seed_exception_get_file ()</a>
 </dt>
-<dt>seed_exception_get_line, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-line">seed_exception_get_line ()</a>
+<dt id="ientry-idm45529386040912">seed_exception_get_line, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-line">seed_exception_get_line ()</a>
 </dt>
-<dt>seed_exception_get_message, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-message">seed_exception_get_message ()</a>
+<dt id="ientry-idm45529386064528">seed_exception_get_message, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-message">seed_exception_get_message ()</a>
 </dt>
-<dt>seed_exception_get_name, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-name">seed_exception_get_name ()</a>
+<dt id="ientry-idm45529386088128">seed_exception_get_name, <a class="indexterm" href="seed-Exceptions.html#seed-exception-get-name">seed_exception_get_name ()</a>
 </dt>
-<dt>seed_exception_to_string, <a class="indexterm" href="seed-Exceptions.html#seed-exception-to-string">seed_exception_to_string ()</a>
+<dt id="ientry-idm45529385993984">seed_exception_to_string, <a class="indexterm" href="seed-Exceptions.html#seed-exception-to-string">seed_exception_to_string ()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>F</h3>
-<dl><dt>SeedFunctionCallback, <a class="indexterm" href="seed-Native-Functions.html#SeedFunctionCallback">SeedFunctionCallback ()</a>
+<dl><dt id="ientry-idm45529387192496">SeedFunctionCallback, <a class="indexterm" href="seed-Native-Functions.html#SeedFunctionCallback">SeedFunctionCallback ()</a>
 </dt></dl>
 </div>
 <div class="indexdiv">
 <h3>G</h3>
-<dl><dt>SeedGlobalContext, <a class="indexterm" href="seed-Contexts.html#SeedGlobalContext">SeedGlobalContext</a>
+<dl><dt id="ientry-idm45529388415088">SeedGlobalContext, <a class="indexterm" href="seed-Contexts.html#SeedGlobalContext">SeedGlobalContext</a>
 </dt></dl>
 </div>
 <div class="indexdiv">
 <h3>I</h3>
 <dl>
-<dt>seed_importer_add_global, <a class="indexterm" href="seed-Contexts.html#seed-importer-add-global">seed_importer_add_global ()</a>
+<dt id="ientry-idm45529388436992">seed_importer_add_global, <a class="indexterm" href="seed-Contexts.html#seed-importer-add-global">seed_importer_add_global ()</a>
 </dt>
-<dt>seed_importer_set_search_path, <a class="indexterm" href="seed-Contexts.html#seed-importer-set-search-path">seed_importer_set_search_path ()</a>
+<dt id="ientry-idm45529388429072">seed_importer_set_search_path, <a class="indexterm" href="seed-Contexts.html#seed-importer-set-search-path">seed_importer_set_search_path ()</a>
 </dt>
-<dt>seed_init, <a class="indexterm" href="seed-Initialization.html#seed-init">seed_init ()</a>
+<dt id="ientry-idm45529390986208">seed_init, <a class="indexterm" href="seed-Initialization.html#seed-init">seed_init ()</a>
 </dt>
-<dt>seed_init_with_context_group, <a class="indexterm" href="seed-Initialization.html#seed-init-with-context-group">seed_init_with_context_group ()</a>
+<dt id="ientry-idm45529388620880">seed_init_with_context_group, <a class="indexterm" href="seed-Initialization.html#seed-init-with-context-group">seed_init_with_context_group ()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>M</h3>
 <dl>
-<dt>seed_make_array, <a class="indexterm" href="seed-JS-Objects.html#seed-make-array">seed_make_array ()</a>
+<dt id="ientry-idm45529385032256">seed_make_array, <a class="indexterm" href="seed-JS-Objects.html#seed-make-array">seed_make_array ()</a>
 </dt>
-<dt>seed_make_constructor, <a class="indexterm" href="seed-JavaScript-Classes.html#seed-make-constructor">seed_make_constructor ()</a>
+<dt id="ientry-idm45529390915680">seed_make_constructor, <a class="indexterm" href="seed-JavaScript-Classes.html#seed-make-constructor">seed_make_constructor ()</a>
 </dt>
-<dt>seed_make_exception, <a class="indexterm" href="seed-Exceptions.html#seed-make-exception">seed_make_exception ()</a>
+<dt id="ientry-idm45529386118832">seed_make_exception, <a class="indexterm" href="seed-Exceptions.html#seed-make-exception">seed_make_exception ()</a>
 </dt>
-<dt>seed_make_function, <a class="indexterm" href="seed-Native-Functions.html#seed-make-function">seed_make_function ()</a>
+<dt id="ientry-idm45529389175024">seed_make_function, <a class="indexterm" href="seed-Native-Functions.html#seed-make-function">seed_make_function ()</a>
 </dt>
-<dt>seed_make_null, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-make-null">seed_make_null ()</a>
+<dt id="ientry-idm45529385595360">seed_make_null, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-make-null">seed_make_null ()</a>
 </dt>
-<dt>seed_make_object, <a class="indexterm" href="seed-JS-Objects.html#seed-make-object">seed_make_object ()</a>
+<dt id="ientry-idm45529385052592">seed_make_object, <a class="indexterm" href="seed-JS-Objects.html#seed-make-object">seed_make_object ()</a>
 </dt>
-<dt>seed_make_pointer, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-make-pointer">seed_make_pointer ()</a>
+<dt id="ientry-idm45529382895024">seed_make_pointer, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-make-pointer">seed_make_pointer ()</a>
 </dt>
-<dt>seed_make_script, <a class="indexterm" href="seed-Evaluation.html#seed-make-script">seed_make_script ()</a>
+<dt id="ientry-idm45529387291616">seed_make_script, <a class="indexterm" href="seed-Evaluation.html#seed-make-script">seed_make_script ()</a>
 </dt>
-<dt>seed_make_undefined, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-make-undefined">seed_make_undefined ()</a>
+<dt id="ientry-idm45529385613232">seed_make_undefined, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-make-undefined">seed_make_undefined ()</a>
 </dt>
-<dt>SeedModuleInitCallback, <a class="indexterm" href="seed-Modules.html#SeedModuleInitCallback">SeedModuleInitCallback ()</a>
+<dt id="ientry-idm45529384547504">SeedModuleInitCallback, <a class="indexterm" href="seed-Modules.html#SeedModuleInitCallback">SeedModuleInitCallback ()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>O</h3>
 <dl>
-<dt>SeedObject, <a class="indexterm" href="seed-JS-Objects.html#SeedObject">SeedObject</a>
+<dt id="ientry-idm45529384265104">SeedObject, <a class="indexterm" href="seed-JS-Objects.html#SeedObject">SeedObject</a>
 </dt>
-<dt>SeedObjectCallAsConstructorCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback">SeedObjectCallAsConstructorCallback ()</a>
+<dt id="ientry-idm45529384280704">SeedObjectCallAsConstructorCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback">SeedObjectCallAsConstructorCallback ()</a>
 </dt>
-<dt>SeedObjectCallAsFunctionCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectCallAsFunctionCallback">SeedObjectCallAsFunctionCallback ()</a>
+<dt id="ientry-idm45529384320384">SeedObjectCallAsFunctionCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectCallAsFunctionCallback">SeedObjectCallAsFunctionCallback ()</a>
 </dt>
-<dt>SeedObjectConvertToTypeCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectConvertToTypeCallback">SeedObjectConvertToTypeCallback ()</a>
+<dt id="ientry-idm45529384292928">SeedObjectConvertToTypeCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectConvertToTypeCallback">SeedObjectConvertToTypeCallback ()</a>
 </dt>
-<dt>SeedObjectDeletePropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectDeletePropertyCallback">SeedObjectDeletePropertyCallback ()</a>
+<dt id="ientry-idm45529384340000">SeedObjectDeletePropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectDeletePropertyCallback">SeedObjectDeletePropertyCallback ()</a>
 </dt>
-<dt>SeedObjectFinalizeCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectFinalizeCallback">SeedObjectFinalizeCallback ()</a>
+<dt id="ientry-idm45529384384608">SeedObjectFinalizeCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectFinalizeCallback">SeedObjectFinalizeCallback ()</a>
 </dt>
-<dt>SeedObjectGetPropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectGetPropertyCallback">SeedObjectGetPropertyCallback ()</a>
+<dt id="ientry-idm45529384365872">SeedObjectGetPropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectGetPropertyCallback">SeedObjectGetPropertyCallback ()</a>
 </dt>
-<dt>SeedObjectGetPropertyNamesCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback">SeedObjectGetPropertyNamesCallback ()</a>
+<dt id="ientry-idm45529384327776">SeedObjectGetPropertyNamesCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback">SeedObjectGetPropertyNamesCallback ()</a>
 </dt>
-<dt>SeedObjectHasInstanceCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectHasInstanceCallback">SeedObjectHasInstanceCallback ()</a>
+<dt id="ientry-idm45529384305152">SeedObjectHasInstanceCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectHasInstanceCallback">SeedObjectHasInstanceCallback ()</a>
 </dt>
-<dt>SeedObjectHasPropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectHasPropertyCallback">SeedObjectHasPropertyCallback ()</a>
+<dt id="ientry-idm45529384376672">SeedObjectHasPropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectHasPropertyCallback">SeedObjectHasPropertyCallback ()</a>
 </dt>
-<dt>SeedObjectInitializeCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectInitializeCallback">SeedObjectInitializeCallback ()</a>
+<dt id="ientry-idm45529384393984">SeedObjectInitializeCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectInitializeCallback">SeedObjectInitializeCallback ()</a>
 </dt>
-<dt>SeedObjectSetPropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectSetPropertyCallback">SeedObjectSetPropertyCallback ()</a>
+<dt id="ientry-idm45529384353648">SeedObjectSetPropertyCallback, <a class="indexterm" href="seed-JS-Objects.html#SeedObjectSetPropertyCallback">SeedObjectSetPropertyCallback ()</a>
 </dt>
-<dt>seed_object_call, <a class="indexterm" href="seed-JS-Objects.html#seed-object-call">seed_object_call ()</a>
+<dt id="ientry-idm45529384998784">seed_object_call, <a class="indexterm" href="seed-JS-Objects.html#seed-object-call">seed_object_call ()</a>
 </dt>
-<dt>seed_object_copy_property_names, <a class="indexterm" href="seed-JS-Objects.html#seed-object-copy-property-names">seed_object_copy_property_names ()</a>
+<dt id="ientry-idm45529384416080">seed_object_copy_property_names, <a class="indexterm" href="seed-JS-Objects.html#seed-object-copy-property-names">seed_object_copy_property_names ()</a>
 </dt>
-<dt>seed_object_get_private, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-private">seed_object_get_private ()</a>
+<dt id="ientry-idm45529384900864">seed_object_get_private, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-private">seed_object_get_private ()</a>
 </dt>
-<dt>seed_object_get_property, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-property">seed_object_get_property ()</a>
+<dt id="ientry-idm45529384493968">seed_object_get_property, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-property">seed_object_get_property ()</a>
 </dt>
-<dt>seed_object_get_property_at_index, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-property-at-index">seed_object_get_property_at_index ()</a>
+<dt id="ientry-idm45529384920896">seed_object_get_property_at_index, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-property-at-index">seed_object_get_property_at_index ()</a>
 </dt>
-<dt>seed_object_get_prototype, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-prototype">seed_object_get_prototype ()</a>
+<dt id="ientry-idm45529384437888">seed_object_get_prototype, <a class="indexterm" href="seed-JS-Objects.html#seed-object-get-prototype">seed_object_get_prototype ()</a>
 </dt>
-<dt>seed_object_is_of_class, <a class="indexterm" href="seed-JS-Objects.html#seed-object-is-of-class">seed_object_is_of_class ()</a>
+<dt id="ientry-idm45529384910144">seed_object_is_of_class, <a class="indexterm" href="seed-JS-Objects.html#seed-object-is-of-class">seed_object_is_of_class ()</a>
 </dt>
-<dt>seed_object_set_private, <a class="indexterm" href="seed-JS-Objects.html#seed-object-set-private">seed_object_set_private ()</a>
+<dt id="ientry-idm45529384882256">seed_object_set_private, <a class="indexterm" href="seed-JS-Objects.html#seed-object-set-private">seed_object_set_private ()</a>
 </dt>
-<dt>seed_object_set_property, <a class="indexterm" href="seed-JS-Objects.html#seed-object-set-property">seed_object_set_property ()</a>
+<dt id="ientry-idm45529384468976">seed_object_set_property, <a class="indexterm" href="seed-JS-Objects.html#seed-object-set-property">seed_object_set_property ()</a>
 </dt>
-<dt>seed_object_set_property_at_index, <a class="indexterm" href="seed-JS-Objects.html#seed-object-set-property-at-index">seed_object_set_property_at_index ()</a>
+<dt id="ientry-idm45529384957296">seed_object_set_property_at_index, <a class="indexterm" href="seed-JS-Objects.html#seed-object-set-property-at-index">seed_object_set_property_at_index ()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>P</h3>
 <dl>
-<dt>seed_pointer_get_pointer, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-pointer-get-pointer">seed_pointer_get_pointer ()</a>
+<dt id="ientry-idm45529382902960">seed_pointer_get_pointer, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-pointer-get-pointer">seed_pointer_get_pointer ()</a>
 </dt>
-<dt>seed_prepare_global_context, <a class="indexterm" href="seed-Contexts.html#seed-prepare-global-context">seed_prepare_global_context ()</a>
+<dt id="ientry-idm45529388453184">seed_prepare_global_context, <a class="indexterm" href="seed-Contexts.html#seed-prepare-global-context">seed_prepare_global_context ()</a>
 </dt>
-<dt>SeedPropertyAttributes, <a class="indexterm" href="seed-JavaScript-Classes.html#SeedPropertyAttributes">enum SeedPropertyAttributes</a>
+<dt id="ientry-idm45529384651376">SeedPropertyAttributes, <a class="indexterm" href="seed-JavaScript-Classes.html#SeedPropertyAttributes">enum SeedPropertyAttributes</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>S</h3>
 <dl>
-<dt>SeedScript, <a class="indexterm" href="seed-Evaluation.html#SeedScript">SeedScript</a>
+<dt id="ientry-idm45529390144448">SeedScript, <a class="indexterm" href="seed-Evaluation.html#SeedScript">SeedScript</a>
 </dt>
-<dt>seed_script_destroy, <a class="indexterm" href="seed-Evaluation.html#seed-script-destroy">seed_script_destroy ()</a>
+<dt id="ientry-idm45529390152672">seed_script_destroy, <a class="indexterm" href="seed-Evaluation.html#seed-script-destroy">seed_script_destroy ()</a>
 </dt>
-<dt>seed_script_exception, <a class="indexterm" href="seed-Evaluation.html#seed-script-exception">seed_script_exception ()</a>
+<dt id="ientry-idm45529390172064">seed_script_exception, <a class="indexterm" href="seed-Evaluation.html#seed-script-exception">seed_script_exception ()</a>
 </dt>
-<dt>seed_script_new_from_file, <a class="indexterm" href="seed-Evaluation.html#seed-script-new-from-file">seed_script_new_from_file ()</a>
+<dt id="ientry-idm45529390196592">seed_script_new_from_file, <a class="indexterm" href="seed-Evaluation.html#seed-script-new-from-file">seed_script_new_from_file ()</a>
 </dt>
-<dt>seed_signal_connect, <a class="indexterm" href="seed-Signals.html#seed-signal-connect">seed_signal_connect ()</a>
+<dt id="ientry-idm45529390368192">seed_signal_connect, <a class="indexterm" href="seed-Signals.html#seed-signal-connect">seed_signal_connect ()</a>
 </dt>
-<dt>seed_signal_connect_value, <a class="indexterm" href="seed-Signals.html#seed-signal-connect-value">seed_signal_connect_value ()</a>
+<dt id="ientry-idm45529390100480">seed_signal_connect_value, <a class="indexterm" href="seed-Signals.html#seed-signal-connect-value">seed_signal_connect_value ()</a>
 </dt>
-<dt>seed_simple_evaluate, <a class="indexterm" href="seed-Evaluation.html#seed-simple-evaluate">seed_simple_evaluate ()</a>
+<dt id="ientry-idm45529390224480">seed_simple_evaluate, <a class="indexterm" href="seed-Evaluation.html#seed-simple-evaluate">seed_simple_evaluate ()</a>
 </dt>
-<dt>SeedString, <a class="indexterm" href="seed-Native-Type-Conversion.html#SeedString">SeedString</a>
+<dt id="ientry-idm45529382727376">SeedString, <a class="indexterm" href="seed-Native-Type-Conversion.html#SeedString">SeedString</a>
 </dt>
-<dt>seed_string_get_maximum_size, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-get-maximum-size">seed_string_get_maximum_size ()</a>
+<dt id="ientry-idm45529382851888">seed_string_get_maximum_size, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-get-maximum-size">seed_string_get_maximum_size ()</a>
 </dt>
-<dt>seed_string_is_equal, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-is-equal">seed_string_is_equal ()</a>
+<dt id="ientry-idm45529382808048">seed_string_is_equal, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-is-equal">seed_string_is_equal ()</a>
 </dt>
-<dt>seed_string_is_equal_utf8, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-is-equal-utf8">seed_string_is_equal_utf8 ()</a>
+<dt id="ientry-idm45529382784640">seed_string_is_equal_utf8, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-is-equal-utf8">seed_string_is_equal_utf8 ()</a>
 </dt>
-<dt>seed_string_ref, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-ref">seed_string_ref ()</a>
+<dt id="ientry-idm45529382887088">seed_string_ref, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-ref">seed_string_ref ()</a>
 </dt>
-<dt>seed_string_to_utf8_buffer, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer">seed_string_to_utf8_buffer ()</a>
+<dt id="ientry-idm45529382834096">seed_string_to_utf8_buffer, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer">seed_string_to_utf8_buffer ()</a>
 </dt>
-<dt>seed_string_unref, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-unref">seed_string_unref ()</a>
+<dt id="ientry-idm45529382868192">seed_string_unref, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-string-unref">seed_string_unref ()</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>T</h3>
-<dl><dt>SeedType, <a class="indexterm" href="seed-Native-Type-Conversion.html#SeedType">enum SeedType</a>
+<dl><dt id="ientry-idm45529382754336">SeedType, <a class="indexterm" href="seed-Native-Type-Conversion.html#SeedType">enum SeedType</a>
 </dt></dl>
 </div>
 <div class="indexdiv">
 <h3>V</h3>
 <dl>
-<dt>SeedValue, <a class="indexterm" href="seed-Native-Type-Conversion.html#SeedValue">SeedValue</a>
+<dt id="ientry-idm45529382758720">SeedValue, <a class="indexterm" href="seed-Native-Type-Conversion.html#SeedValue">SeedValue</a>
 </dt>
-<dt>seed_value_from_binary_string, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-binary-string">seed_value_from_binary_string ()</a>
+<dt id="ientry-idm45529383097280">seed_value_from_binary_string, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-binary-string">seed_value_from_binary_string ()</a>
 </dt>
-<dt>seed_value_from_boolean, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-boolean">seed_value_from_boolean ()</a>
+<dt id="ientry-idm45529385546720">seed_value_from_boolean, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-boolean">seed_value_from_boolean ()</a>
 </dt>
-<dt>seed_value_from_char, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-char">seed_value_from_char ()</a>
+<dt id="ientry-idm45529383630656">seed_value_from_char, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-char">seed_value_from_char ()</a>
 </dt>
-<dt>seed_value_from_double, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-double">seed_value_from_double ()</a>
+<dt id="ientry-idm45529383195168">seed_value_from_double, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-double">seed_value_from_double ()</a>
 </dt>
-<dt>seed_value_from_filename, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-filename">seed_value_from_filename ()</a>
+<dt id="ientry-idm45529382965856">seed_value_from_filename, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-filename">seed_value_from_filename ()</a>
 </dt>
-<dt>seed_value_from_float, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-float">seed_value_from_float ()</a>
+<dt id="ientry-idm45529383257344">seed_value_from_float, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-float">seed_value_from_float ()</a>
 </dt>
-<dt>seed_value_from_int, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-int">seed_value_from_int ()</a>
+<dt id="ientry-idm45529383690384">seed_value_from_int, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-int">seed_value_from_int ()</a>
 </dt>
-<dt>seed_value_from_int64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-int64">seed_value_from_int64 ()</a>
+<dt id="ientry-idm45529383381888">seed_value_from_int64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-int64">seed_value_from_int64 ()</a>
 </dt>
-<dt>seed_value_from_long, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-long">seed_value_from_long ()</a>
+<dt id="ientry-idm45529383506176">seed_value_from_long, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-long">seed_value_from_long ()</a>
 </dt>
-<dt>seed_value_from_object, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-object">seed_value_from_object ()</a>
+<dt id="ientry-idm45529383029280">seed_value_from_object, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-object">seed_value_from_object ()</a>
 </dt>
-<dt>seed_value_from_string, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-string">seed_value_from_string ()</a>
+<dt id="ientry-idm45529383128720">seed_value_from_string, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-string">seed_value_from_string ()</a>
 </dt>
-<dt>seed_value_from_uchar, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-uchar">seed_value_from_uchar ()</a>
+<dt id="ientry-idm45529383568288">seed_value_from_uchar, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-uchar">seed_value_from_uchar ()</a>
 </dt>
-<dt>seed_value_from_uint, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-uint">seed_value_from_uint ()</a>
+<dt id="ientry-idm45529385485184">seed_value_from_uint, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-uint">seed_value_from_uint ()</a>
 </dt>
-<dt>seed_value_from_uint64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-uint64">seed_value_from_uint64 ()</a>
+<dt id="ientry-idm45529383319584">seed_value_from_uint64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-uint64">seed_value_from_uint64 ()</a>
 </dt>
-<dt>seed_value_from_ulong, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-ulong">seed_value_from_ulong ()</a>
+<dt id="ientry-idm45529383444064">seed_value_from_ulong, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-from-ulong">seed_value_from_ulong ()</a>
 </dt>
-<dt>seed_value_get_type, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-get-type">seed_value_get_type ()</a>
+<dt id="ientry-idm45529385249600">seed_value_get_type, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-get-type">seed_value_get_type ()</a>
 </dt>
-<dt>seed_value_is_function, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-function">seed_value_is_function ()</a>
+<dt id="ientry-idm45529385381056">seed_value_is_function, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-function">seed_value_is_function ()</a>
 </dt>
-<dt>seed_value_is_null, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-null">seed_value_is_null ()</a>
+<dt id="ientry-idm45529385406208">seed_value_is_null, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-null">seed_value_is_null ()</a>
 </dt>
-<dt>seed_value_is_number, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-number">seed_value_is_number ()</a>
+<dt id="ientry-idm45529385355872">seed_value_is_number, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-number">seed_value_is_number ()</a>
 </dt>
-<dt>seed_value_is_object, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-object">seed_value_is_object ()</a>
+<dt id="ientry-idm45529385274848">seed_value_is_object, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-object">seed_value_is_object ()</a>
 </dt>
-<dt>seed_value_is_object_of_class, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-object-of-class">seed_value_is_object_of_class ()</a>
+<dt id="ientry-idm45529385305408">seed_value_is_object_of_class, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-object-of-class">seed_value_is_object_of_class ()</a>
 </dt>
-<dt>seed_value_is_string, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-string">seed_value_is_string ()</a>
+<dt id="ientry-idm45529385330656">seed_value_is_string, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-string">seed_value_is_string ()</a>
 </dt>
-<dt>seed_value_is_undefined, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-undefined">seed_value_is_undefined ()</a>
+<dt id="ientry-idm45529385431424">seed_value_is_undefined, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-is-undefined">seed_value_is_undefined ()</a>
 </dt>
-<dt>seed_value_protect, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-protect">seed_value_protect ()</a>
+<dt id="ientry-idm45529385454576">seed_value_protect, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-protect">seed_value_protect ()</a>
 </dt>
-<dt>seed_value_to_boolean, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-boolean">seed_value_to_boolean ()</a>
+<dt id="ientry-idm45529385577488">seed_value_to_boolean, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-boolean">seed_value_to_boolean ()</a>
 </dt>
-<dt>seed_value_to_char, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-char">seed_value_to_char ()</a>
+<dt id="ientry-idm45529383661680">seed_value_to_char, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-char">seed_value_to_char ()</a>
 </dt>
-<dt>seed_value_to_double, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-double">seed_value_to_double ()</a>
+<dt id="ientry-idm45529383226288">seed_value_to_double, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-double">seed_value_to_double ()</a>
 </dt>
-<dt>seed_value_to_filename, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-filename">seed_value_to_filename ()</a>
+<dt id="ientry-idm45529382998288">seed_value_to_filename, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-filename">seed_value_to_filename ()</a>
 </dt>
-<dt>seed_value_to_float, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-float">seed_value_to_float ()</a>
+<dt id="ientry-idm45529383288368">seed_value_to_float, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-float">seed_value_to_float ()</a>
 </dt>
-<dt>seed_value_to_format, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-format">seed_value_to_format ()</a>
+<dt id="ientry-idm45529382934576">seed_value_to_format, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-format">seed_value_to_format ()</a>
 </dt>
-<dt>seed_value_to_int, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-int">seed_value_to_int ()</a>
+<dt id="ientry-idm45529383717440">seed_value_to_int, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-int">seed_value_to_int ()</a>
 </dt>
-<dt>seed_value_to_int64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-int64">seed_value_to_int64 ()</a>
+<dt id="ientry-idm45529383412848">seed_value_to_int64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-int64">seed_value_to_int64 ()</a>
 </dt>
-<dt>seed_value_to_long, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-long">seed_value_to_long ()</a>
+<dt id="ientry-idm45529383537200">seed_value_to_long, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-long">seed_value_to_long ()</a>
 </dt>
-<dt>seed_value_to_object, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-object">seed_value_to_object ()</a>
+<dt id="ientry-idm45529383062464">seed_value_to_object, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-object">seed_value_to_object ()</a>
 </dt>
-<dt>seed_value_to_string, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-string">seed_value_to_string ()</a>
+<dt id="ientry-idm45529383164112">seed_value_to_string, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-string">seed_value_to_string ()</a>
 </dt>
-<dt>seed_value_to_uchar, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-uchar">seed_value_to_uchar ()</a>
+<dt id="ientry-idm45529383599424">seed_value_to_uchar, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-uchar">seed_value_to_uchar ()</a>
 </dt>
-<dt>seed_value_to_uint, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-uint">seed_value_to_uint ()</a>
+<dt id="ientry-idm45529385515888">seed_value_to_uint, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-uint">seed_value_to_uint ()</a>
 </dt>
-<dt>seed_value_to_uint64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-uint64">seed_value_to_uint64 ()</a>
+<dt id="ientry-idm45529383350704">seed_value_to_uint64, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-uint64">seed_value_to_uint64 ()</a>
 </dt>
-<dt>seed_value_to_ulong, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-ulong">seed_value_to_ulong ()</a>
+<dt id="ientry-idm45529383475104">seed_value_to_ulong, <a class="indexterm" href="seed-Native-Type-Conversion.html#seed-value-to-ulong">seed_value_to_ulong ()</a>
 </dt>
-<dt>seed_value_unprotect, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-unprotect">seed_value_unprotect ()</a>
+<dt id="ientry-idm45529390089376">seed_value_unprotect, <a class="indexterm" href="seed-Operating-on-Native-Types.html#seed-value-unprotect">seed_value_unprotect ()</a>
 </dt>
 </dl>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/js.html b/doc/reference/html/js.html
index 96b7762..f001cba 100644
--- a/doc/reference/html/js.html
+++ b/doc/reference/html/js.html
@@ -2,29 +2,29 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Part II. Seed JavaScript Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Part II. Seed JavaScript Reference: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="index.html" title="Seed Reference Manual">
 <link rel="prev" href="seed-contact.html" title="Contact Information">
 <link rel="next" href="seed-importer.html" title="Importer">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed-contact.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-importer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="seed-contact.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-importer.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="js"></a>Part II. Seed JavaScript Reference</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl><dt>
+<dl class="toc"><dt>
 <span class="refentrytitle"><a href="seed-importer.html">Importer</a></span><span class="refpurpose"> — 
 Importing gobject-introspection namespaces, native modules, and JavaScript modules
 </span>
@@ -33,7 +33,6 @@ Importing gobject-introspection namespaces, native modules, and JavaScript modul
 <p>This is the documentation for the JavaScript runtime side of Seed.</p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/left-insensitive.png b/doc/reference/html/left-insensitive.png
new file mode 100644
index 0000000..3269393
--- /dev/null
+++ b/doc/reference/html/left-insensitive.png
diff --git a/doc/reference/html/left.png b/doc/reference/html/left.png
index 48cab27..2abde03 100644
--- a/doc/reference/html/left.png
+++ b/doc/reference/html/left.png
diff --git a/doc/reference/html/modules.html b/doc/reference/html/modules.html
index 207af0c..f961cc7 100644
--- a/doc/reference/html/modules.html
+++ b/doc/reference/html/modules.html
@@ -2,29 +2,29 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Part IV. Seed Module Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Part IV. Seed Module Reference: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="index.html" title="Seed Reference Manual">
 <link rel="prev" href="seed-Modules.html" title="Seed Modules">
 <link rel="next" href="readline-module.html" title="readline">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed-Modules.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="readline-module.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="seed-Modules.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="readline-module.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="modules"></a>Part IV. Seed Module Reference</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
 <dt><span class="chapter"><a href="readline-module.html">readline</a></span></dt>
 <dt><span class="chapter"><a href="sqlite-module.html">SQLite</a></span></dt>
 <dt><span class="chapter"><a href="GtkBuilder-module.html">GtkBuilder</a></span></dt>
@@ -34,7 +34,6 @@
 <p>This is the documentation for the various modules included with Seed.</p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/readline-module.html b/doc/reference/html/readline-module.html
index 5904db2..c719454 100644
--- a/doc/reference/html/readline-module.html
+++ b/doc/reference/html/readline-module.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>readline</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>readline: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="modules.html" title="Part IV. Seed Module Reference">
 <link rel="prev" href="modules.html" title="Part IV. Seed Module Reference">
 <link rel="next" href="sqlite-module.html" title="SQLite">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="modules.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="modules.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="sqlite-module.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="modules.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="modules.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="sqlite-module.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div>
@@ -33,7 +33,7 @@
 </div></div>
 </div></div>
 <div class="refsect1">
-<a name="idp5150160"></a><h2>API Reference</h2>
+<a name="id-1.5.3.3"></a><h2>API Reference</h2>
 <p>
       The readline module allows for basic usage of the GNU readline library, in Seed. More advanced features may be added a a later time. In order to use the readline module it must be first imported.
       </p>
@@ -42,85 +42,10 @@
       </pre>
 <p>
     </p>
-<p>
-</p>
-<div class="refsect2">
-<a name="readline-readline"></a><h3>readline.readline (prompt)</h3>
-<p>Prompts for one line of input on standard input using <em class="parameter"><code>prompt</code></em> as the prompt.</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>prompt</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span></span></p></td>
-<td>A string entered on standard input.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="readline-bind"></a><h3>readline.bind (key, function)</h3>
-<p>Binds <em class="parameter"><code>key</code></em> to <em class="parameter"><code>function</code></em> causing the function to be invokved whenever <em class="parameter"><code>key</code></em> is pressed</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>function</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="readline-done"></a><h3>readline.done ()</h3>
-<p>Indicates that readline should finish the current line, and return from <em class="parameter"><code>readline.readline</code></em>. Can be used in callbacks to implement features like multiline editing</p>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="readline-buffer"></a><h3>readline.buffer()</h3>
-<p>Retrieve the current readline buffer</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span></span></p></td>
-<td>The current readline buffer</td>
-</tr></tbody>
-</table></div>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="readline-insert"></a><h3>readline.insert (string)</h3>
-<p>Inserts <em class="parameter"><code>string</code></em> in to the current readline buffer</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>string</code></em></span></p></td>
-<td>undefined</td>
-</tr></tbody>
-</table></div>
-</div>
-<p>
-</p>
+<span style="color: red">&lt;xi:include&gt;&lt;/xi:include&gt;</span>
 </div>
 <div class="refsect1">
-<a name="idp9655744"></a><h2>Examples</h2>
+<a name="id-1.5.3.4"></a><h2>Examples</h2>
 <p>Below are several examples of using the Seed readline module. For additional resources, consult the examples/ folder of the Seed source</p>
 <div class="example">
 <a name="readline-repl-example"></a><p class="title"><b>Example 14. </b></p>
@@ -143,7 +68,6 @@ while (1){
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/right-insensitive.png b/doc/reference/html/right-insensitive.png
new file mode 100644
index 0000000..4c95785
--- /dev/null
+++ b/doc/reference/html/right-insensitive.png
diff --git a/doc/reference/html/right.png b/doc/reference/html/right.png
index ed55207..76260ec 100644
--- a/doc/reference/html/right.png
+++ b/doc/reference/html/right.png
diff --git a/doc/reference/html/seed-Contexts.html b/doc/reference/html/seed-Contexts.html
index 23a608e..754d4d5 100644
--- a/doc/reference/html/seed-Contexts.html
+++ b/doc/reference/html/seed-Contexts.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Working with Contexts</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Working with Contexts: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-Initialization.html" title="Initialization">
 <link rel="next" href="seed-Evaluation.html" title="Evaluating JavaScript">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Initialization.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Evaluation.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Contexts.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Contexts.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Contexts.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Initialization.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Evaluation.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Contexts"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,36 +29,118 @@
 <h2><span class="refentrytitle"><a name="seed-Contexts.top_of_page"></a>Working with Contexts</span></h2>
 <p>Working with Contexts — Self-contained JavaScript execution environments</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Contexts.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-typedef             <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext">SeedContext</a>;
-typedef             <a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext">SeedGlobalContext</a>;
-typedef             <a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup">SeedContextGroup</a>;
-<a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>   <a class="link" href="seed-Contexts.html#seed-context-create" title="seed_context_create ()">seed_context_create</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> group</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> global_class</code></em>);
-<a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>   <a class="link" href="seed-Contexts.html#seed-context-ref" title="seed_context_ref ()">seed_context_ref</a>                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Contexts.html#seed-context-unref" title="seed_context_unref ()">seed_context_unref</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Contexts.html#seed-context-collect" title="seed_context_collect ()">seed_context_collect</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-Contexts.html#seed-context-get-global-object" title="seed_context_get_global_object ()">seed_context_get_global_object</a>      (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Contexts.html#seed-prepare-global-context" title="seed_prepare_global_context ()">seed_prepare_global_context</a>         (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Contexts.html#seed-importer-add-global" title="seed_importer_add_global ()">seed_importer_add_global</a>            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *name</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Contexts.html#seed-importer-set-search-path" title="seed_importer_set_search_path ()">seed_importer_set_search_path</a>       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> **search_path</code></em>);
+<div class="refsect1">
+<a name="seed-Contexts.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-context-create" title="seed_context_create ()">seed_context_create</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-context-ref" title="seed_context_ref ()">seed_context_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-context-unref" title="seed_context_unref ()">seed_context_unref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-context-collect" title="seed_context_collect ()">seed_context_collect</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-context-get-global-object" title="seed_context_get_global_object ()">seed_context_get_global_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-prepare-global-context" title="seed_prepare_global_context ()">seed_prepare_global_context</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-importer-add-global" title="seed_importer_add_global ()">seed_importer_add_global</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Contexts.html#seed-importer-set-search-path" title="seed_importer_set_search_path ()">seed_importer_set_search_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Contexts.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext">SeedContext</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext">SeedGlobalContext</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup">SeedContextGroup</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Contexts.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
 <a name="seed-Contexts.description"></a><h2>Description</h2>
 <p>
-A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> provides a complete "universe" for the execution of JavaScript. You can use <a class="link" href="seed-Contexts.html#seed-context-create" title="seed_context_create ()"><code class="function">seed_context_create()</code></a> to create a sandboxed context that lacks the import system, so it can be used to execute somewhat untrusted JavaScript (as it has no way to access the rest of your system). You can also expose the default set of globals (including "print", "imports", and "Seed") to create more powerful but still self-contained environments within which to execute code.
+A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> provides a complete "universe" for the execution of JavaScript. You can use <a class="link" href="seed-Contexts.html#seed-context-create" title="seed_context_create ()"><code class="function">seed_context_create()</code></a> to create a sandboxed context that lacks the import system, so it can be used to execute somewhat untrusted JavaScript (as it has no way to access the rest of your system). You can also expose the default set of globals (including "print", "imports", and "Seed") to create more powerful but still self-contained environments within which to execute code.
 </p>
 <div class="example">
-<a name="idp6331760"></a><p class="title"><b>Example 6. Using a Seed context as a form of sandboxing</b></p>
+<a name="id-1.4.4.6.3"></a><p class="title"><b>Example 6. Using a Seed context as a form of sandboxing</b></p>
 <div class="example-contents"><pre class="programlisting">
 ...
 ctx = seed_context_create(NULL, NULL);
@@ -75,168 +153,215 @@ script = seed_make_script(ctx, "print(imports)", NULL, 0);
 </p>
 </div>
 <div class="refsect1">
-<a name="seed-Contexts.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="SeedContext"></a><h3>SeedContext</h3>
-<pre class="programlisting">typedef gpointer SeedContext;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="SeedGlobalContext"></a><h3>SeedGlobalContext</h3>
-<pre class="programlisting">typedef gpointer SeedGlobalContext;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="SeedContextGroup"></a><h3>SeedContextGroup</h3>
-<pre class="programlisting">typedef gpointer SeedContextGroup;
-</pre>
-<p>
-</p>
-</div>
-<hr>
+<a name="seed-Contexts.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="seed-context-create"></a><h3>seed_context_create ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>   seed_context_create                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> group</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> global_class</code></em>);</pre>
-<p>
-Create a new <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>. By default, this creates a new context
+<a name="seed-context-create"></a><h3>seed_context_create ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>
+seed_context_create (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> group</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> global_class</code></em>);</pre>
+<p>Create a new <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>. By default, this creates a new context
 which has no global objects; you can add the default set using
-<a class="link" href="seed-Contexts.html#seed-prepare-global-context" title="seed_prepare_global_context ()"><code class="function">seed_prepare_global_context()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a class="link" href="seed-Contexts.html#seed-prepare-global-context" title="seed_prepare_global_context ()"><code class="function">seed_prepare_global_context()</code></a>.</p>
+<div class="refsect3">
+<a name="seed-context-create.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>group</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> in which to create the new context, or <code class="literal">NULL</code> to
-create it in the default context group.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>global_class</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> to use to create the global object, or <code class="literal">NULL</code> to
-create it with the default class.</td>
+<td class="parameter_name"><p>group</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> in which to create the new context, or <code class="literal">NULL</code> to
+create it in the default context group.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A new <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>global_class</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> to use to create the global object, or <code class="literal">NULL</code> to
+create it with the default class.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-context-create.returns"></a><h4>Returns</h4>
+<p> A new <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-context-ref"></a><h3>seed_context_ref ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>   seed_context_ref                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);</pre>
-<p>
-Increments the reference count of <em class="parameter"><code>ctx</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td><em class="parameter"><code>ctx</code></em></td>
-</tr>
-</tbody>
+<a name="seed-context-ref"></a><h3>seed_context_ref ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="returnvalue">SeedGlobalContext</span></a>
+seed_context_ref (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);</pre>
+<p>Increments the reference count of <em class="parameter"><code>ctx</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-context-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-context-ref.returns"></a><h4>Returns</h4>
+<p> <em class="parameter"><code>ctx</code></em>
+</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-context-unref"></a><h3>seed_context_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_context_unref                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);</pre>
-<p>
-Decrements the reference count of <em class="parameter"><code>ctx</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-context-unref"></a><h3>seed_context_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_context_unref (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);</pre>
+<p>Decrements the reference count of <em class="parameter"><code>ctx</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-context-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-context-collect"></a><h3>seed_context_collect ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_context_collect                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);</pre>
-<p>
-Instructs JavaScriptCore to make a garbage collection pass.
+<a name="seed-context-collect"></a><h3>seed_context_collect ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_context_collect (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedGlobalContext" title="SeedGlobalContext"><span class="type">SeedGlobalContext</span></a> ctx</code></em>);</pre>
+<p>Instructs JavaScriptCore to make a garbage collection pass.
 The context parameter is currently unused, and a pass is made
-through all contexts.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+through all contexts.</p>
+<div class="refsect3">
+<a name="seed-context-collect.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-context-get-global-object"></a><h3>seed_context_get_global_object ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_context_get_global_object      (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The global object for <em class="parameter"><code>ctx</code></em>.</td>
-</tr>
-</tbody>
+<a name="seed-context-get-global-object"></a><h3>seed_context_get_global_object ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_context_get_global_object (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-context-get-global-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-context-get-global-object.returns"></a><h4>Returns</h4>
+<p> The global object for <em class="parameter"><code>ctx</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-prepare-global-context"></a><h3>seed_prepare_global_context ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_prepare_global_context         (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
-<p>
-Adds the default set of global objects (imports, GType, Seed, and print)
-to a fresh <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-prepare-global-context"></a><h3>seed_prepare_global_context ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_prepare_global_context (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
+<p>Adds the default set of global objects (imports, GType, Seed, and print)
+to a fresh <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p>
+<div class="refsect3">
+<a name="seed-prepare-global-context.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> on which to add the default set of global objects.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> on which to add the default set of global objects.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-importer-add-global"></a><h3>seed_importer_add_global ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_importer_add_global            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *name</code></em>);</pre>
+<a name="seed-importer-add-global"></a><h3>seed_importer_add_global ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_importer_add_global (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                          <em class="parameter"><code><span class="type">gchar</span> *name</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-importer-set-search-path"></a><h3>seed_importer_set_search_path ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_importer_set_search_path       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> **search_path</code></em>);</pre>
+<a name="seed-importer-set-search-path"></a><h3>seed_importer_set_search_path ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_importer_set_search_path (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                               <em class="parameter"><code><span class="type">gchar</span> **search_path</code></em>);</pre>
 <p>
 </p>
 </div>
 </div>
+<div class="refsect1">
+<a name="seed-Contexts.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="SeedContext"></a><h3>SeedContext</h3>
+<pre class="programlisting">typedef gpointer SeedContext;
+</pre>
+<p>
+</p>
 </div>
-<div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+<div class="refsect2">
+<a name="SeedGlobalContext"></a><h3>SeedGlobalContext</h3>
+<pre class="programlisting">typedef gpointer SeedGlobalContext;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="SeedContextGroup"></a><h3>SeedContextGroup</h3>
+<pre class="programlisting">typedef gpointer SeedContextGroup;
+</pre>
+<p>
+</p>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Evaluation.html b/doc/reference/html/seed-Evaluation.html
index 345d00f..67aa028 100644
--- a/doc/reference/html/seed-Evaluation.html
+++ b/doc/reference/html/seed-Evaluation.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Evaluating JavaScript</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Evaluating JavaScript: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-Contexts.html" title="Working with Contexts">
 <link rel="next" href="seed-Exceptions.html" title="Exception Handling">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Contexts.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Exceptions.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Evaluation.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Evaluation.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Evaluation.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Contexts.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Exceptions.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Evaluation"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,37 +29,92 @@
 <h2><span class="refentrytitle"><a name="seed-Evaluation.top_of_page"></a>Evaluating JavaScript</span></h2>
 <p>Evaluating JavaScript — Creating and interpreting scripts</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Evaluation.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-                    <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript">SeedScript</a>;
-<a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *        <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()">seed_make_script</a>                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *js</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *source_url</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> line_number</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Evaluation.html#seed-evaluate" title="seed_evaluate ()">seed_evaluate</a>                       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Evaluation.html#seed-simple-evaluate" title="seed_simple_evaluate ()">seed_simple_evaluate</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *source</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *        <a class="link" href="seed-Evaluation.html#seed-script-new-from-file" title="seed_script_new_from_file ()">seed_script_new_from_file</a>           (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *file</code></em>);
-<a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="returnvalue">SeedException</span></a>       <a class="link" href="seed-Evaluation.html#seed-script-exception" title="seed_script_exception ()">seed_script_exception</a>               (<em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Evaluation.html#seed-script-destroy" title="seed_script_destroy ()">seed_script_destroy</a>                 (<em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>);
+<div class="refsect1">
+<a name="seed-Evaluation.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()">seed_make_script</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Evaluation.html#seed-evaluate" title="seed_evaluate ()">seed_evaluate</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Evaluation.html#seed-simple-evaluate" title="seed_simple_evaluate ()">seed_simple_evaluate</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Evaluation.html#seed-script-new-from-file" title="seed_script_new_from_file ()">seed_script_new_from_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="returnvalue">SeedException</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Evaluation.html#seed-script-exception" title="seed_script_exception ()">seed_script_exception</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Evaluation.html#seed-script-destroy" title="seed_script_destroy ()">seed_script_destroy</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Evaluation.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript">SeedScript</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Evaluation.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
 <a name="seed-Evaluation.description"></a><h2>Description</h2>
 <p>
-Seed relies on WebKit's JavaScriptCore interpreter to actually evaluate snippets of JavaScript; however, it provides a handful of useful wrapper functions to quickly create and evaluate scripts. <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a> and <a class="link" href="seed-Evaluation.html#seed-evaluate" title="seed_evaluate ()"><code class="function">seed_evaluate()</code></a> are the workhorse functions; these allow you to control every detail of the created script and its evaluation environment (including customizing the "this" object during evaluation, and setting a starting line number and filename from which the script originates). <a class="link" href="seed-Evaluation.html#seed-simple-evaluate" title="seed_simple_evaluate ()"><code class="function">seed_simple_evaluate()</code></a> provides an interface to execute a string of JavaScript without previously creating a <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>, and, while requiring less supporting code, is less flexible.
+Seed relies on WebKit's JavaScriptCore interpreter to actually evaluate snippets of JavaScript; however, it provides a handful of useful wrapper functions to quickly create and evaluate scripts. <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a> and <a class="link" href="seed-Evaluation.html#seed-evaluate" title="seed_evaluate ()"><code class="function">seed_evaluate()</code></a> are the workhorse functions; these allow you to control every detail of the created script and its evaluation environment (including customizing the "this" object during evaluation, and setting a starting line number and filename from which the script originates). <a class="link" href="seed-Evaluation.html#seed-simple-evaluate" title="seed_simple_evaluate ()"><code class="function">seed_simple_evaluate()</code></a> provides an interface to execute a string of JavaScript without previously creating a <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>, and, while requiring less supporting code, is less flexible.
 </p>
 <div class="example">
-<a name="idp8392992"></a><p class="title"><b>Example 7. Create and evaluate a string of JavaScript with <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a></b></p>
+<a name="id-1.4.5.6.3"></a><p class="title"><b>Example 7. Create and evaluate a string of JavaScript with <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a></b></p>
 <div class="example-contents"><pre class="programlisting">
 SeedEngine * eng;
  
@@ -80,7 +131,7 @@ seed_evaluate(eng-&gt;context, script, 0);
 </pre></div>
 </div>
 <br class="example-break"><div class="example">
-<a name="idp8397072"></a><p class="title"><b>Example 8. Create and evaluate a string of JavaScript with <a class="link" href="seed-Evaluation.html#seed-simple-evaluate" title="seed_simple_evaluate ()"><code class="function">seed_simple_evaluate()</code></a></b></p>
+<a name="id-1.4.5.6.4"></a><p class="title"><b>Example 8. Create and evaluate a string of JavaScript with <a class="link" href="seed-Evaluation.html#seed-simple-evaluate" title="seed_simple_evaluate ()"><code class="function">seed_simple_evaluate()</code></a></b></p>
 <div class="example-contents"><pre class="programlisting">
 SeedEngine * eng;
  
@@ -95,179 +146,227 @@ seed_simple_evaluate(eng-&gt;context, "print('Hello, world!')", NULL);
 <br class="example-break">
 </div>
 <div class="refsect1">
-<a name="seed-Evaluation.details"></a><h2>Details</h2>
+<a name="seed-Evaluation.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedScript"></a><h3>SeedScript</h3>
-<pre class="programlisting">typedef struct {
-  JSStringRef script;
-  JSValueRef exception;
-
-  JSStringRef source_url;
-  gint line_number;
-} SeedScript;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="seed-make-script"></a><h3>seed_make_script ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *        seed_make_script                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *js</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *source_url</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> line_number</code></em>);</pre>
-<p>
-Creates a new <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> instance with <em class="parameter"><code>js</code></em> as the contents, then
-checks for proper syntax.
-</p>
-<p>
-Note: <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a> does not handle the shebang line, and will return a
-      parse error if one is included in <em class="parameter"><code>js</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-make-script"></a><h3>seed_make_script ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *
+seed_make_script (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                  <em class="parameter"><code>const <span class="type">gchar</span> *js</code></em>,
+                  <em class="parameter"><code>const <span class="type">gchar</span> *source_url</code></em>,
+                  <em class="parameter"><code><span class="type">gint</span> line_number</code></em>);</pre>
+<p>Creates a new <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> instance with <em class="parameter"><code>js</code></em>
+ as the contents, then
+checks for proper syntax.</p>
+<p>Note: <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a> does not handle the shebang line, and will return a
+      parse error if one is included in <em class="parameter"><code>js</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-make-script.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>js</code></em> :</span></p></td>
-<td>A string representing the contents of the script.</td>
+<td class="parameter_name"><p>js</p></td>
+<td class="parameter_description"><p>A string representing the contents of the script.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>source_url</code></em> :</span></p></td>
-<td>The filename of the script, for reference in errors, or <code class="literal">NULL</code>.</td>
+<td class="parameter_name"><p>source_url</p></td>
+<td class="parameter_description"><p>The filename of the script, for reference in errors, or <code class="literal">NULL</code>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>line_number</code></em> :</span></p></td>
-<td>The line number of the beginning of the script, for reference
-in error messages, or <code class="literal">NULL</code>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The newly created <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>.</td>
+<td class="parameter_name"><p>line_number</p></td>
+<td class="parameter_description"><p>The line number of the beginning of the script, for reference
+in error messages, or 0.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-make-script.returns"></a><h4>Returns</h4>
+<p> The newly created <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-evaluate"></a><h3>seed_evaluate ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_evaluate                       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>);</pre>
-<p>
-Evaluates a <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> with <em class="parameter"><code>this</code></em> as the global "this" object.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-evaluate"></a><h3>seed_evaluate ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_evaluate (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+               <em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>,
+               <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>);</pre>
+<p>Evaluates a <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> with <em class="parameter"><code>this</code></em>
+ as the global "this" object.</p>
+<div class="refsect3">
+<a name="seed-evaluate.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> to evaluate.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> returned by evaluating the script.</td>
+<td class="parameter_name"><p>s</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> to evaluate.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-evaluate.returns"></a><h4>Returns</h4>
+<p> The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> returned by evaluating the script.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-simple-evaluate"></a><h3>seed_simple_evaluate ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_simple_evaluate                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *source</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Evaluates a string of JavaScript in <em class="parameter"><code>ctx</code></em>; if an exception
-is raised in the context of the script, it will be placed in <em class="parameter"><code>exception</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-simple-evaluate"></a><h3>seed_simple_evaluate ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_simple_evaluate (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><span class="type">gchar</span> *source</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Evaluates a string of JavaScript in <em class="parameter"><code>ctx</code></em>
+; if an exception
+is raised in the context of the script, it will be placed in <em class="parameter"><code>exception</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-simple-evaluate.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>source</code></em> :</span></p></td>
-<td>A string representing the JavaScript to evaluate.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> pointer to store an exception in.</td>
+<td class="parameter_name"><p>source</p></td>
+<td class="parameter_description"><p>A string representing the JavaScript to evaluate.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> returned by evaluating the script.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> pointer to store an exception in.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-simple-evaluate.returns"></a><h4>Returns</h4>
+<p> The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> returned by evaluating the script.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-script-new-from-file"></a><h3>seed_script_new_from_file ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *        seed_script_new_from_file           (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *file</code></em>);</pre>
-<p>
-Uses <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a> to create a <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> from the contents of <em class="parameter"><code>file</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-script-new-from-file"></a><h3>seed_script_new_from_file ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="returnvalue">SeedScript</span></a> *
+seed_script_new_from_file (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                           <em class="parameter"><code><span class="type">gchar</span> *file</code></em>);</pre>
+<p>Uses <a class="link" href="seed-Evaluation.html#seed-make-script" title="seed_make_script ()"><code class="function">seed_make_script()</code></a> to create a <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> from the contents of <em class="parameter"><code>file</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-script-new-from-file.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>file</code></em> :</span></p></td>
-<td>The filename of the script to load.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The newly created <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>.</td>
+<td class="parameter_name"><p>file</p></td>
+<td class="parameter_description"><p>The filename of the script to load.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-script-new-from-file.returns"></a><h4>Returns</h4>
+<p> The newly created <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-script-exception"></a><h3>seed_script_exception ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="returnvalue">SeedException</span></a>       seed_script_exception               (<em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>);</pre>
-<p>
-Retrieves the exception (if any) raised during the evaluation of <em class="parameter"><code>s</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> representing the exception of <em class="parameter"><code>s</code></em>.</td>
-</tr>
-</tbody>
+<a name="seed-script-exception"></a><h3>seed_script_exception ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="returnvalue">SeedException</span></a>
+seed_script_exception (<em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>);</pre>
+<p>Retrieves the exception (if any) raised during the evaluation of <em class="parameter"><code>s</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-script-exception.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>s</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-script-exception.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> representing the exception of <em class="parameter"><code>s</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-script-destroy"></a><h3>seed_script_destroy ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_script_destroy                 (<em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>);</pre>
+<a name="seed-script-destroy"></a><h3>seed_script_destroy ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_script_destroy (<em class="parameter"><code><a class="link" href="seed-Evaluation.html#SeedScript" title="SeedScript"><span class="type">SeedScript</span></a> *s</code></em>);</pre>
+<p>
+</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-Evaluation.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="SeedScript"></a><h3>SeedScript</h3>
+<pre class="programlisting">typedef struct {
+  JSStringRef script;
+  JSValueRef exception;
+
+  JSStringRef source_url;
+  gint line_number;
+} SeedScript;
+</pre>
 <p>
 </p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Exceptions.html b/doc/reference/html/seed-Exceptions.html
index ede41e4..d94cdd6 100644
--- a/doc/reference/html/seed-Exceptions.html
+++ b/doc/reference/html/seed-Exceptions.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Exception Handling</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Exception Handling: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-Evaluation.html" title="Evaluating JavaScript">
 <link rel="next" href="seed-Signals.html" title="GObject Signals">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Evaluation.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Signals.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Exceptions.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Exceptions.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Exceptions.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Evaluation.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Signals.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Exceptions"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,50 +29,104 @@
 <h2><span class="refentrytitle"><a name="seed-Exceptions.top_of_page"></a>Exception Handling</span></h2>
 <p>Exception Handling — Throwing and catching exceptions</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Exceptions.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-typedef             <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException">SeedException</a>;
-<span class="returnvalue">void</span>                <a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()">seed_make_exception</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *message</code></em>,
-                                                         <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">gchar</span> *             <a class="link" href="seed-Exceptions.html#seed-exception-get-name" title="seed_exception_get_name ()">seed_exception_get_name</a>             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);
-<span class="returnvalue">gchar</span> *             <a class="link" href="seed-Exceptions.html#seed-exception-get-message" title="seed_exception_get_message ()">seed_exception_get_message</a>          (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);
-<span class="returnvalue">guint</span>               <a class="link" href="seed-Exceptions.html#seed-exception-get-line" title="seed_exception_get_line ()">seed_exception_get_line</a>             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);
-<span class="returnvalue">gchar</span> *             <a class="link" href="seed-Exceptions.html#seed-exception-get-file" title="seed_exception_get_file ()">seed_exception_get_file</a>             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);
-<span class="returnvalue">gchar</span> *             <a class="link" href="seed-Exceptions.html#seed-exception-to-string" title="seed_exception_to_string ()">seed_exception_to_string</a>            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);
+<div class="refsect1">
+<a name="seed-Exceptions.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()">seed_make_exception</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Exceptions.html#seed-exception-get-name" title="seed_exception_get_name ()">seed_exception_get_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Exceptions.html#seed-exception-get-message" title="seed_exception_get_message ()">seed_exception_get_message</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">guint</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Exceptions.html#seed-exception-get-line" title="seed_exception_get_line ()">seed_exception_get_line</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Exceptions.html#seed-exception-get-file" title="seed_exception_get_file ()">seed_exception_get_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Exceptions.html#seed-exception-to-string" title="seed_exception_to_string ()">seed_exception_to_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Exceptions.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException">SeedException</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Exceptions.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
 <a name="seed-Exceptions.description"></a><h2>Description</h2>
 <p>
-Seed uses exceptions as a method of handling runtime errors within scripts. An exception consists of a name (a list of commonly-used exception names is below), a message, detailing the error, and the line number and filename from which the exception was raised. If Seed cannot determine from where the exception was raised, the line number and filename will be undefined. <a class="link" href="seed-Exceptions.html#seed-exception-to-string" title="seed_exception_to_string ()"><code class="function">seed_exception_to_string()</code></a> provides a simple way to convert all of these into a consistent representation to display to users.
+Seed uses exceptions as a method of handling runtime errors within scripts. An exception consists of a name (a list of commonly-used exception names is below), a message, detailing the error, and the line number and filename from which the exception was raised. If Seed cannot determine from where the exception was raised, the line number and filename will be undefined. <a class="link" href="seed-Exceptions.html#seed-exception-to-string" title="seed_exception_to_string ()"><code class="function">seed_exception_to_string()</code></a> provides a simple way to convert all of these into a consistent representation to display to users.
 </p>
 <p>
 All Seed callbacks take an exception argument; calling
-<a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()"><code class="function">seed_make_exception()</code></a> with this argument and the details you wish to
+<a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()"><code class="function">seed_make_exception()</code></a> with this argument and the details you wish to
 fill it with will propogate that exception up the chain. Exceptions
 can be <span class="emphasis"><em>caught</em></span> either by a try/catch block in the
 calling JavaScript, or by observing the exception property, dealing
 with it, and then clearing the exception.
-It is important to note that calling <a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()"><code class="function">seed_make_exception()</code></a> does not
+It is important to note that calling <a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()"><code class="function">seed_make_exception()</code></a> does not
 in fact <span class="emphasis"><em>throw</em></span> the exception, but just creates an
 object which, when stored in the exception pointer passed to a callback,
 causes JSC to throw an exception once flow is returned.
 </p>
 <div class="example">
-<a name="idp8068800"></a><p class="title"><b>Example 9. Throw an exception, because <code class="function">random_callback</code> was called with the wrong number of arguments</b></p>
+<a name="id-1.4.6.6.4"></a><p class="title"><b>Example 9. Throw an exception, because <code class="function">random_callback</code> was called with the wrong number of arguments</b></p>
 <div class="example-contents"><pre class="programlisting">
 SeedValue random_callback(SeedContext ctx,
                           SeedObject function,
@@ -90,7 +140,7 @@ SeedValue random_callback(SeedContext ctx,
     if(argument_count != 1)
     {
         seed_make_exception(ctx, exception, "ArgumentError",
-                            "wrong number of arguments; expected 1, got %Zd",
+                            "wrong number of arguments; expected 1, got %zd",
                             argument_count);
         return seed_make_undefined(ctx);
     }
@@ -99,11 +149,11 @@ SeedValue random_callback(SeedContext ctx,
 }
 </pre></div>
 </div>
-<br class="example-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<br class="example-break"><div class="note">
 <h3 class="title">Predefined Exception Names</h3>
 <p>
 </p>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <span class="emphasis"><em>InvalidPropertyValue</em></span> - a property was set to a value out of range</li>
 <li class="listitem">
@@ -126,197 +176,250 @@ SeedValue random_callback(SeedContext ctx,
 </div>
 </div>
 <div class="refsect1">
-<a name="seed-Exceptions.details"></a><h2>Details</h2>
+<a name="seed-Exceptions.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedException"></a><h3>SeedException</h3>
-<pre class="programlisting">typedef gpointer SeedException;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="seed-make-exception"></a><h3>seed_make_exception ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_make_exception                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *message</code></em>,
-                                                         <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Creates a new JavaScript exception with the given attributes.
-</p>
-<p>
-The line number and file name of the exception created will be undefined.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-make-exception"></a><h3>seed_make_exception ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_make_exception (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>,
+                     <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
+                     <em class="parameter"><code>const <span class="type">gchar</span> *message</code></em>,
+                     <em class="parameter"><code>...</code></em>);</pre>
+<p>Creates a new JavaScript exception with the given attributes.</p>
+<p>The line number and file name of the exception created will be undefined.</p>
+<div class="refsect3">
+<a name="seed-make-exception.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> in which to store the exception.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> in which to store the exception.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The <span class="type">gchar</span>* representing the exception name.</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The <span class="type">gchar</span>* representing the exception name.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td>The <span class="type">gchar</span>*, as a printf format string, representing the
-details of the exception.</td>
+<td class="parameter_name"><p>message</p></td>
+<td class="parameter_description"><p>The <span class="type">gchar</span>*, as a printf format string, representing the
+details of the exception.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-exception-get-name"></a><h3>seed_exception_get_name ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *             seed_exception_get_name             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
-<p>
-Retrieves the name of the given exception; this could be one of the
+<a name="seed-exception-get-name"></a><h3>seed_exception_get_name ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> *
+seed_exception_get_name (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
+<p>Retrieves the name of the given exception; this could be one of the
 predefined exception names given above, or your own name, which should
-be a single CamelCase word, preferably ending in something like "Error".
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+be a single CamelCase word, preferably ending in something like "Error".</p>
+<div class="refsect3">
+<a name="seed-exception-get-name.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gchar</span>* representing the name of <em class="parameter"><code>exception</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-exception-get-name.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gchar</span>* representing the name of <em class="parameter"><code>exception</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-exception-get-message"></a><h3>seed_exception_get_message ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *             seed_exception_get_message          (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
-<p>
-Retrieves the message of the given exception; this should be a
+<a name="seed-exception-get-message"></a><h3>seed_exception_get_message ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> *
+seed_exception_get_message (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                            <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
+<p>Retrieves the message of the given exception; this should be a
 human-readable string describing the exception enough that a developer
 could utilize the message in order to determine where to look to debug
-the problem.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+the problem.</p>
+<div class="refsect3">
+<a name="seed-exception-get-message.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gchar</span>* representing the detailed message of <em class="parameter"><code>exception</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-exception-get-message.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gchar</span>* representing the detailed message of <em class="parameter"><code>exception</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-exception-get-line"></a><h3>seed_exception_get_line ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>               seed_exception_get_line             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
-<p>
-Retrieves the line number the given exception was thrown from; keep in mind
-that exceptions created from C have an undefined line number.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-exception-get-line"></a><h3>seed_exception_get_line ()</h3>
+<pre class="programlisting"><span class="returnvalue">guint</span>
+seed_exception_get_line (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
+<p>Retrieves the line number the given exception was thrown from; keep in mind
+that exceptions created from C have an undefined line number.</p>
+<div class="refsect3">
+<a name="seed-exception-get-line.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">guint</span> representing the line number from which <em class="parameter"><code>exception</code></em>
-was thrown.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-exception-get-line.returns"></a><h4>Returns</h4>
+<p> A <span class="type">guint</span> representing the line number from which <em class="parameter"><code>exception</code></em>
+was thrown.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-exception-get-file"></a><h3>seed_exception_get_file ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *             seed_exception_get_file             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
-<p>
-Retrieves the file name the given exception was thrown from; keep in mind
-that exceptions created from C have an undefined file name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-exception-get-file"></a><h3>seed_exception_get_file ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> *
+seed_exception_get_file (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
+<p>Retrieves the file name the given exception was thrown from; keep in mind
+that exceptions created from C have an undefined file name.</p>
+<div class="refsect3">
+<a name="seed-exception-get-file.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gchar</span>* representing the name of the file from which
-<em class="parameter"><code>exception</code></em> was thrown.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-exception-get-file.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gchar</span>* representing the name of the file from which
+<em class="parameter"><code>exception</code></em>
+was thrown.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-exception-to-string"></a><h3>seed_exception_to_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *             seed_exception_to_string            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
-<p>
-Properly formats the name, detailed message, line number, and file name of
+<a name="seed-exception-to-string"></a><h3>seed_exception_to_string ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> *
+seed_exception_to_string (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
+<p>Properly formats the name, detailed message, line number, and file name of
 the given extension. This provides a consistent format for printed
 exceptions, to reduce confusion. Please use it if you're exposing exception
-data to the outside world.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+data to the outside world.</p>
+<div class="refsect3">
+<a name="seed-exception-to-string.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gchar</span>* representing the <em class="parameter"><code>exception</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-exception-to-string.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gchar</span>* representing the <em class="parameter"><code>exception</code></em>
+.</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-Exceptions.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="SeedException"></a><h3>SeedException</h3>
+<pre class="programlisting">typedef gpointer SeedException;
+</pre>
+<p>
+</p>
+</div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Initialization.html b/doc/reference/html/seed-Initialization.html
index 7ea9a15..8d69892 100644
--- a/doc/reference/html/seed-Initialization.html
+++ b/doc/reference/html/seed-Initialization.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Initialization</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Initialization: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="api.html" title="Part III. Seed API Reference">
 <link rel="next" href="seed-Contexts.html" title="Working with Contexts">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="api.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Contexts.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Initialization.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Initialization.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Initialization.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="api.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Contexts.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Initialization"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,31 +29,76 @@
 <h2><span class="refentrytitle"><a name="seed-Initialization.top_of_page"></a>Initialization</span></h2>
 <p>Initialization — Overall setup of the Seed engine</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Initialization.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-struct              <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine">SeedEngine</a>;
-<a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *        <a class="link" href="seed-Initialization.html#seed-init" title="seed_init ()">seed_init</a>                           (<em class="parameter"><code><span class="type">gint</span> *argc</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> ***argv</code></em>);
-<a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *        <a class="link" href="seed-Initialization.html#seed-init-with-context-group" title="seed_init_with_context_group ()">seed_init_with_context_group</a>        (<em class="parameter"><code><span class="type">gint</span> *argc</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> ***argv</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> group</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Initialization.html#seed-engine-set-search-path" title="seed_engine_set_search_path ()">seed_engine_set_search_path</a>         (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *path</code></em>);
-<span class="returnvalue">gchar</span> **            <a class="link" href="seed-Initialization.html#seed-engine-get-search-path" title="seed_engine_get_search_path ()">seed_engine_get_search_path</a>         (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>);
+<div class="refsect1">
+<a name="seed-Initialization.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Initialization.html#seed-init" title="seed_init ()">seed_init</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Initialization.html#seed-init-with-context-group" title="seed_init_with_context_group ()">seed_init_with_context_group</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Initialization.html#seed-engine-set-search-path" title="seed_engine_set_search_path ()">seed_engine_set_search_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> **
+</td>
+<td class="function_name">
+<a class="link" href="seed-Initialization.html#seed-engine-get-search-path" title="seed_engine_get_search_path ()">seed_engine_get_search_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Initialization.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine">SeedEngine</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Initialization.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
 <a name="seed-Initialization.description"></a><h2>Description</h2>
 <p>
-Before any other Seed functions can be used, you must initialize the engine, which creates an initial JavaScript context and sets up JavaScriptCore and GLib. To do this in most cases, you will use <a class="link" href="seed-Initialization.html#seed-init" title="seed_init ()"><code class="function">seed_init()</code></a>, which will provide you with a <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>. Only one <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> is permitted per application; use a <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> to sandbox code execution.
+Before any other Seed functions can be used, you must initialize the engine, which creates an initial JavaScript context and sets up JavaScriptCore and GLib. To do this in most cases, you will use <a class="link" href="seed-Initialization.html#seed-init" title="seed_init ()"><code class="function">seed_init()</code></a>, which will provide you with a <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>. Only one <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> is permitted per application; use a <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> to sandbox code execution.
 </p>
 <div class="example">
-<a name="idm10656"></a><p class="title"><b>Example 5. Very simple <code class="function">main</code> function for a Seed program</b></p>
+<a name="id-1.4.3.6.3"></a><p class="title"><b>Example 5. Very simple <code class="function">main</code> function for a Seed program</b></p>
 <div class="example-contents"><pre class="programlisting">
 int main (int argc, char **argv)
 {
@@ -81,135 +122,162 @@ int main (int argc, char **argv)
 <br class="example-break">
 </div>
 <div class="refsect1">
-<a name="seed-Initialization.details"></a><h2>Details</h2>
+<a name="seed-Initialization.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedEngine"></a><h3>struct SeedEngine</h3>
-<pre class="programlisting">struct SeedEngine {
-	JSGlobalContextRef context;
-	JSObjectRef global;
-	gchar **search_path;
-
-	JSContextGroupRef group;
-};
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="seed-init"></a><h3>seed_init ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *        seed_init                           (<em class="parameter"><code><span class="type">gint</span> *argc</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> ***argv</code></em>);</pre>
-<p>
-Initializes a new <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>. This involves initializing GLib, creating
+<a name="seed-init"></a><h3>seed_init ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *
+seed_init (<em class="parameter"><code><span class="type">gint</span> *argc</code></em>,
+           <em class="parameter"><code><span class="type">gchar</span> ***argv</code></em>);</pre>
+<p>Initializes a new <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>. This involves initializing GLib, creating
 an initial context with all of the default globals, and initializing
-various internal parts of Seed.
-</p>
-<p>
-This function should only be called once within a single Seed application.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+various internal parts of Seed.</p>
+<p>This function should only be called once within a single Seed application.</p>
+<div class="refsect3">
+<a name="seed-init.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argc</code></em> :</span></p></td>
-<td>A reference to the number of arguments remaining to parse.</td>
+<td class="parameter_name"><p>argc</p></td>
+<td class="parameter_description"><p>A reference to the number of arguments remaining to parse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argv</code></em> :</span></p></td>
-<td>A reference to an array of string arguments remaining to parse.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The newly created and initialized <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>.</td>
+<td class="parameter_name"><p>argv</p></td>
+<td class="parameter_description"><p>A reference to an array of string arguments remaining to parse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-init.returns"></a><h4>Returns</h4>
+<p> The newly created and initialized <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-init-with-context-group"></a><h3>seed_init_with_context_group ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *        seed_init_with_context_group        (<em class="parameter"><code><span class="type">gint</span> *argc</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> ***argv</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> group</code></em>);</pre>
-<p>
-Initializes a new <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>. This involves initializing GLib, creating
+<a name="seed-init-with-context-group"></a><h3>seed_init_with_context_group ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="returnvalue">SeedEngine</span></a> *
+seed_init_with_context_group (<em class="parameter"><code><span class="type">gint</span> *argc</code></em>,
+                              <em class="parameter"><code><span class="type">gchar</span> ***argv</code></em>,
+                              <em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> group</code></em>);</pre>
+<p>Initializes a new <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>. This involves initializing GLib, creating
 an initial context (in <span class="type">group</span>) with all of the default globals, and
-initializing various internal parts of Seed.
-</p>
-<p>
-This function should only be called once within a single Seed application.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+initializing various internal parts of Seed.</p>
+<p>This function should only be called once within a single Seed application.</p>
+<div class="refsect3">
+<a name="seed-init-with-context-group.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argc</code></em> :</span></p></td>
-<td>A reference to the number of arguments remaining to parse.</td>
+<td class="parameter_name"><p>argc</p></td>
+<td class="parameter_description"><p>A reference to the number of arguments remaining to parse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argv</code></em> :</span></p></td>
-<td>A reference to an array of string arguments remaining to parse.</td>
+<td class="parameter_name"><p>argv</p></td>
+<td class="parameter_description"><p>A reference to an array of string arguments remaining to parse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>group</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> within which to create the initial context.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The newly created and initialized <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>.</td>
+<td class="parameter_name"><p>group</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContextGroup" title="SeedContextGroup"><span class="type">SeedContextGroup</span></a> within which to create the initial context.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-init-with-context-group.returns"></a><h4>Returns</h4>
+<p> The newly created and initialized <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-engine-set-search-path"></a><h3>seed_engine_set_search_path ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_engine_set_search_path         (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *path</code></em>);</pre>
-<p>
-Sets the search path for the imports system.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-engine-set-search-path"></a><h3>seed_engine_set_search_path ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_engine_set_search_path (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>,
+                             <em class="parameter"><code>const <span class="type">gchar</span> *path</code></em>);</pre>
+<p>Sets the search path for the imports system.</p>
+<div class="refsect3">
+<a name="seed-engine-set-search-path.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>eng</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, on which to set the path.</td>
+<td class="parameter_name"><p>eng</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, on which to set the path.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>A <span class="type">const</span> gchar*, a colon separated string containing the path to set</td>
+<td class="parameter_name"><p>path</p></td>
+<td class="parameter_description"><p>A <span class="type">const</span> gchar*, a colon separated string containing the path to set</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-engine-get-search-path"></a><h3>seed_engine_get_search_path ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> **            seed_engine_get_search_path         (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>);</pre>
+<a name="seed-engine-get-search-path"></a><h3>seed_engine_get_search_path ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> **
+seed_engine_get_search_path (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>);</pre>
+<p>Retrieves the search path for the imports system. The returned value is
+owned by the <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, and shouldn't be freed by the application writer.</p>
+<div class="refsect3">
+<a name="seed-engine-get-search-path.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>eng</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, to get the currently set search path.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="seed-engine-get-search-path.returns"></a><h4>Returns</h4>
+<p> A null-terminated array of strings containing the paths.</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-Initialization.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="SeedEngine"></a><h3>struct SeedEngine</h3>
+<pre class="programlisting">struct SeedEngine {
+	JSGlobalContextRef context;
+	JSObjectRef global;
+	gchar **search_path;
+
+	JSContextGroupRef group;
+};
+</pre>
 <p>
-Retrieves the search path for the imports system. The returned value is
-owned by the <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, and shouldn't be freed by the application writer.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>eng</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, to get the currently set search path.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A null-terminated array of strings containing the paths.</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-JS-Objects.html b/doc/reference/html/seed-JS-Objects.html
index 9da2aa0..465cc47 100644
--- a/doc/reference/html/seed-JS-Objects.html
+++ b/doc/reference/html/seed-JS-Objects.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Working with JavaScript objects</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Working with JavaScript objects: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="types.html" title="Values and Type Conversion">
 <link rel="prev" href="seed-Operating-on-Native-Types.html" title="Operating on JavaScript types">
 <link rel="next" href="seed-Native-Functions.html" title="Creating native functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Operating-on-Native-Types.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="types.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Native-Functions.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-JS-Objects.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-JS-Objects.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-JS-Objects.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="types.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Operating-on-Native-Types.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Native-Functions.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-JS-Objects"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,94 +29,219 @@
 <h2><span class="refentrytitle"><a name="seed-JS-Objects.top_of_page"></a>Working with JavaScript objects</span></h2>
 <p>Working with JavaScript objects — Using properties, constructing objects, etc.</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-JS-Objects.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-typedef             <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject">SeedObject</a>;
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-JS-Objects.html#seed-make-object" title="seed_make_object ()">seed_make_object</a>                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>,
-                                                         <em class="parameter"><code><span class="type">gpointer</span> private_object</code></em>);
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-JS-Objects.html#seed-make-array" title="seed_make_array ()">seed_make_array</a>                     (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> elements</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> num_elements</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-JS-Objects.html#seed-object-call" title="seed_object_call ()">seed_object_call</a>                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-JS-Objects.html#seed-object-set-property-at-index" title="seed_object_set_property_at_index ()">seed_object_set_property_at_index</a>   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> index</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-JS-Objects.html#seed-object-get-property-at-index" title="seed_object_get_property_at_index ()">seed_object_get_property_at_index</a>   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> index</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-JS-Objects.html#seed-object-is-of-class" title="seed_object_is_of_class ()">seed_object_is_of_class</a>             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>);
-<span class="returnvalue">gpointer</span>            <a class="link" href="seed-JS-Objects.html#seed-object-get-private" title="seed_object_get_private ()">seed_object_get_private</a>             (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-JS-Objects.html#seed-object-set-private" title="seed_object_set_private ()">seed_object_set_private</a>             (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gpointer</span> value</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-JS-Objects.html#seed-object-get-property" title="seed_object_get_property ()">seed_object_get_property</a>            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-JS-Objects.html#seed-object-set-property" title="seed_object_set_property ()">seed_object_set_property</a>            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-JS-Objects.html#seed-object-get-prototype" title="seed_object_get_prototype ()">seed_object_get_prototype</a>           (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>);
-<span class="returnvalue">gchar</span> **            <a class="link" href="seed-JS-Objects.html#seed-object-copy-property-names" title="seed_object_copy_property_names ()">seed_object_copy_property_names</a>     (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="seed-JS-Objects.html#SeedObjectInitializeCallback" title="SeedObjectInitializeCallback ()">*SeedObjectInitializeCallback</a>)     (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="seed-JS-Objects.html#SeedObjectFinalizeCallback" title="SeedObjectFinalizeCallback ()">*SeedObjectFinalizeCallback</a>)       (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);
-<span class="returnvalue">gboolean</span>            (<a class="link" href="seed-JS-Objects.html#SeedObjectHasPropertyCallback" title="SeedObjectHasPropertyCallback ()">*SeedObjectHasPropertyCallback</a>)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (<a class="link" href="seed-JS-Objects.html#SeedObjectGetPropertyCallback" title="SeedObjectGetPropertyCallback ()">*SeedObjectGetPropertyCallback</a>)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);
-<span class="returnvalue">gboolean</span>            (<a class="link" href="seed-JS-Objects.html#SeedObjectSetPropertyCallback" title="SeedObjectSetPropertyCallback ()">*SeedObjectSetPropertyCallback</a>)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);
-<span class="returnvalue">gboolean</span>            (<a class="link" href="seed-JS-Objects.html#SeedObjectDeletePropertyCallback" title="SeedObjectDeletePropertyCallback ()">*SeedObjectDeletePropertyCallback</a>) (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback" title="SeedObjectGetPropertyNamesCallback ()">*SeedObjectGetPropertyNamesCallback</a>)
-                                                        (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (<a class="link" href="seed-JS-Objects.html#SeedObjectCallAsFunctionCallback" title="SeedObjectCallAsFunctionCallback ()">*SeedObjectCallAsFunctionCallback</a>) (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gboolean</span>            (<a class="link" href="seed-JS-Objects.html#SeedObjectHasInstanceCallback" title="SeedObjectHasInstanceCallback ()">*SeedObjectHasInstanceCallback</a>)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> constructor</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> instance_p</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (<a class="link" href="seed-JS-Objects.html#SeedObjectConvertToTypeCallback" title="SeedObjectConvertToTypeCallback ()">*SeedObjectConvertToTypeCallback</a>)  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="type">SeedType</span></a> type</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (<a class="link" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback" title="SeedObjectCallAsConstructorCallback ()">*SeedObjectCallAsConstructorCallback</a>)
-                                                        (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> constructor</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
+<div class="refsect1">
+<a name="seed-JS-Objects.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-make-object" title="seed_make_object ()">seed_make_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-make-array" title="seed_make_array ()">seed_make_array</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-call" title="seed_object_call ()">seed_object_call</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-set-property-at-index" title="seed_object_set_property_at_index ()">seed_object_set_property_at_index</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-get-property-at-index" title="seed_object_get_property_at_index ()">seed_object_get_property_at_index</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-is-of-class" title="seed_object_is_of_class ()">seed_object_is_of_class</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gpointer</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-get-private" title="seed_object_get_private ()">seed_object_get_private</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-set-private" title="seed_object_set_private ()">seed_object_set_private</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-get-property" title="seed_object_get_property ()">seed_object_get_property</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-set-property" title="seed_object_set_property ()">seed_object_set_property</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-get-prototype" title="seed_object_get_prototype ()">seed_object_get_prototype</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> **
+</td>
+<td class="function_name">
+<a class="link" href="seed-JS-Objects.html#seed-object-copy-property-names" title="seed_object_copy_property_names ()">seed_object_copy_property_names</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectInitializeCallback" title="SeedObjectInitializeCallback ()">*SeedObjectInitializeCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectFinalizeCallback" title="SeedObjectFinalizeCallback ()">*SeedObjectFinalizeCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectHasPropertyCallback" title="SeedObjectHasPropertyCallback ()">*SeedObjectHasPropertyCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectGetPropertyCallback" title="SeedObjectGetPropertyCallback ()">*SeedObjectGetPropertyCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectSetPropertyCallback" title="SeedObjectSetPropertyCallback ()">*SeedObjectSetPropertyCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectDeletePropertyCallback" title="SeedObjectDeletePropertyCallback ()">*SeedObjectDeletePropertyCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback" title="SeedObjectGetPropertyNamesCallback ()">*SeedObjectGetPropertyNamesCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectCallAsFunctionCallback" title="SeedObjectCallAsFunctionCallback ()">*SeedObjectCallAsFunctionCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectHasInstanceCallback" title="SeedObjectHasInstanceCallback ()">*SeedObjectHasInstanceCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectConvertToTypeCallback" title="SeedObjectConvertToTypeCallback ()">*SeedObjectConvertToTypeCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback" title="SeedObjectCallAsConstructorCallback ()">*SeedObjectCallAsConstructorCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-JS-Objects.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject">SeedObject</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-JS-Objects.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -130,446 +251,561 @@ Long description
 </p>
 </div>
 <div class="refsect1">
-<a name="seed-JS-Objects.details"></a><h2>Details</h2>
+<a name="seed-JS-Objects.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedObject"></a><h3>SeedObject</h3>
-<pre class="programlisting">typedef gpointer SeedObject;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="seed-make-object"></a><h3>seed_make_object ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_make_object                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>,
-                                                         <em class="parameter"><code><span class="type">gpointer</span> private_object</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> in which to create the new object.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A new <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>.</td>
-</tr>
-</tbody>
+<a name="seed-make-object"></a><h3>seed_make_object ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_make_object (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                  <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>,
+                  <em class="parameter"><code><span class="type">gpointer</span> private_object</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-make-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> in which to create the new object.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-make-object.returns"></a><h4>Returns</h4>
+<p> A new <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-make-array"></a><h3>seed_make_array ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_make_array                     (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> elements</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> num_elements</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Creates a JavaScript Array object from <em class="parameter"><code>elements</code></em>, a C-style array of
-SeedValues.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-make-array"></a><h3>seed_make_array ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_make_array (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                 <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> elements</code></em>,
+                 <em class="parameter"><code><span class="type">gsize</span> num_elements</code></em>,
+                 <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Creates a JavaScript Array object from <em class="parameter"><code>elements</code></em>
+, a C-style array of
+SeedValues.</p>
+<div class="refsect3">
+<a name="seed-make-array.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>elements</code></em> :</span></p></td>
-<td>An array of <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>'s with which to populate the array.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>num_elements</code></em> :</span></p></td>
-<td>The number of values, in <em class="parameter"><code>elements</code></em>
-</td>
+<td class="parameter_name"><p>elements</p></td>
+<td class="parameter_description"><p>An array of <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>'s with which to populate the array.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> in which to store an exception.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>num_elements</p></td>
+<td class="parameter_description"><p>The number of values, in <em class="parameter"><code>elements</code></em>
+</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A new array object, populated with <em class="parameter"><code>elements</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> in which to store an exception.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-make-array.returns"></a><h4>Returns</h4>
+<p> A new array object, populated with <em class="parameter"><code>elements</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-call"></a><h3>seed_object_call ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_object_call                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Calls <em class="parameter"><code>object</code></em> as a function.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-call"></a><h3>seed_object_call ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_object_call (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
+                  <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
+                  <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
+                  <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Calls <em class="parameter"><code>object</code></em>
+ as a function.</p>
+<div class="refsect3">
+<a name="seed-object-call.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> to call.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argument_count</code></em> :</span></p></td>
-<td>The number of arguments in the <em class="parameter"><code>arguments</code></em> array.</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> to call.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>arguments</code></em> :</span></p></td>
-<td>An array (<em class="parameter"><code>argument_count</code></em> long) of <a href="seed-Native-Type-Conversion.html#SeedValue"><span class="type">SeedValues</span></a> to pass in as the
-function's arguments.</td>
+<td class="parameter_name"><p>argument_count</p></td>
+<td class="parameter_description"><p>The number of arguments in the <em class="parameter"><code>arguments</code></em>
+array.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>arguments</p></td>
+<td class="parameter_description"><p>An array (<em class="parameter"><code>argument_count</code></em>
+long) of <a href="seed-Native-Type-Conversion.html#SeedValue"><span class="type">SeedValues</span></a> to pass in as the
+function's arguments.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <em class="parameter"><code>SeedValue</code></em> returned by the called function, or <code class="literal">NULL</code> if an
-exception occurs or the object is not a function.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-object-call.returns"></a><h4>Returns</h4>
+<p> The <em class="parameter"><code>SeedValue</code></em>
+returned by the called function, or <code class="literal">NULL</code> if an
+exception occurs or the object is not a function.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-set-property-at-index"></a><h3>seed_object_set_property_at_index ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_object_set_property_at_index   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> index</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Sets the property <em class="parameter"><code>index</code></em> on <em class="parameter"><code>object</code></em> to <em class="parameter"><code>value</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-set-property-at-index"></a><h3>seed_object_set_property_at_index ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_object_set_property_at_index (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                   <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                   <em class="parameter"><code><span class="type">gint</span> index</code></em>,
+                                   <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
+                                   <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Sets the property <em class="parameter"><code>index</code></em>
+ on <em class="parameter"><code>object</code></em>
+ to <em class="parameter"><code>value</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-object-set-property-at-index.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> on which to set the property.</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> on which to set the property.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>index</code></em> :</span></p></td>
-<td>The index of the property to set.</td>
+<td class="parameter_name"><p>index</p></td>
+<td class="parameter_description"><p>The index of the property to set.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to use as the property's value.</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to use as the property's value.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-get-property-at-index"></a><h3>seed_object_get_property_at_index ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_object_get_property_at_index   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> index</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="seed-object-get-property-at-index"></a><h3>seed_object_get_property_at_index ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_object_get_property_at_index (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                   <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                   <em class="parameter"><code><span class="type">gint</span> index</code></em>,
+                                   <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-is-of-class"></a><h3>seed_object_is_of_class ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_object_is_of_class             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>);</pre>
+<a name="seed-object-is-of-class"></a><h3>seed_object_is_of_class ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_object_is_of_class (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-get-private"></a><h3>seed_object_get_private ()</h3>
-<pre class="programlisting"><span class="returnvalue">gpointer</span>            seed_object_get_private             (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
-<p>
-Retrieves the private data of <em class="parameter"><code>object</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A pointer to the private data of <em class="parameter"><code>object</code></em>.</td>
-</tr>
-</tbody>
+<a name="seed-object-get-private"></a><h3>seed_object_get_private ()</h3>
+<pre class="programlisting"><span class="returnvalue">gpointer</span>
+seed_object_get_private (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
+<p>Retrieves the private data of <em class="parameter"><code>object</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-object-get-private.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-object-get-private.returns"></a><h4>Returns</h4>
+<p> A pointer to the private data of <em class="parameter"><code>object</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-set-private"></a><h3>seed_object_set_private ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_object_set_private             (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gpointer</span> value</code></em>);</pre>
-<p>
-Sets the private data of <em class="parameter"><code>object</code></em> to <em class="parameter"><code>value</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-set-private"></a><h3>seed_object_set_private ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_object_set_private (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                         <em class="parameter"><code><span class="type">gpointer</span> value</code></em>);</pre>
+<p>Sets the private data of <em class="parameter"><code>object</code></em>
+ to <em class="parameter"><code>value</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-object-set-private.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>.</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <span class="type">gpointer</span> to set the private data of <em class="parameter"><code>object</code></em> to.</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <span class="type">gpointer</span> to set the private data of <em class="parameter"><code>object</code></em>
+to.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-get-property"></a><h3>seed_object_get_property ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_object_get_property            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-get-property"></a><h3>seed_object_get_property ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_object_get_property (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                          <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-object-get-property.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>
-</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The property to get, should be a valid JavaScript identifier</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The value of the property or the undefined value</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The property to get, should be a valid JavaScript identifier</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-object-get-property.returns"></a><h4>Returns</h4>
+<p> The value of the property or the undefined value</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-set-property"></a><h3>seed_object_set_property ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_object_set_property            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-set-property"></a><h3>seed_object_set_property ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_object_set_property (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                          <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-object-set-property.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>
-</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The property to set, should be a valid JavaScript identifier</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The property to set, should be a valid JavaScript identifier</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The value to set the property to.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-<code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise.</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>The value to set the property to.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-object-set-property.returns"></a><h4>Returns</h4>
+<p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-get-prototype"></a><h3>seed_object_get_prototype ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_object_get_prototype           (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-get-prototype"></a><h3>seed_object_get_prototype ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_object_get_prototype (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                           <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-object-get-prototype.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The prototype of <em class="parameter"><code>obj</code></em>.</td>
+<td class="parameter_name"><p>obj</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-object-get-prototype.returns"></a><h4>Returns</h4>
+<p> The prototype of <em class="parameter"><code>obj</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-object-copy-property-names"></a><h3>seed_object_copy_property_names ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> **            seed_object_copy_property_names     (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-object-copy-property-names"></a><h3>seed_object_copy_property_names ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> **
+seed_object_copy_property_names (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                 <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-object-copy-property-names.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>An object from which to copy property names.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <code class="literal">NULL</code> terminated array containing the property names of <em class="parameter"><code>object</code></em>
-</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>An object from which to copy property names.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-object-copy-property-names.returns"></a><h4>Returns</h4>
+<p> A <code class="literal">NULL</code> terminated array containing the property names of
+<em class="parameter"><code>object</code></em>
+</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectInitializeCallback"></a><h3>SeedObjectInitializeCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*SeedObjectInitializeCallback)     (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
+<a name="SeedObjectInitializeCallback"></a><h3>SeedObjectInitializeCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+<span class="c_punctuation">(</span>*SeedObjectInitializeCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                 <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectFinalizeCallback"></a><h3>SeedObjectFinalizeCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*SeedObjectFinalizeCallback)       (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
+<a name="SeedObjectFinalizeCallback"></a><h3>SeedObjectFinalizeCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+<span class="c_punctuation">(</span>*SeedObjectFinalizeCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectHasPropertyCallback"></a><h3>SeedObjectHasPropertyCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            (*SeedObjectHasPropertyCallback)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
+<a name="SeedObjectHasPropertyCallback"></a><h3>SeedObjectHasPropertyCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<span class="c_punctuation">(</span>*SeedObjectHasPropertyCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectGetPropertyCallback"></a><h3>SeedObjectGetPropertyCallback ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (*SeedObjectGetPropertyCallback)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);</pre>
+<a name="SeedObjectGetPropertyCallback"></a><h3>SeedObjectGetPropertyCallback ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+<span class="c_punctuation">(</span>*SeedObjectGetPropertyCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectSetPropertyCallback"></a><h3>SeedObjectSetPropertyCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            (*SeedObjectSetPropertyCallback)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);</pre>
+<a name="SeedObjectSetPropertyCallback"></a><h3>SeedObjectSetPropertyCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<span class="c_punctuation">(</span>*SeedObjectSetPropertyCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectDeletePropertyCallback"></a><h3>SeedObjectDeletePropertyCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            (*SeedObjectDeletePropertyCallback) (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);</pre>
+<a name="SeedObjectDeletePropertyCallback"></a><h3>SeedObjectDeletePropertyCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<span class="c_punctuation">(</span>*SeedObjectDeletePropertyCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                     <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> property_name</code></em>,
+                                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *e</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectGetPropertyNamesCallback"></a><h3>SeedObjectGetPropertyNamesCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*SeedObjectGetPropertyNamesCallback)
-                                                        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<a name="SeedObjectGetPropertyNamesCallback"></a><h3>SeedObjectGetPropertyNamesCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+<span class="c_punctuation">(</span>*SeedObjectGetPropertyNamesCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectCallAsFunctionCallback"></a><h3>SeedObjectCallAsFunctionCallback ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (*SeedObjectCallAsFunctionCallback) (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="SeedObjectCallAsFunctionCallback"></a><h3>SeedObjectCallAsFunctionCallback ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+<span class="c_punctuation">(</span>*SeedObjectCallAsFunctionCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                     <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
+                                     <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
+                                     <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
+                                     <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
+                                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectHasInstanceCallback"></a><h3>SeedObjectHasInstanceCallback ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            (*SeedObjectHasInstanceCallback)    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> constructor</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> instance_p</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="SeedObjectHasInstanceCallback"></a><h3>SeedObjectHasInstanceCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+<span class="c_punctuation">(</span>*SeedObjectHasInstanceCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> constructor</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> instance_p</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectConvertToTypeCallback"></a><h3>SeedObjectConvertToTypeCallback ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (*SeedObjectConvertToTypeCallback)  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="type">SeedType</span></a> type</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="SeedObjectConvertToTypeCallback"></a><h3>SeedObjectConvertToTypeCallback ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+<span class="c_punctuation">(</span>*SeedObjectConvertToTypeCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                    <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> object</code></em>,
+                                    <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="type">SeedType</span></a> type</code></em>,
+                                    <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedObjectCallAsConstructorCallback"></a><h3>SeedObjectCallAsConstructorCallback ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (*SeedObjectCallAsConstructorCallback)
-                                                        (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> constructor</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="SeedObjectCallAsConstructorCallback"></a><h3>SeedObjectCallAsConstructorCallback ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+<span class="c_punctuation">(</span>*SeedObjectCallAsConstructorCallback<span class="c_punctuation">)</span>
+                               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> constructor</code></em>,
+                                <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
+                                <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
+                                <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>
+</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-JS-Objects.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="SeedObject"></a><h3>SeedObject</h3>
+<pre class="programlisting">typedef gpointer SeedObject;
+</pre>
 <p>
 </p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-JavaScript-Classes.html b/doc/reference/html/seed-JavaScript-Classes.html
index 9a92c40..a20b9a8 100644
--- a/doc/reference/html/seed-JavaScript-Classes.html
+++ b/doc/reference/html/seed-JavaScript-Classes.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Creating JavaScript classes</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Creating JavaScript classes: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-Native-Functions.html" title="Creating native functions">
 <link rel="next" href="seed-SeedClosure.html" title="Using JavaScript closures">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Native-Functions.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-SeedClosure.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-JavaScript-Classes.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-JavaScript-Classes.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-JavaScript-Classes.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Native-Functions.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-SeedClosure.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-JavaScript-Classes"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,21 +29,65 @@
 <h2><span class="refentrytitle"><a name="seed-JavaScript-Classes.top_of_page"></a>Creating JavaScript classes</span></h2>
 <p>Creating JavaScript classes — Dealing with Seed class definitions and constructors</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-JavaScript-Classes.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-enum                <a class="link" href="seed-JavaScript-Classes.html#SeedPropertyAttributes" title="enum SeedPropertyAttributes">SeedPropertyAttributes</a>;
-enum                <a class="link" href="seed-JavaScript-Classes.html#SeedClassAttributes" title="enum SeedClassAttributes">SeedClassAttributes</a>;
-typedef             <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass">SeedClass</a>;
-#define             <a class="link" href="seed-JavaScript-Classes.html#seed-empty-class" title="seed_empty_class">seed_empty_class</a>
-<a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="returnvalue">SeedClass</span></a>           <a class="link" href="seed-JavaScript-Classes.html#seed-create-class" title="seed_create_class ()">seed_create_class</a>                   (<em class="parameter"><code><span class="type">seed_class_definition</span> *def</code></em>);
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-JavaScript-Classes.html#seed-make-constructor" title="seed_make_constructor ()">seed_make_constructor</a>               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback" title="SeedObjectCallAsConstructorCallback ()"><span class="type">SeedObjectCallAsConstructorCallback</span></a> constructor</code></em>);
+<div class="refsect1">
+<a name="seed-JavaScript-Classes.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="returnvalue">SeedClass</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JavaScript-Classes.html#seed-create-class" title="seed_create_class ()">seed_create_class</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-JavaScript-Classes.html#seed-make-constructor" title="seed_make_constructor ()">seed_make_constructor</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-JavaScript-Classes.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="seed-JavaScript-Classes.html#SeedPropertyAttributes" title="enum SeedPropertyAttributes">SeedPropertyAttributes</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="seed-JavaScript-Classes.html#SeedClassAttributes" title="enum SeedClassAttributes">SeedClassAttributes</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass">SeedClass</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="seed-JavaScript-Classes.html#seed-empty-class" title="seed_empty_class">seed_empty_class</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-JavaScript-Classes.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -65,93 +105,153 @@ to work with future versions of JSCore).
 </p>
 </div>
 <div class="refsect1">
-<a name="seed-JavaScript-Classes.details"></a><h2>Details</h2>
+<a name="seed-JavaScript-Classes.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedPropertyAttributes"></a><h3>enum SeedPropertyAttributes</h3>
-<pre class="programlisting">typedef enum {
-  SEED_PROPERTY_ATTRIBUTE_NONE = 0,
-  SEED_PROPERTY_ATTRIBUTE_READ_ONLY = 1 &lt;&lt; 1,
-  SEED_PROPERTY_ATTRIBUTE_DONT_ENUM = 1 &lt;&lt; 2,
-  SEED_PROPERTY_ATTRIBUTE_DONT_DELETE = 1 &lt;&lt; 3
-} SeedPropertyAttributes;
-</pre>
-<p>
-</p>
+<a name="seed-create-class"></a><h3>seed_create_class ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="returnvalue">SeedClass</span></a>
+seed_create_class (<em class="parameter"><code><span class="type">seed_class_definition</span> *def</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-create-class.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>def</p></td>
+<td class="parameter_description"><p>A <span class="type">JSClassDefinition</span>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="seed-create-class.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a>, described by <em class="parameter"><code>def</code></em>
+.</p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="SeedClassAttributes"></a><h3>enum SeedClassAttributes</h3>
-<pre class="programlisting">typedef enum {
-  SEED_CLASS_ATTRIBUTE_NONE = 0,
-  SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE = 1 &lt;&lt; 1
-} SeedClassAttributes;
-</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedClass"></a><h3>SeedClass</h3>
-<pre class="programlisting">typedef gpointer SeedClass;
-</pre>
-<p>
-</p>
+<a name="seed-make-constructor"></a><h3>seed_make_constructor ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_make_constructor (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback" title="SeedObjectCallAsConstructorCallback ()"><span class="type">SeedObjectCallAsConstructorCallback</span></a> constructor</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-make-constructor.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>constructor</p></td>
+<td class="parameter_description"><p>The <span class="type">JSObjectCallAsConstructorCallback</span> function to call when
+the constructor is invoked with 'new'.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
 </div>
-<hr>
+<div class="refsect3">
+<a name="seed-make-constructor.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>, which is a constructor function.</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-JavaScript-Classes.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
-<a name="seed-empty-class"></a><h3>seed_empty_class</h3>
-<pre class="programlisting">#define seed_empty_class { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,};
-</pre>
+<a name="SeedPropertyAttributes"></a><h3>enum SeedPropertyAttributes</h3>
 <p>
 </p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="seed-create-class"></a><h3>seed_create_class ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="returnvalue">SeedClass</span></a>           seed_create_class                   (<em class="parameter"><code><span class="type">seed_class_definition</span> *def</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="SeedPropertyAttributes.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>def</code></em> :</span></p></td>
-<td>A <span class="type">JSClassDefinition</span>.</td>
+<td class="enum_member_name"><p><a name="SEED-PROPERTY-ATTRIBUTE-NONE:CAPS"></a>SEED_PROPERTY_ATTRIBUTE_NONE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="SEED-PROPERTY-ATTRIBUTE-READ-ONLY:CAPS"></a>SEED_PROPERTY_ATTRIBUTE_READ_ONLY</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="SEED-PROPERTY-ATTRIBUTE-DONT-ENUM:CAPS"></a>SEED_PROPERTY_ATTRIBUTE_DONT_ENUM</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a>, described by <em class="parameter"><code>def</code></em>.</td>
+<td class="enum_member_name"><p><a name="SEED-PROPERTY-ATTRIBUTE-DONT-DELETE:CAPS"></a>SEED_PROPERTY_ATTRIBUTE_DONT_DELETE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-make-constructor"></a><h3>seed_make_constructor ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_make_constructor               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback" title="SeedObjectCallAsConstructorCallback ()"><span class="type">SeedObjectCallAsConstructorCallback</span></a> constructor</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="SeedClassAttributes"></a><h3>enum SeedClassAttributes</h3>
+<p>
+</p>
+<div class="refsect3">
+<a name="SeedClassAttributes.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>constructor</code></em> :</span></p></td>
-<td>The <span class="type">JSObjectCallAsConstructorCallback</span> function to call when
-the constructor is invoked with 'new'.</td>
+<td class="enum_member_name"><p><a name="SEED-CLASS-ATTRIBUTE-NONE:CAPS"></a>SEED_CLASS_ATTRIBUTE_NONE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a>, which is a constructor function.</td>
+<td class="enum_member_name"><p><a name="SEED-CLASS-ATTRIBUTE-NO-SHARED-PROTOTYPE:CAPS"></a>SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="SeedClass"></a><h3>SeedClass</h3>
+<pre class="programlisting">typedef gpointer SeedClass;
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="seed-empty-class"></a><h3>seed_empty_class</h3>
+<pre class="programlisting">#define             seed_empty_class</pre>
+<p>
+</p>
+</div>
+</div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Modules.html b/doc/reference/html/seed-Modules.html
index f24012b..85b6c26 100644
--- a/doc/reference/html/seed-Modules.html
+++ b/doc/reference/html/seed-Modules.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Seed Modules</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Seed Modules: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-SeedClosure.html" title="Using JavaScript closures">
 <link rel="next" href="modules.html" title="Part IV. Seed Module Reference">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-SeedClosure.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="modules.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Modules.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Modules.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Modules.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-SeedClosure.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="modules.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Modules"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,21 +29,48 @@
 <h2><span class="refentrytitle"><a name="seed-Modules.top_of_page"></a>Seed Modules</span></h2>
 <p>Seed Modules — Native C modules for Seed</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Modules.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-#define             <a class="link" href="seed-Modules.html#CHECK-ARG-COUNT:CAPS" title="CHECK_ARG_COUNT()">CHECK_ARG_COUNT</a>                     (name,
-                                                         argnum)
-#define             <a class="link" href="seed-Modules.html#DEFINE-ENUM-MEMBER:CAPS" title="DEFINE_ENUM_MEMBER()">DEFINE_ENUM_MEMBER</a>                  (holder,
-                                                         member)
-#define             <a class="link" href="seed-Modules.html#DEFINE-ENUM-MEMBER-EXT:CAPS" title="DEFINE_ENUM_MEMBER_EXT()">DEFINE_ENUM_MEMBER_EXT</a>              (holder,
-                                                         name,
-                                                         val)
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          (<a class="link" href="seed-Modules.html#SeedModuleInitCallback" title="SeedModuleInitCallback ()">*SeedModuleInitCallback</a>)           (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>);
+<div class="refsect1">
+<a name="seed-Modules.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="seed-Modules.html#CHECK-ARG-COUNT:CAPS" title="CHECK_ARG_COUNT()">CHECK_ARG_COUNT</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="seed-Modules.html#DEFINE-ENUM-MEMBER:CAPS" title="DEFINE_ENUM_MEMBER()">DEFINE_ENUM_MEMBER</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
+<td class="function_name">
+<a class="link" href="seed-Modules.html#DEFINE-ENUM-MEMBER-EXT:CAPS" title="DEFINE_ENUM_MEMBER_EXT()">DEFINE_ENUM_MEMBER_EXT</a><span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-Modules.html#SeedModuleInitCallback" title="SeedModuleInitCallback ()">*SeedModuleInitCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Modules.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -57,7 +80,7 @@ Seed includes a simple system for creating C modules which can be loaded and man
 </p>
 <p>Numerous binding modules are included in the Seed repository; when writing a new native module, it would be wise to look over these before beginning, as they have many tidbits of useful knowledge for writing modules.</p>
 <div class="example">
-<a name="idp5746544"></a><p class="title"><b>Example 11. Very simple example C module</b></p>
+<a name="id-1.4.12.5.4"></a><p class="title"><b>Example 11. Very simple example C module</b></p>
 <div class="example-contents"><pre class="programlisting">
 #include &lt;glib.h&gt;
 #include &lt;seed-module.h&gt;
@@ -71,9 +94,9 @@ SeedObject seed_module_init(SeedEngine * eng)
 }
 </pre></div>
 </div>
-<br class="example-break"><p>Above is a C module which does absolutely nothing useful. When a module is loaded, <code class="function">seed_module_init()</code> is called, which should have the signature of <a class="link" href="seed-Modules.html#SeedModuleInitCallback" title="SeedModuleInitCallback ()"><code class="function">SeedModuleInitCallback()</code></a>. You're passed the global <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, and the value you return is the namespace for your module. Say, for example, you place a static function on that object:</p>
+<br class="example-break"><p>Above is a C module which does absolutely nothing useful. When a module is loaded, <code class="function">seed_module_init()</code> is called, which should have the signature of <a class="link" href="seed-Modules.html#SeedModuleInitCallback" title="SeedModuleInitCallback ()"><code class="function">SeedModuleInitCallback()</code></a>. You're passed the global <a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a>, and the value you return is the namespace for your module. Say, for example, you place a static function on that object:</p>
 <div class="example">
-<a name="idp9516368"></a><p class="title"><b>Example 12. C module with a function</b></p>
+<a name="id-1.4.12.5.6"></a><p class="title"><b>Example 12. C module with a function</b></p>
 <div class="example-contents"><pre class="programlisting">
 #include &lt;glib.h&gt;
 #include &lt;seed-module.h&gt;
@@ -127,7 +150,7 @@ SeedObject seed_module_init(SeedEngine * eng)
 </div>
 <br class="example-break"><p>After building and installing this module (look in the Seed build system for examples of how to get this to work, as well as a copy of seed-module.h, which will be very useful), it will be loadable with the normal Seed import system. Assuming it's installed as libseed_hello.so:</p>
 <div class="example">
-<a name="idp6928144"></a><p class="title"><b>Example 13. Utilize our second example C module from JavaScript</b></p>
+<a name="id-1.4.12.5.8"></a><p class="title"><b>Example 13. Utilize our second example C module from JavaScript</b></p>
 <div class="example-contents"><pre class="programlisting">
 hello = imports.hello;
 hello.say_hello_to("Tim");
@@ -136,110 +159,132 @@ hello.say_hello_to("Tim");
 <br class="example-break">
 </div>
 <div class="refsect1">
-<a name="seed-Modules.details"></a><h2>Details</h2>
+<a name="seed-Modules.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="CHECK-ARG-COUNT:CAPS"></a><h3>CHECK_ARG_COUNT()</h3>
 <pre class="programlisting">#define             CHECK_ARG_COUNT(name, argnum)</pre>
-<p>
-Check that the required number of arguments were passed into a
-<a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a>. If this is not true, raise an exception and
+<p>Check that the required number of arguments were passed into a
+<a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a>. If this is not true, raise an exception and
 return <code class="literal">NULL</code>. This requires the callback to use "argument_count",
-"ctx", and "exception" as the names of the various function arguments.
-</p>
-<p>
-<em class="parameter"><code>name</code></em> should be of form "namespace.function_name"
-</p>
-<p>
-At the moment, there is no way to specify more than one acceptable
-argument count.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+"ctx", and "exception" as the names of the various function arguments.</p>
+<p><em class="parameter"><code>name</code></em>
+ should be of form "namespace.function_name"</p>
+<p>At the moment, there is no way to specify more than one acceptable
+argument count.</p>
+<div class="refsect3">
+<a name="CHECK-ARG-COUNT.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of the function being called from, pretty-printed</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The name of the function being called from, pretty-printed</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argnum</code></em> :</span></p></td>
-<td>The number of arguments which should be passed into the function</td>
+<td class="parameter_name"><p>argnum</p></td>
+<td class="parameter_description"><p>The number of arguments which should be passed into the function</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="DEFINE-ENUM-MEMBER:CAPS"></a><h3>DEFINE_ENUM_MEMBER()</h3>
 <pre class="programlisting">#define             DEFINE_ENUM_MEMBER(holder, member)</pre>
-<p>
-Defines a property on <em class="parameter"><code>holder</code></em> which is named the same as <em class="parameter"><code>member</code></em>, and
-is assigned the value that <em class="parameter"><code>member</code></em> has in C.
-</p>
-<p>
-This macro works for defining properties from constants and
-#defines as well.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>Defines a property on <em class="parameter"><code>holder</code></em>
+ which is named the same as <em class="parameter"><code>member</code></em>
+, and
+is assigned the value that <em class="parameter"><code>member</code></em>
+ has in C.</p>
+<p>This macro works for defining properties from constants and
+#defines as well.</p>
+<div class="refsect3">
+<a name="DEFINE-ENUM-MEMBER.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>holder</code></em> :</span></p></td>
-<td>The object on which to define the enum member</td>
+<td class="parameter_name"><p>holder</p></td>
+<td class="parameter_description"><p>The object on which to define the enum member</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>The enum member, as it is named in C</td>
+<td class="parameter_name"><p>member</p></td>
+<td class="parameter_description"><p>The enum member, as it is named in C</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="DEFINE-ENUM-MEMBER-EXT:CAPS"></a><h3>DEFINE_ENUM_MEMBER_EXT()</h3>
 <pre class="programlisting">#define             DEFINE_ENUM_MEMBER_EXT(holder, name, val)</pre>
-<p>
-Defines a property on <em class="parameter"><code>holder</code></em> which is named <em class="parameter"><code>name</code></em>, and is assigned the
-value that <em class="parameter"><code>member</code></em> has in C. This allows for an override of the enum
+<p>Defines a property on <em class="parameter"><code>holder</code></em>
+ which is named <em class="parameter"><code>name</code></em>
+, and is assigned the
+value that <em class="parameter"><code>member</code></em>
+ has in C. This allows for an override of the enum
 member's name, most often to remove a common prefix. For example, to declare
 a property named VERSION_MAJOR on the namespace from mfpr's version
-constant MPFR_VERSION_MAJOR:
-</p>
-<p>
-</p>
+constant MPFR_VERSION_MAJOR:</p>
 <pre class="programlisting">
 DEFINE_ENUM_MEMBER_EXT(ns, "VERSION_MAJOR", MPFR_VERSION_MAJOR);
 </pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="DEFINE-ENUM-MEMBER-EXT.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>holder</code></em> :</span></p></td>
-<td>The object on which to define the enum member</td>
+<td class="parameter_name"><p>holder</p></td>
+<td class="parameter_description"><p>The object on which to define the enum member</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The enum member, as it should be named in JavaScript</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The enum member, as it should be named in JavaScript</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The enum member, as it is named in C</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The enum member, as it is named in C</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="SeedModuleInitCallback"></a><h3>SeedModuleInitCallback ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          (*SeedModuleInitCallback)           (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>);</pre>
+<a name="SeedModuleInitCallback"></a><h3>SeedModuleInitCallback ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+<span class="c_punctuation">(</span>*SeedModuleInitCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Initialization.html#SeedEngine" title="struct SeedEngine"><span class="type">SeedEngine</span></a> *eng</code></em>);</pre>
 <p>
 </p>
 </div>
 </div>
+<div class="refsect1">
+<a name="seed-Modules.other_details"></a><h2>Types and Values</h2>
+</div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Native-Functions.html b/doc/reference/html/seed-Native-Functions.html
index 1a73cd0..5c70ddc 100644
--- a/doc/reference/html/seed-Native-Functions.html
+++ b/doc/reference/html/seed-Native-Functions.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Creating native functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Creating native functions: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-JS-Objects.html" title="Working with JavaScript objects">
 <link rel="next" href="seed-JavaScript-Classes.html" title="Creating JavaScript classes">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-JS-Objects.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-JavaScript-Classes.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Native-Functions.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Native-Functions.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Native-Functions.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-JS-Objects.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-JavaScript-Classes.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Native-Functions"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,26 +29,46 @@
 <h2><span class="refentrytitle"><a name="seed-Native-Functions.top_of_page"></a>Creating native functions</span></h2>
 <p>Creating native functions — C functions as first-class JavaScript objects</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Native-Functions.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (<a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()">*SeedFunctionCallback</a>)             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-Native-Functions.html#seed-make-function" title="seed_make_function ()">seed_make_function</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> func</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Native-Functions.html#seed-create-function" title="seed_create_function ()">seed_create_function</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>);
+<div class="refsect1">
+<a name="seed-Native-Functions.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()">*SeedFunctionCallback</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Functions.html#seed-make-function" title="seed_make_function ()">seed_make_function</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Functions.html#seed-create-function" title="seed_create_function ()">seed_create_function</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Native-Functions.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -61,10 +77,10 @@
 Exposing native C functions to JavaScript is one of the fundamental use cases for libseed when used in an embedding environment; if your application cannot be introspected, or you only have a small number of functions to expose, this is the simplest way to do that.
 </p>
 <p>
-All native C callbacks should have the prototype of <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><code class="function">SeedFunctionCallback()</code></a>.
+All native C callbacks should have the prototype of <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><code class="function">SeedFunctionCallback()</code></a>.
 </p>
 <div class="example">
-<a name="idp9574864"></a><p class="title"><b>Example 10. Simple C program which embeds Seed with one exposed function</b></p>
+<a name="id-1.4.9.5.4"></a><p class="title"><b>Example 10. Simple C program which embeds Seed with one exposed function</b></p>
 <div class="example-contents"><pre class="programlisting">
 #include &lt;glib.h&gt;
 #include &lt;seed.h&gt;
@@ -103,127 +119,162 @@ int main(gint argc, gchar ** argv)
 <br class="example-break">
 </div>
 <div class="refsect1">
-<a name="seed-Native-Functions.details"></a><h2>Details</h2>
+<a name="seed-Native-Functions.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedFunctionCallback"></a><h3>SeedFunctionCallback ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           (*SeedFunctionCallback)             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-All native C function callbacks should use the prototype of
-SeedFunctionCallback.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="SeedFunctionCallback"></a><h3>SeedFunctionCallback ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+<span class="c_punctuation">(</span>*SeedFunctionCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> this_object</code></em>,
+                         <em class="parameter"><code><span class="type">gsize</span> argument_count</code></em>,
+                         <em class="parameter"><code>const <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> arguments[]</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>All native C function callbacks should use the prototype of
+SeedFunctionCallback.</p>
+<div class="refsect3">
+<a name="SeedFunctionCallback.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>function</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> representing the function</td>
+<td class="parameter_name"><p>function</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> representing the function</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>this_object</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> representing the "this" object in the caller</td>
+<td class="parameter_name"><p>this_object</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> representing the "this" object in the caller</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>argument_count</code></em> :</span></p></td>
-<td>The number of arguments passed into the callback</td>
+<td class="parameter_name"><p>argument_count</p></td>
+<td class="parameter_description"><p>The number of arguments passed into the callback</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>arguments</code></em> :</span></p></td>
-<td>An array of <a href="seed-Native-Type-Conversion.html#SeedValue"><span class="type">SeedValues</span></a>; the value of the arguments passed in</td>
+<td class="parameter_name"><p>arguments</p></td>
+<td class="parameter_description"><p>An array of <a href="seed-Native-Type-Conversion.html#SeedValue"><span class="type">SeedValues</span></a>; the value of the arguments passed in</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>; use <a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()"><code class="function">seed_make_exception()</code></a> in order
-to throw a JavaScript exception from the callback.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to return to the caller</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a>; use <a class="link" href="seed-Exceptions.html#seed-make-exception" title="seed_make_exception ()"><code class="function">seed_make_exception()</code></a> in
+order
+to throw a JavaScript exception from the callback.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="SeedFunctionCallback.returns"></a><h4>Returns</h4>
+<p> The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to return to the caller</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-make-function"></a><h3>seed_make_function ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_make_function                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> func</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
-<p>
-Creates a JavaScript object representing a first-class function; when
-the function is called from JavaScript, <em class="parameter"><code>func</code></em> will be called.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-make-function"></a><h3>seed_make_function ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_make_function (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> func</code></em>,
+                    <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
+<p>Creates a JavaScript object representing a first-class function; when
+the function is called from JavaScript, <em class="parameter"><code>func</code></em>
+ will be called.</p>
+<div class="refsect3">
+<a name="seed-make-function.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> to implement the function.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of the function (used in exceptions).</td>
+<td class="parameter_name"><p>func</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> to implement the function.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> representing the function</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The name of the function (used in exceptions).</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-make-function.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> representing the function</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-create-function"></a><h3>seed_create_function ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_create_function                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *name</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>);</pre>
-<p>
-Creates a JavaScript object representing a first-class function; when
-the function is called from JavaScript, <em class="parameter"><code>func</code></em> will be called. Places
-the created function as the property <em class="parameter"><code>name</code></em> on <em class="parameter"><code>obj</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-create-function"></a><h3>seed_create_function ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_create_function (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><span class="type">gchar</span> *name</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> func</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> obj</code></em>);</pre>
+<p>Creates a JavaScript object representing a first-class function; when
+the function is called from JavaScript, <em class="parameter"><code>func</code></em>
+ will be called. Places
+the created function as the property <em class="parameter"><code>name</code></em>
+ on <em class="parameter"><code>obj</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-create-function.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of the function (used in exceptions).</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>The name of the function (used in exceptions).</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> to implement the function.</td>
+<td class="parameter_name"><p>func</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a> to implement the function.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> on which to put the function.</td>
+<td class="parameter_name"><p>obj</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> on which to put the function.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
 </div>
+<div class="refsect1">
+<a name="seed-Native-Functions.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Native-Type-Conversion.html b/doc/reference/html/seed-Native-Type-Conversion.html
index 2d3fd2c..0720695 100644
--- a/doc/reference/html/seed-Native-Type-Conversion.html
+++ b/doc/reference/html/seed-Native-Type-Conversion.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Type Conversion</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Type Conversion: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="types.html" title="Values and Type Conversion">
 <link rel="prev" href="types.html" title="Values and Type Conversion">
 <link rel="next" href="seed-Operating-on-Native-Types.html" title="Operating on JavaScript types">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="types.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="types.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Operating-on-Native-Types.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Native-Type-Conversion.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Native-Type-Conversion.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Native-Type-Conversion.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="types.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="types.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Operating-on-Native-Types.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Native-Type-Conversion"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,1376 +29,2002 @@
 <h2><span class="refentrytitle"><a name="seed-Native-Type-Conversion.top_of_page"></a>Type Conversion</span></h2>
 <p>Type Conversion — Moving between JavaScript and C intrinsic types</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Native-Type-Conversion.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-typedef             <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue">SeedValue</a>;
-enum                <a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType">SeedType</a>;
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-make-undefined" title="seed_make_undefined ()">seed_make_undefined</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-make-null" title="seed_make_null ()">seed_make_null</a>                      (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-boolean" title="seed_value_to_boolean ()">seed_value_to_boolean</a>               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-boolean" title="seed_value_from_boolean ()">seed_value_from_boolean</a>             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gboolean</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">guint</span>               <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-uint" title="seed_value_to_uint ()">seed_value_to_uint</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-uint" title="seed_value_from_uint ()">seed_value_from_uint</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gint</span>                <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-int" title="seed_value_to_int ()">seed_value_to_int</a>                   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-int" title="seed_value_from_int ()">seed_value_from_int</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gchar</span>               <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-char" title="seed_value_to_char ()">seed_value_to_char</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-char" title="seed_value_from_char ()">seed_value_from_char</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">guchar</span>              <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-uchar" title="seed_value_to_uchar ()">seed_value_to_uchar</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-uchar" title="seed_value_from_uchar ()">seed_value_from_uchar</a>               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">guchar</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">glong</span>               <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-long" title="seed_value_to_long ()">seed_value_to_long</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-long" title="seed_value_from_long ()">seed_value_from_long</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">glong</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gulong</span>              <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-ulong" title="seed_value_to_ulong ()">seed_value_to_ulong</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-ulong" title="seed_value_from_ulong ()">seed_value_from_ulong</a>               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gulong</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gint64</span>              <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-int64" title="seed_value_to_int64 ()">seed_value_to_int64</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-int64" title="seed_value_from_int64 ()">seed_value_from_int64</a>               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">guint64</span>             <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-uint64" title="seed_value_to_uint64 ()">seed_value_to_uint64</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-uint64" title="seed_value_from_uint64 ()">seed_value_from_uint64</a>              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint64</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gfloat</span>              <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-float" title="seed_value_to_float ()">seed_value_to_float</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-float" title="seed_value_from_float ()">seed_value_from_float</a>               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gfloat</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gdouble</span>             <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-double" title="seed_value_to_double ()">seed_value_to_double</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-double" title="seed_value_from_double ()">seed_value_from_double</a>              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gdouble</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gchar</span> *             <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-string" title="seed_value_to_string ()">seed_value_to_string</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-string" title="seed_value_from_string ()">seed_value_from_string</a>              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-binary-string" title="seed_value_from_binary_string ()">seed_value_from_binary_string</a>       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *bytes</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> n_bytes</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">GObject</span> *           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-object" title="seed_value_to_object ()">seed_value_to_object</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-object" title="seed_value_from_object ()">seed_value_from_object</a>              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GObject</span> *val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">gchar</span> *             <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-filename" title="seed_value_to_filename ()">seed_value_to_filename</a>              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-filename" title="seed_value_from_filename ()">seed_value_from_filename</a>            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-format" title="seed_value_to_format ()">seed_value_to_format</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *format</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *values</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>,
-                                                         <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">gpointer</span>            <a class="link" href="seed-Native-Type-Conversion.html#seed-pointer-get-pointer" title="seed_pointer_get_pointer ()">seed_pointer_get_pointer</a>            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> pointer</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-Native-Type-Conversion.html#seed-make-pointer" title="seed_make_pointer ()">seed_make_pointer</a>                   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gpointer</span> pointer</code></em>);
-typedef             <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString">SeedString</a>;
-<a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="returnvalue">SeedString</span></a>          <a class="link" href="seed-Native-Type-Conversion.html#seed-string-ref" title="seed_string_ref ()">seed_string_ref</a>                     (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Native-Type-Conversion.html#seed-string-unref" title="seed_string_unref ()">seed_string_unref</a>                   (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);
-<span class="returnvalue">gsize</span>               <a class="link" href="seed-Native-Type-Conversion.html#seed-string-get-maximum-size" title="seed_string_get_maximum_size ()">seed_string_get_maximum_size</a>        (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);
-<span class="returnvalue">gsize</span>               <a class="link" href="seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer" title="seed_string_to_utf8_buffer ()">seed_string_to_utf8_buffer</a>          (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *buffer</code></em>,
-                                                         <em class="parameter"><code><span class="type">size_t</span> buffer_size</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Native-Type-Conversion.html#seed-string-is-equal" title="seed_string_is_equal ()">seed_string_is_equal</a>                (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> b</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Native-Type-Conversion.html#seed-string-is-equal-utf8" title="seed_string_is_equal_utf8 ()">seed_string_is_equal_utf8</a>           (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> a</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *b</code></em>);
-</pre>
-</div>
 <div class="refsect1">
-<a name="seed-Native-Type-Conversion.description"></a><h2>Description</h2>
-<p>
-Long description
-</p>
-</div>
-<div class="refsect1">
-<a name="seed-Native-Type-Conversion.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="SeedValue"></a><h3>SeedValue</h3>
-<pre class="programlisting">typedef gpointer SeedValue;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="SeedType"></a><h3>enum SeedType</h3>
-<pre class="programlisting">typedef enum {
-  SEED_TYPE_UNDEFINED,
-  SEED_TYPE_NULL,
-  SEED_TYPE_BOOLEAN,
-  SEED_TYPE_NUMBER,
-  SEED_TYPE_STRING,
-  SEED_TYPE_OBJECT
-} SeedType;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="seed-make-undefined"></a><h3>seed_make_undefined ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_make_undefined                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
-<p>
-Note that this function returns a valid SeedValue,
-representing the undefined JavaScript value, and not an
-undefined SeedValue.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-Native-Type-Conversion.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-make-undefined" title="seed_make_undefined ()">seed_make_undefined</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-make-null" title="seed_make_null ()">seed_make_null</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-boolean" title="seed_value_to_boolean ()">seed_value_to_boolean</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-boolean" title="seed_value_from_boolean ()">seed_value_from_boolean</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">guint</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-uint" title="seed_value_to_uint ()">seed_value_to_uint</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-uint" title="seed_value_from_uint ()">seed_value_from_uint</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gint</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-int" title="seed_value_to_int ()">seed_value_to_int</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-int" title="seed_value_from_int ()">seed_value_from_int</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-char" title="seed_value_to_char ()">seed_value_to_char</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-char" title="seed_value_from_char ()">seed_value_from_char</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">guchar</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-uchar" title="seed_value_to_uchar ()">seed_value_to_uchar</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-uchar" title="seed_value_from_uchar ()">seed_value_from_uchar</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">glong</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-long" title="seed_value_to_long ()">seed_value_to_long</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-long" title="seed_value_from_long ()">seed_value_from_long</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gulong</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-ulong" title="seed_value_to_ulong ()">seed_value_to_ulong</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-ulong" title="seed_value_from_ulong ()">seed_value_from_ulong</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gint64</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-int64" title="seed_value_to_int64 ()">seed_value_to_int64</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-int64" title="seed_value_from_int64 ()">seed_value_from_int64</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">guint64</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-uint64" title="seed_value_to_uint64 ()">seed_value_to_uint64</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-uint64" title="seed_value_from_uint64 ()">seed_value_from_uint64</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gfloat</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-float" title="seed_value_to_float ()">seed_value_to_float</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-float" title="seed_value_from_float ()">seed_value_from_float</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gdouble</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-double" title="seed_value_to_double ()">seed_value_to_double</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-double" title="seed_value_from_double ()">seed_value_from_double</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-string" title="seed_value_to_string ()">seed_value_to_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-string" title="seed_value_from_string ()">seed_value_from_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-binary-string" title="seed_value_from_binary_string ()">seed_value_from_binary_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">GObject</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-object" title="seed_value_to_object ()">seed_value_to_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-object" title="seed_value_from_object ()">seed_value_from_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gchar</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-filename" title="seed_value_to_filename ()">seed_value_to_filename</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-from-filename" title="seed_value_from_filename ()">seed_value_from_filename</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-value-to-format" title="seed_value_to_format ()">seed_value_to_format</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gpointer</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-pointer-get-pointer" title="seed_pointer_get_pointer ()">seed_pointer_get_pointer</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-make-pointer" title="seed_make_pointer ()">seed_make_pointer</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="returnvalue">SeedString</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-string-ref" title="seed_string_ref ()">seed_string_ref</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-string-unref" title="seed_string_unref ()">seed_string_unref</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> of the 'undefined' type.</td>
+<td class="function_type">
+<span class="returnvalue">gsize</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-string-get-maximum-size" title="seed_string_get_maximum_size ()">seed_string_get_maximum_size</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gsize</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer" title="seed_string_to_utf8_buffer ()">seed_string_to_utf8_buffer</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-string-is-equal" title="seed_string_is_equal ()">seed_string_is_equal</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Native-Type-Conversion.html#seed-string-is-equal-utf8" title="seed_string_is_equal_utf8 ()">seed_string_is_equal_utf8</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="seed-make-null"></a><h3>seed_make_null ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_make_null                      (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
-<p>
-Note that this function returns a valid SeedValue,
-representing the null JavaScript value, and not a
-null SeedValue.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect1">
+<a name="seed-Native-Type-Conversion.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue">SeedValue</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> of the 'null' type.</td>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType">SeedType</a></td>
+</tr>
+<tr>
+<td class="typedef_keyword">typedef</td>
+<td class="function_name"><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString">SeedString</a></td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="seed-value-to-boolean"></a><h3>seed_value_to_boolean ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_to_boolean               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<div class="refsect1">
+<a name="seed-Native-Type-Conversion.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
+</pre>
+</div>
+<div class="refsect1">
+<a name="seed-Native-Type-Conversion.description"></a><h2>Description</h2>
 <p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gboolean</span>. Keep in mind that this will
-not convert a JavaScript number type, only a boolean.
+Long description
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+</div>
+<div class="refsect1">
+<a name="seed-Native-Type-Conversion.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="seed-make-undefined"></a><h3>seed_make_undefined ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_make_undefined (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
+<p>Note that this function returns a valid SeedValue,
+representing the undefined JavaScript value, and not an
+undefined SeedValue.</p>
+<div class="refsect3">
+<a name="seed-make-undefined.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="seed-make-undefined.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> of the 'undefined' type.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="seed-make-null"></a><h3>seed_make_null ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_make_null (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>);</pre>
+<p>Note that this function returns a valid SeedValue,
+representing the null JavaScript value, and not a
+null SeedValue.</p>
+<div class="refsect3">
+<a name="seed-make-null.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="seed-make-null.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> of the 'null' type.</p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="seed-value-to-boolean"></a><h3>seed_value_to_boolean ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_to_boolean (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gboolean</span>. Keep in mind that this will
+not convert a JavaScript number type, only a boolean.</p>
+<div class="refsect3">
+<a name="seed-value-to-boolean.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gboolean</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-boolean.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gboolean</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-boolean"></a><h3>seed_value_from_boolean ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_boolean             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gboolean</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gboolean</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-boolean"></a><h3>seed_value_from_boolean ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_boolean (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><span class="type">gboolean</span> val</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gboolean</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-boolean.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gboolean</span> to represent.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gboolean</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-boolean.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-uint"></a><h3>seed_value_to_uint ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>               seed_value_to_uint                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">guint</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-uint"></a><h3>seed_value_to_uint ()</h3>
+<pre class="programlisting"><span class="returnvalue">guint</span>
+seed_value_to_uint (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">guint</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-uint.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">guint</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-uint.returns"></a><h4>Returns</h4>
+<p> The <span class="type">guint</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-uint"></a><h3>seed_value_from_uint ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_uint                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">guint</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-uint"></a><h3>seed_value_from_uint ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_uint (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><span class="type">guint</span> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">guint</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-uint.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">guint</span> to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">guint</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-uint.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-int"></a><h3>seed_value_to_int ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint</span>                seed_value_to_int                   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gint</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-int"></a><h3>seed_value_to_int ()</h3>
+<pre class="programlisting"><span class="returnvalue">gint</span>
+seed_value_to_int (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                   <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                   <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gint</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-int.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gint</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-int.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gint</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-int"></a><h3>seed_value_from_int ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_int                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gint</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-int"></a><h3>seed_value_from_int ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_int (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><span class="type">gint</span> val</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gint</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-int.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gint</span> to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gint</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-int.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-char"></a><h3>seed_value_to_char ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span>               seed_value_to_char                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gchar</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-char"></a><h3>seed_value_to_char ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span>
+seed_value_to_char (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gchar</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-char.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gchar</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-char.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gchar</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-char"></a><h3>seed_value_from_char ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_char                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gchar</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-char"></a><h3>seed_value_from_char ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_char (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><span class="type">gchar</span> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gchar</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-char.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gchar</span> to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gchar</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-char.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-uchar"></a><h3>seed_value_to_uchar ()</h3>
-<pre class="programlisting"><span class="returnvalue">guchar</span>              seed_value_to_uchar                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">guchar</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-uchar"></a><h3>seed_value_to_uchar ()</h3>
+<pre class="programlisting"><span class="returnvalue">guchar</span>
+seed_value_to_uchar (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">guchar</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-uchar.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">guchar</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-uchar.returns"></a><h4>Returns</h4>
+<p> The <span class="type">guchar</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-uchar"></a><h3>seed_value_from_uchar ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_uchar               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">guchar</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">guchar</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-uchar"></a><h3>seed_value_from_uchar ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_uchar (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                       <em class="parameter"><code><span class="type">guchar</span> val</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">guchar</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-uchar.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">guchar</span> to represent.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">guchar</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-uchar.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-long"></a><h3>seed_value_to_long ()</h3>
-<pre class="programlisting"><span class="returnvalue">glong</span>               seed_value_to_long                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">glong</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-long"></a><h3>seed_value_to_long ()</h3>
+<pre class="programlisting"><span class="returnvalue">glong</span>
+seed_value_to_long (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">glong</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-long.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">glong</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-long.returns"></a><h4>Returns</h4>
+<p> The <span class="type">glong</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-long"></a><h3>seed_value_from_long ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_long                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">glong</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">glong</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-long"></a><h3>seed_value_from_long ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_long (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><span class="type">glong</span> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">glong</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-long.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">glong</span> to represent.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">glong</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-long.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-ulong"></a><h3>seed_value_to_ulong ()</h3>
-<pre class="programlisting"><span class="returnvalue">gulong</span>              seed_value_to_ulong                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gulong</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-ulong"></a><h3>seed_value_to_ulong ()</h3>
+<pre class="programlisting"><span class="returnvalue">gulong</span>
+seed_value_to_ulong (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gulong</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-ulong.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gulong</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-ulong.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gulong</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-ulong"></a><h3>seed_value_from_ulong ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_ulong               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gulong</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gulong</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-ulong"></a><h3>seed_value_from_ulong ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_ulong (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                       <em class="parameter"><code><span class="type">gulong</span> val</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gulong</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-ulong.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gulong</span> to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gulong</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-ulong.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-int64"></a><h3>seed_value_to_int64 ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>              seed_value_to_int64                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gint64</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-int64"></a><h3>seed_value_to_int64 ()</h3>
+<pre class="programlisting"><span class="returnvalue">gint64</span>
+seed_value_to_int64 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gint64</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-int64.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gint64</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-int64.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gint64</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-int64"></a><h3>seed_value_from_int64 ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_int64               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gint64</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-int64"></a><h3>seed_value_from_int64 ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_int64 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                       <em class="parameter"><code><span class="type">gint64</span> val</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gint64</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-int64.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gint64</span> to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gint64</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-int64.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-uint64"></a><h3>seed_value_to_uint64 ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint64</span>             seed_value_to_uint64                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">guint64</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-uint64"></a><h3>seed_value_to_uint64 ()</h3>
+<pre class="programlisting"><span class="returnvalue">guint64</span>
+seed_value_to_uint64 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">guint64</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-uint64.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">guint64</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-uint64.returns"></a><h4>Returns</h4>
+<p> The <span class="type">guint64</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-uint64"></a><h3>seed_value_from_uint64 ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_uint64              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint64</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">guint64</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-uint64"></a><h3>seed_value_from_uint64 ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_uint64 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                        <em class="parameter"><code><span class="type">guint64</span> val</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">guint64</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-uint64.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">guint64</span> to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">guint64</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-uint64.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-float"></a><h3>seed_value_to_float ()</h3>
-<pre class="programlisting"><span class="returnvalue">gfloat</span>              seed_value_to_float                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gfloat</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-float"></a><h3>seed_value_to_float ()</h3>
+<pre class="programlisting"><span class="returnvalue">gfloat</span>
+seed_value_to_float (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gfloat</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-float.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gfloat</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-float.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gfloat</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-float"></a><h3>seed_value_from_float ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_float               (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gfloat</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gfloat</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-float"></a><h3>seed_value_from_float ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_float (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                       <em class="parameter"><code><span class="type">gfloat</span> val</code></em>,
+                       <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gfloat</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-float.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gfloat</span> to represent.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gfloat</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-float.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-double"></a><h3>seed_value_to_double ()</h3>
-<pre class="programlisting"><span class="returnvalue">gdouble</span>             seed_value_to_double                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gdouble</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-double"></a><h3>seed_value_to_double ()</h3>
+<pre class="programlisting"><span class="returnvalue">gdouble</span>
+seed_value_to_double (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gdouble</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-double.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gdouble</span> represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-double.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gdouble</span> represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-double"></a><h3>seed_value_from_double ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_double              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gdouble</span> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gdouble</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-double"></a><h3>seed_value_from_double ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_double (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                        <em class="parameter"><code><span class="type">gdouble</span> val</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gdouble</span> into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-double.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gdouble</span> to represent.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gdouble</span> to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-double.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-string"></a><h3>seed_value_to_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *             seed_value_to_string                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gchar</span>* string. Keep in mind that it's
-up to the caller to free the string.
-</p>
-<p>
-If the <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> represents JavaScript's undefined value, this returns
+<a name="seed-value-to-string"></a><h3>seed_value_to_string ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> *
+seed_value_to_string (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gchar</span>* string. Keep in mind that it's
+up to the caller to free the string.</p>
+<p>If the <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> represents JavaScript's undefined value, this returns
 "[undefined]"; if it represents JavaScript's null value, this returns
-"[null]".
-</p>
-<p>
-If the <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> is a number or a boolean, it is printed as a double, with 
-the printf format string "%.15g".
-</p>
-<p>
-If the <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> is an object, the string returned is that obtained by
-calling .toString() on said object.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+"[null]".</p>
+<p>If the <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> is a number or a boolean, it is printed as a double, with
+the printf format string "%.15g".</p>
+<p>If the <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> is an object, the string returned is that obtained by
+calling .toString() on said object.</p>
+<div class="refsect3">
+<a name="seed-value-to-string.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gchar</span>* represented by <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-string.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gchar</span>* represented by <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-string"></a><h3>seed_value_from_string ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_string              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gchar</span>* string into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-string"></a><h3>seed_value_from_string ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_string (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                        <em class="parameter"><code>const <span class="type">gchar</span> *val</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gchar</span>* string into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-string.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gchar</span>* to represent.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gchar</span>* to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-string.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-binary-string"></a><h3>seed_value_from_binary_string ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_binary_string       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *bytes</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint</span> n_bytes</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Converts a string representation of the given binary string
-into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<p>
-FIXME - should use BinaryArray really
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-binary-string"></a><h3>seed_value_from_binary_string ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_binary_string (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                               <em class="parameter"><code>const <span class="type">gchar</span> *bytes</code></em>,
+                               <em class="parameter"><code><span class="type">gint</span> n_bytes</code></em>,
+                               <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Converts a string representation of the given binary string
+into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<p>FIXME - should use BinaryArray really</p>
+<div class="refsect3">
+<a name="seed-value-from-binary-string.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bytes</code></em> :</span></p></td>
-<td>A string of bytes to represent as a string.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>n_bytes</code></em> :</span></p></td>
-<td>The number of bytes from <em class="parameter"><code>bytes</code></em> to convert.</td>
+<td class="parameter_name"><p>bytes</p></td>
+<td class="parameter_description"><p>A string of bytes to represent as a string.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>n_bytes</p></td>
+<td class="parameter_description"><p>The number of bytes from <em class="parameter"><code>bytes</code></em>
+to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>bytes</code></em> as a string.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-binary-string.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>bytes</code></em>
+as a string.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-object"></a><h3>seed_value_to_object ()</h3>
-<pre class="programlisting"><span class="returnvalue">GObject</span> *           seed_value_to_object                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Given a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which is wrapping a <span class="type">GObject</span>, retrieve the wrapped
-<span class="type">GObject</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-object"></a><h3>seed_value_to_object ()</h3>
+<pre class="programlisting"><span class="returnvalue">GObject</span> *
+seed_value_to_object (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Given a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which is wrapping a <span class="type">GObject</span>, retrieve the wrapped
+<span class="type">GObject</span>.</p>
+<div class="refsect3">
+<a name="seed-value-to-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to unwrap.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to unwrap.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">GObject</span> wrapped within <em class="parameter"><code>val</code></em>, or <code class="literal">NULL</code> if an exception
-is raised during the conversion.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-object.returns"></a><h4>Returns</h4>
+<p> The <span class="type">GObject</span> wrapped within <em class="parameter"><code>val</code></em>
+, or <code class="literal">NULL</code> if an exception
+is raised during the conversion.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-object"></a><h3>seed_value_from_object ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_object              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GObject</span> *val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
-<p>
-Wraps <em class="parameter"><code>val</code></em> in a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-object"></a><h3>seed_value_from_object ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_object (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                        <em class="parameter"><code><span class="type">GObject</span> *val</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<p>Wraps <em class="parameter"><code>val</code></em>
+ in a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-from-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">GObject</span> to wrap.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">GObject</span> to wrap.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which wraps <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-object.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which wraps <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-filename"></a><h3>seed_value_to_filename ()</h3>
-<pre class="programlisting"><span class="returnvalue">gchar</span> *             seed_value_to_filename              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gchar</span>*, properly converting to the 
-character set used for filenames on the local machine.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-to-filename"></a><h3>seed_value_to_filename ()</h3>
+<pre class="programlisting"><span class="returnvalue">gchar</span> *
+seed_value_to_filename (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>);</pre>
+<p>Converts the given <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> into a <span class="type">gchar</span>*, properly converting to the
+character set used for filenames on the local machine.</p>
+<div class="refsect3">
+<a name="seed-value-to-filename.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The <span class="type">gchar</span>* represented by <em class="parameter"><code>val</code></em>, or <code class="literal">NULL</code> if an exception
-is raised during the conversion.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-filename.returns"></a><h4>Returns</h4>
+<p> The <span class="type">gchar</span>* represented by <em class="parameter"><code>val</code></em>
+, or <code class="literal">NULL</code> if an exception
+is raised during the conversion.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-from-filename"></a><h3>seed_value_from_filename ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_value_from_filename            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>);</pre>
-<p>
-Converts the given <span class="type">gchar</span>* filename into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>, respecting the 
-character set used for filenames on the local machine.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-from-filename"></a><h3>seed_value_from_filename ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_value_from_filename (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> val</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>);</pre>
+<p>Converts the given <span class="type">gchar</span>* filename into a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>, respecting the
+character set used for filenames on the local machine.</p>
+<div class="refsect3">
+<a name="seed-value-from-filename.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>The <span class="type">gchar</span>* filename to represent.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
-Pass <code class="literal">NULL</code> to ignore exceptions.</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>The <span class="type">gchar</span>* filename to represent.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>A reference to a <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> in which to store any exceptions.
+Pass <code class="literal">NULL</code> to ignore exceptions.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-from-filename.returns"></a><h4>Returns</h4>
+<p> A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> which represents <em class="parameter"><code>val</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-to-format"></a><h3>seed_value_to_format ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_to_format                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *format</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *values</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>,
-                                                         <em class="parameter"><code>...</code></em>);</pre>
-<p>
-A convenience API for converting multiple values at once, the format string
+<a name="seed-value-to-format"></a><h3>seed_value_to_format ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_to_format (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code>const <span class="type">gchar</span> *format</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *values</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *exception</code></em>,
+                      <em class="parameter"><code>...</code></em>);</pre>
+<p>A convenience API for converting multiple values at once, the format string
 is composed of single characters specifying types, for example:
 i: gint
 u: guint
 o: GObject *
 s: gchar *
 f: gdouble
-c: gchar
-</p>
-<p>
-and a valid format string could be "iuo".
-</p>
-<p>
-This function may be in particular useful in converting arguments
-in a <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+c: gchar</p>
+<p>and a valid format string could be "iuo".</p>
+<p>This function may be in particular useful in converting arguments
+in a <a class="link" href="seed-Native-Functions.html#SeedFunctionCallback" title="SeedFunctionCallback ()"><span class="type">SeedFunctionCallback</span></a>.</p>
+<div class="refsect3">
+<a name="seed-value-to-format.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>format</code></em> :</span></p></td>
-<td>Format string to use.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>values</code></em> :</span></p></td>
-<td>The values to convert.</td>
+<td class="parameter_name"><p>format</p></td>
+<td class="parameter_description"><p>Format string to use.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>exception</code></em> :</span></p></td>
-<td>Location to store an exception.</td>
+<td class="parameter_name"><p>values</p></td>
+<td class="parameter_description"><p>The values to convert.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Whether conversion was successful.</td>
+<td class="parameter_name"><p>exception</p></td>
+<td class="parameter_description"><p>Location to store an exception.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-to-format.returns"></a><h4>Returns</h4>
+<p> Whether conversion was successful.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-pointer-get-pointer"></a><h3>seed_pointer_get_pointer ()</h3>
-<pre class="programlisting"><span class="returnvalue">gpointer</span>            seed_pointer_get_pointer            (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> pointer</code></em>);</pre>
+<a name="seed-pointer-get-pointer"></a><h3>seed_pointer_get_pointer ()</h3>
+<pre class="programlisting"><span class="returnvalue">gpointer</span>
+seed_pointer_get_pointer (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                          <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> pointer</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-make-pointer"></a><h3>seed_make_pointer ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_make_pointer                   (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">gpointer</span> pointer</code></em>);</pre>
+<a name="seed-make-pointer"></a><h3>seed_make_pointer ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_make_pointer (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                   <em class="parameter"><code><span class="type">gpointer</span> pointer</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="SeedString"></a><h3>SeedString</h3>
-<pre class="programlisting">typedef gpointer SeedString;
-</pre>
-<p>
+<a name="seed-string-ref"></a><h3>seed_string_ref ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="returnvalue">SeedString</span></a>
+seed_string_ref (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
+<p>Increments the reference count of <em class="parameter"><code>string</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-string-ref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="seed-string-ref.returns"></a><h4>Returns</h4>
+<p> <em class="parameter"><code>string</code></em>
 </p>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-string-ref"></a><h3>seed_string_ref ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="returnvalue">SeedString</span></a>          seed_string_ref                     (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
-<p>
-Increments the reference count of <em class="parameter"><code>string</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td><em class="parameter"><code>string</code></em></td>
-</tr>
-</tbody>
+<a name="seed-string-unref"></a><h3>seed_string_unref ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_string_unref (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
+<p>Decrements the reference count of <em class="parameter"><code>string</code></em>
+.</p>
+<div class="refsect3">
+<a name="seed-string-unref.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-string-unref"></a><h3>seed_string_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_string_unref                   (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
-<p>
-Decrements the reference count of <em class="parameter"><code>string</code></em>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-string-get-maximum-size"></a><h3>seed_string_get_maximum_size ()</h3>
+<pre class="programlisting"><span class="returnvalue">gsize</span>
+seed_string_get_maximum_size (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-string-get-maximum-size.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</td>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-string-get-maximum-size.returns"></a><h4>Returns</h4>
+<p> The maximum number of bytes <em class="parameter"><code>string</code></em>
+will take up if converted
+to a null-terminated UTF8 string.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-string-get-maximum-size"></a><h3>seed_string_get_maximum_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">gsize</span>               seed_string_get_maximum_size        (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-string-to-utf8-buffer"></a><h3>seed_string_to_utf8_buffer ()</h3>
+<pre class="programlisting"><span class="returnvalue">gsize</span>
+seed_string_to_utf8_buffer (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>,
+                            <em class="parameter"><code><span class="type">gchar</span> *buffer</code></em>,
+                            <em class="parameter"><code><span class="type">size_t</span> buffer_size</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-string-to-utf8-buffer.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</td>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The maximum number of bytes <em class="parameter"><code>string</code></em> will take up if converted
-to a null-terminated UTF8 string.</td>
+<td class="parameter_name"><p>buffer</p></td>
+<td class="parameter_description"><p>An allocated string.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>buffer_size</p></td>
+<td class="parameter_description"><p>The length of <em class="parameter"><code>buffer</code></em>
+, in bytes.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-string-to-utf8-buffer.returns"></a><h4>Returns</h4>
+<p> A the number of bytes copied into <em class="parameter"><code>buffer</code></em>
+.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-string-to-utf8-buffer"></a><h3>seed_string_to_utf8_buffer ()</h3>
-<pre class="programlisting"><span class="returnvalue">gsize</span>               seed_string_to_utf8_buffer          (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> string</code></em>,
-                                                         <em class="parameter"><code><span class="type">gchar</span> *buffer</code></em>,
-                                                         <em class="parameter"><code><span class="type">size_t</span> buffer_size</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-string-is-equal"></a><h3>seed_string_is_equal ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_string_is_equal (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> a</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> b</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-string-is-equal.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a>.</td>
+<td class="parameter_name"><p>a</p></td>
+<td class="parameter_description"><p>The first <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> to compare.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>buffer</code></em> :</span></p></td>
-<td>An allocated string.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>buffer_size</code></em> :</span></p></td>
-<td>The length of <em class="parameter"><code>buffer</code></em>, in bytes.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A the number of bytes copied into <em class="parameter"><code>buffer</code></em>.</td>
+<td class="parameter_name"><p>b</p></td>
+<td class="parameter_description"><p>The second <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> to compare.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-string-is-equal.returns"></a><h4>Returns</h4>
+<p> <span class="type">true</span>, if a and b are equal, <span class="type">false</span> otherwise.</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-string-is-equal"></a><h3>seed_string_is_equal ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_string_is_equal                (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> a</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> b</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-string-is-equal-utf8"></a><h3>seed_string_is_equal_utf8 ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_string_is_equal_utf8 (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> a</code></em>,
+                           <em class="parameter"><code>const <span class="type">gchar</span> *b</code></em>);</pre>
+<p>Tests the equality of a SeedString and a UTF-8 C-style string.</p>
+<div class="refsect3">
+<a name="seed-string-is-equal-utf8.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
-<td>The first <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> to compare.</td>
+<td class="parameter_name"><p>a</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> to compare.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>The second <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> to compare.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-<span class="type">true</span>, if a and b are equal, <span class="type">false</span> otherwise.</td>
+<td class="parameter_name"><p>b</p></td>
+<td class="parameter_description"><p>A <span class="type">gchar</span>* to compare to.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-string-is-equal-utf8.returns"></a><h4>Returns</h4>
+<p> <span class="type">true</span>, if a and b are equal, <span class="type">false</span> otherwise.</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-Native-Type-Conversion.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="SeedValue"></a><h3>SeedValue</h3>
+<pre class="programlisting">typedef gpointer SeedValue;
+</pre>
+<p>
+</p>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-string-is-equal-utf8"></a><h3>seed_string_is_equal_utf8 ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_string_is_equal_utf8           (<em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> a</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *b</code></em>);</pre>
+<a name="SeedType"></a><h3>enum SeedType</h3>
 <p>
-Tests the equality of a SeedString and a UTF-8 C-style string.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="SeedType.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedString" title="SeedString"><span class="type">SeedString</span></a> to compare.</td>
+<td class="enum_member_name"><p><a name="SEED-TYPE-UNDEFINED:CAPS"></a>SEED_TYPE_UNDEFINED</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="SEED-TYPE-NULL:CAPS"></a>SEED_TYPE_NULL</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td>
-<td>A <span class="type">gchar</span>* to compare to.</td>
+<td class="enum_member_name"><p><a name="SEED-TYPE-BOOLEAN:CAPS"></a>SEED_TYPE_BOOLEAN</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-<span class="type">true</span>, if a and b are equal, <span class="type">false</span> otherwise.</td>
+<td class="enum_member_name"><p><a name="SEED-TYPE-NUMBER:CAPS"></a>SEED_TYPE_NUMBER</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="SEED-TYPE-STRING:CAPS"></a>SEED_TYPE_STRING</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="SEED-TYPE-OBJECT:CAPS"></a>SEED_TYPE_OBJECT</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
+<hr>
+<div class="refsect2">
+<a name="SeedString"></a><h3>SeedString</h3>
+<pre class="programlisting">typedef gpointer SeedString;
+</pre>
+<p>
+</p>
+</div>
+</div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Operating-on-Native-Types.html b/doc/reference/html/seed-Operating-on-Native-Types.html
index 12fda20..0e6bd31 100644
--- a/doc/reference/html/seed-Operating-on-Native-Types.html
+++ b/doc/reference/html/seed-Operating-on-Native-Types.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Operating on JavaScript types</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Operating on JavaScript types: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="types.html" title="Values and Type Conversion">
 <link rel="prev" href="seed-Native-Type-Conversion.html" title="Type Conversion">
 <link rel="next" href="seed-JS-Objects.html" title="Working with JavaScript objects">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Native-Type-Conversion.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="types.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-JS-Objects.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Operating-on-Native-Types.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Operating-on-Native-Types.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Operating-on-Native-Types.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="types.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Native-Type-Conversion.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-JS-Objects.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Operating-on-Native-Types"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,34 +29,102 @@
 <h2><span class="refentrytitle"><a name="seed-Operating-on-Native-Types.top_of_page"></a>Operating on JavaScript types</span></h2>
 <p>Operating on JavaScript types — Determining the type of a SeedValue</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Operating-on-Native-Types.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-<span class="returnvalue">void</span>                <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-unprotect" title="seed_value_unprotect ()">seed_value_unprotect</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-protect" title="seed_value_protect ()">seed_value_protect</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-undefined" title="seed_value_is_undefined ()">seed_value_is_undefined</a>             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-null" title="seed_value_is_null ()">seed_value_is_null</a>                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-function" title="seed_value_is_function ()">seed_value_is_function</a>              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> value</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-number" title="seed_value_is_number ()">seed_value_is_number</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-string" title="seed_value_is_string ()">seed_value_is_string</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-object-of-class" title="seed_value_is_object_of_class ()">seed_value_is_object_of_class</a>       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>);
-<span class="returnvalue">gboolean</span>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-object" title="seed_value_is_object ()">seed_value_is_object</a>                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="returnvalue">SeedType</span></a>            <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-get-type" title="seed_value_get_type ()">seed_value_get_type</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);
+<div class="refsect1">
+<a name="seed-Operating-on-Native-Types.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-unprotect" title="seed_value_unprotect ()">seed_value_unprotect</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-protect" title="seed_value_protect ()">seed_value_protect</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-undefined" title="seed_value_is_undefined ()">seed_value_is_undefined</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-null" title="seed_value_is_null ()">seed_value_is_null</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-function" title="seed_value_is_function ()">seed_value_is_function</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-number" title="seed_value_is_number ()">seed_value_is_number</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-string" title="seed_value_is_string ()">seed_value_is_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-object-of-class" title="seed_value_is_object_of_class ()">seed_value_is_object_of_class</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">gboolean</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-is-object" title="seed_value_is_object ()">seed_value_is_object</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="returnvalue">SeedType</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-get-type" title="seed_value_get_type ()">seed_value_get_type</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Operating-on-Native-Types.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -70,275 +134,374 @@ Long description
 </p>
 </div>
 <div class="refsect1">
-<a name="seed-Operating-on-Native-Types.details"></a><h2>Details</h2>
+<a name="seed-Operating-on-Native-Types.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="seed-value-unprotect"></a><h3>seed_value_unprotect ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_value_unprotect                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Decrements the "protection count" of <em class="parameter"><code>value</code></em>, as explained in
-<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-protect" title="seed_value_protect ()"><code class="function">seed_value_protect()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-unprotect"></a><h3>seed_value_unprotect ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_value_unprotect (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Decrements the "protection count" of <em class="parameter"><code>value</code></em>
+, as explained in
+<a class="link" href="seed-Operating-on-Native-Types.html#seed-value-protect" title="seed_value_protect ()"><code class="function">seed_value_protect()</code></a>.</p>
+<div class="refsect3">
+<a name="seed-value-unprotect.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to unprotect.</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to unprotect.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-protect"></a><h3>seed_value_protect ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_value_protect                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Increments the "protection count" of <em class="parameter"><code>value</code></em>, in case you want to store
+<a name="seed-value-protect"></a><h3>seed_value_protect ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_value_protect (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Increments the "protection count" of <em class="parameter"><code>value</code></em>
+, in case you want to store
 a reference somewhere where the garbage collector won't be able to find it,
-and don't want it to be collected!
-</p>
-<p>
-In order for <em class="parameter"><code>value</code></em> to be collected afterwards, it will need to be
-unprotected the same number of times with <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-unprotect" title="seed_value_unprotect ()"><code class="function">seed_value_unprotect()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+and don't want it to be collected!</p>
+<p>In order for <em class="parameter"><code>value</code></em>
+ to be collected afterwards, it will need to be
+unprotected the same number of times with <a class="link" href="seed-Operating-on-Native-Types.html#seed-value-unprotect" title="seed_value_unprotect ()"><code class="function">seed_value_unprotect()</code></a>.</p>
+<div class="refsect3">
+<a name="seed-value-protect.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to protect.</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>The <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> to protect.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-undefined"></a><h3>seed_value_is_undefined ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_undefined             (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> represents the JavaScript undefined value
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-undefined"></a><h3>seed_value_is_undefined ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_undefined (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ represents the JavaScript undefined value</p>
+<div class="refsect3">
+<a name="seed-value-is-undefined.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is 'undefined')</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-undefined.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is 'undefined')</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-null"></a><h3>seed_value_is_null ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_null                  (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> represents the JavaScript null value
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-null"></a><h3>seed_value_is_null ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_null (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                    <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ represents the JavaScript null value</p>
+<div class="refsect3">
+<a name="seed-value-is-null.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is 'null')</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-null.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is 'null')</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-function"></a><h3>seed_value_is_function ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_function              (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> value</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> is a JavaScript function (and, therefore,
-an object)
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-function"></a><h3>seed_value_is_function ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_function (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                        <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> value</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ is a JavaScript function (and, therefore,
+an object)</p>
+<div class="refsect3">
+<a name="seed-value-is-function.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is a function)</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-function.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is a function)</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-number"></a><h3>seed_value_is_number ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_number                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> is a JavaScript number
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-number"></a><h3>seed_value_is_number ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_number (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ is a JavaScript number</p>
+<div class="refsect3">
+<a name="seed-value-is-number.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is a number)</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-number.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is a number)</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-string"></a><h3>seed_value_is_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_string                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> is a JavaScript string
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-string"></a><h3>seed_value_is_string ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_string (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ is a JavaScript string</p>
+<div class="refsect3">
+<a name="seed-value-is-string.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is a string)</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-string.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is a string)</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-object-of-class"></a><h3>seed_value_is_object_of_class ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_object_of_class       (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> is an object of the specified class
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-object-of-class"></a><h3>seed_value_is_object_of_class ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_object_of_class (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                               <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>,
+                               <em class="parameter"><code><a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a> klass</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ is an object of the specified class</p>
+<div class="refsect3">
+<a name="seed-value-is-object-of-class.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>klass</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a>.</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is of class <em class="parameter"><code>klass</code></em>)</td>
+<td class="parameter_name"><p>klass</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-JavaScript-Classes.html#SeedClass" title="SeedClass"><span class="type">SeedClass</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-object-of-class.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is of class <em class="parameter"><code>klass</code></em>
+)</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-is-object"></a><h3>seed_value_is_object ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            seed_value_is_object                (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<p>
-Determine whether or not <em class="parameter"><code>value</code></em> is a JavaScript object
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-is-object"></a><h3>seed_value_is_object ()</h3>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+seed_value_is_object (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                      <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<p>Determine whether or not <em class="parameter"><code>value</code></em>
+ is a JavaScript object</p>
+<div class="refsect3">
+<a name="seed-value-is-object.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em> is an object)</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-is-object.returns"></a><h4>Returns</h4>
+<p> A <span class="type">gboolean</span> (<code class="literal">true</code> if <em class="parameter"><code>value</code></em>
+is an object)</p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-value-get-type"></a><h3>seed_value_get_type ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="returnvalue">SeedType</span></a>            seed_value_get_type                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-value-get-type"></a><h3>seed_value_get_type ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedType" title="enum SeedType"><span class="returnvalue">SeedType</span></a>
+seed_value_get_type (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> value</code></em>);</pre>
+<div class="refsect3">
+<a name="seed-value-get-type.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The type of <em class="parameter"><code>value</code></em>
-</td>
+<td class="parameter_name"><p>value</p></td>
+<td class="parameter_description"><p>A <a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="seed-value-get-type.returns"></a><h4>Returns</h4>
+<p> The type of <em class="parameter"><code>value</code></em>
+</p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="seed-Operating-on-Native-Types.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-SeedClosure.html b/doc/reference/html/seed-SeedClosure.html
index 71786d9..20d7ec8 100644
--- a/doc/reference/html/seed-SeedClosure.html
+++ b/doc/reference/html/seed-SeedClosure.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Using JavaScript closures</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Using JavaScript closures: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-JavaScript-Classes.html" title="Creating JavaScript classes">
 <link rel="next" href="seed-Modules.html" title="Seed Modules">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-JavaScript-Classes.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Modules.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-SeedClosure.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-SeedClosure.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-SeedClosure.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-JavaScript-Classes.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Modules.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-SeedClosure"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,31 +29,75 @@
 <h2><span class="refentrytitle"><a name="seed-SeedClosure.top_of_page"></a>Using JavaScript closures</span></h2>
 <p>Using JavaScript closures — Creating and invoking closures over JavaScript functions using GClosure</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-SeedClosure.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-struct              <a class="link" href="seed-SeedClosure.html#SeedClosure" title="struct SeedClosure">SeedClosure</a>;
-<span class="returnvalue">GClosure</span> *          <a class="link" href="seed-SeedClosure.html#seed-closure-new" title="seed_closure_new ()">seed_closure_new</a>                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> user_data</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *description</code></em>);
-<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          <a class="link" href="seed-SeedClosure.html#seed-closure-get-callable" title="seed_closure_get_callable ()">seed_closure_get_callable</a>           (<em class="parameter"><code><span class="type">GClosure</span> *c</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-SeedClosure.html#seed-closure-invoke" title="seed_closure_invoke ()">seed_closure_invoke</a>                 (<em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *args</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> argc</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           <a class="link" href="seed-SeedClosure.html#seed-closure-invoke-with-context" title="seed_closure_invoke_with_context ()">seed_closure_invoke_with_context</a>    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *args</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> argc</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-SeedClosure.html#seed-closure-warn-exception" title="seed_closure_warn_exception ()">seed_closure_warn_exception</a>         (<em class="parameter"><code><span class="type">GClosure</span> *c</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);
+<div class="refsect1">
+<a name="seed-SeedClosure.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">GClosure</span> *
+</td>
+<td class="function_name">
+<a class="link" href="seed-SeedClosure.html#seed-closure-new" title="seed_closure_new ()">seed_closure_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-SeedClosure.html#seed-closure-get-callable" title="seed_closure_get_callable ()">seed_closure_get_callable</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-SeedClosure.html#seed-closure-invoke" title="seed_closure_invoke ()">seed_closure_invoke</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="seed-SeedClosure.html#seed-closure-invoke-with-context" title="seed_closure_invoke_with_context ()">seed_closure_invoke_with_context</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-SeedClosure.html#seed-closure-warn-exception" title="seed_closure_warn_exception ()">seed_closure_warn_exception</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-SeedClosure.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="seed-SeedClosure.html#SeedClosure" title="struct SeedClosure">SeedClosure</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-SeedClosure.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -67,73 +107,79 @@ Long description
 </p>
 </div>
 <div class="refsect1">
-<a name="seed-SeedClosure.details"></a><h2>Details</h2>
+<a name="seed-SeedClosure.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="SeedClosure"></a><h3>struct SeedClosure</h3>
-<pre class="programlisting">struct SeedClosure {
-  GClosure closure;
-
-  JSObjectRef function;
-  JSValueRef user_data;
-
-  GType return_type;
-  gchar *description;
-};
-</pre>
+<a name="seed-closure-new"></a><h3>seed_closure_new ()</h3>
+<pre class="programlisting"><span class="returnvalue">GClosure</span> *
+seed_closure_new (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
+                  <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> user_data</code></em>,
+                  <em class="parameter"><code>const <span class="type">gchar</span> *description</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-closure-new"></a><h3>seed_closure_new ()</h3>
-<pre class="programlisting"><span class="returnvalue">GClosure</span> *          seed_closure_new                    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="type">SeedObject</span></a> user_data</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *description</code></em>);</pre>
+<a name="seed-closure-get-callable"></a><h3>seed_closure_get_callable ()</h3>
+<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>
+seed_closure_get_callable (<em class="parameter"><code><span class="type">GClosure</span> *c</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-closure-get-callable"></a><h3>seed_closure_get_callable ()</h3>
-<pre class="programlisting"><a class="link" href="seed-JS-Objects.html#SeedObject" title="SeedObject"><span class="returnvalue">SeedObject</span></a>          seed_closure_get_callable           (<em class="parameter"><code><span class="type">GClosure</span> *c</code></em>);</pre>
+<a name="seed-closure-invoke"></a><h3>seed_closure_invoke ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_closure_invoke (<em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *args</code></em>,
+                     <em class="parameter"><code><span class="type">guint</span> argc</code></em>,
+                     <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-closure-invoke"></a><h3>seed_closure_invoke ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_closure_invoke                 (<em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *args</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> argc</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="seed-closure-invoke-with-context"></a><h3>seed_closure_invoke_with_context ()</h3>
+<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>
+seed_closure_invoke_with_context (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                                  <em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *args</code></em>,
+                                  <em class="parameter"><code><span class="type">guint</span> argc</code></em>,
+                                  <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="seed-closure-invoke-with-context"></a><h3>seed_closure_invoke_with_context ()</h3>
-<pre class="programlisting"><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="returnvalue">SeedValue</span></a>           seed_closure_invoke_with_context    (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> *args</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> argc</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> *exception</code></em>);</pre>
+<a name="seed-closure-warn-exception"></a><h3>seed_closure_warn_exception ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_closure_warn_exception (<em class="parameter"><code><span class="type">GClosure</span> *c</code></em>,
+                             <em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                             <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
 <p>
 </p>
 </div>
-<hr>
+</div>
+<div class="refsect1">
+<a name="seed-SeedClosure.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
-<a name="seed-closure-warn-exception"></a><h3>seed_closure_warn_exception ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_closure_warn_exception         (<em class="parameter"><code><span class="type">GClosure</span> *c</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Exceptions.html#SeedException" title="SeedException"><span class="type">SeedException</span></a> exception</code></em>);</pre>
+<a name="SeedClosure"></a><h3>struct SeedClosure</h3>
+<pre class="programlisting">struct SeedClosure {
+  GClosure closure;
+
+  JSObjectRef function;
+  JSValueRef user_data;
+
+  GType return_type;
+  gchar *description;
+};
+</pre>
 <p>
 </p>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-Signals.html b/doc/reference/html/seed-Signals.html
index 6242c86..33cfbbe 100644
--- a/doc/reference/html/seed-Signals.html
+++ b/doc/reference/html/seed-Signals.html
@@ -2,30 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>GObject Signals</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>GObject Signals: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-Exceptions.html" title="Exception Handling">
 <link rel="next" href="types.html" title="Values and Type Conversion">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="seed-Exceptions.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="types.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#seed-Signals.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#seed-Signals.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description">  <span class="dim">|</span> 
+                  <a href="#seed-Signals.description" class="shortcut">Description</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Exceptions.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="types.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="seed-Signals"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
@@ -33,22 +29,38 @@
 <h2><span class="refentrytitle"><a name="seed-Signals.top_of_page"></a>GObject Signals</span></h2>
 <p>GObject Signals — Connecting JavaScript functions to signals</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="seed-Signals.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;seed/seed.h&gt;
-
-<span class="returnvalue">void</span>                <a class="link" href="seed-Signals.html#seed-signal-connect" title="seed_signal_connect ()">seed_signal_connect</a>                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GObject</span> *object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *signal</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *script</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="seed-Signals.html#seed-signal-connect-value" title="seed_signal_connect_value ()">seed_signal_connect_value</a>           (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GObject</span> *object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *signal</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> user_data</code></em>);
+<div class="refsect1">
+<a name="seed-Signals.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Signals.html#seed-signal-connect" title="seed_signal_connect ()">seed_signal_connect</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="seed-Signals.html#seed-signal-connect-value" title="seed_signal_connect_value ()">seed_signal_connect_value</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="seed-Signals.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;seed/seed.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -58,56 +70,72 @@ Long description
 </p>
 </div>
 <div class="refsect1">
-<a name="seed-Signals.details"></a><h2>Details</h2>
+<a name="seed-Signals.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="seed-signal-connect"></a><h3>seed_signal_connect ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_signal_connect                 (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GObject</span> *object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *signal</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *script</code></em>);</pre>
-<p>
-Evaluates <em class="parameter"><code>script</code></em>, which should return a function, then connects the returned
-function to the signal specified by <em class="parameter"><code>signal</code></em> on <em class="parameter"><code>object</code></em>. <em class="parameter"><code>user_data</code></em>
-is passed as the user_data argument to the callback function.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="seed-signal-connect"></a><h3>seed_signal_connect ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_signal_connect (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                     <em class="parameter"><code><span class="type">GObject</span> *object</code></em>,
+                     <em class="parameter"><code>const <span class="type">gchar</span> *signal</code></em>,
+                     <em class="parameter"><code>const <span class="type">gchar</span> *script</code></em>);</pre>
+<p>Evaluates <em class="parameter"><code>script</code></em>
+, which should return a function, then connects the returned
+function to the signal specified by <em class="parameter"><code>signal</code></em>
+ on <em class="parameter"><code>object</code></em>
+. <em class="parameter"><code>user_data</code></em>
+
+is passed as the user_data argument to the callback function.</p>
+<div class="refsect3">
+<a name="seed-signal-connect.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a>
-</td>
+<td class="parameter_name"><p>ctx</p></td>
+<td class="parameter_description"><p>A valid <a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>A <span class="type">GObject</span>, to connect the signal on.</td>
+<td class="parameter_name"><p>object</p></td>
+<td class="parameter_description"><p>A <span class="type">GObject</span>, to connect the signal on.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>signal</code></em> :</span></p></td>
-<td>A signal specification.</td>
+<td class="parameter_name"><p>signal</p></td>
+<td class="parameter_description"><p>A signal specification.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>script</code></em> :</span></p></td>
-<td>The script to connect to the signal. Should return a function.</td>
+<td class="parameter_name"><p>script</p></td>
+<td class="parameter_description"><p>The script to connect to the signal. Should return a function.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="seed-signal-connect-value"></a><h3>seed_signal_connect_value ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                seed_signal_connect_value           (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
-                                                         <em class="parameter"><code><span class="type">GObject</span> *object</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *signal</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> function</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> user_data</code></em>);</pre>
+<a name="seed-signal-connect-value"></a><h3>seed_signal_connect_value ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+seed_signal_connect_value (<em class="parameter"><code><a class="link" href="seed-Contexts.html#SeedContext" title="SeedContext"><span class="type">SeedContext</span></a> ctx</code></em>,
+                           <em class="parameter"><code><span class="type">GObject</span> *object</code></em>,
+                           <em class="parameter"><code>const <span class="type">gchar</span> *signal</code></em>,
+                           <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> function</code></em>,
+                           <em class="parameter"><code><a class="link" href="seed-Native-Type-Conversion.html#SeedValue" title="SeedValue"><span class="type">SeedValue</span></a> user_data</code></em>);</pre>
 <p>
 </p>
 </div>
 </div>
+<div class="refsect1">
+<a name="seed-Signals.other_details"></a><h2>Types and Values</h2>
+</div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-building.html b/doc/reference/html/seed-building.html
index 111d84f..7910fc8 100644
--- a/doc/reference/html/seed-building.html
+++ b/doc/reference/html/seed-building.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Compiling Seed</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Compiling Seed: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="seed.html" title="Part I. Seed Overview">
 <link rel="prev" href="seed-introduction.html" title="Introduction">
 <link rel="next" href="seed-contact.html" title="Contact Information">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed-introduction.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="seed.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-contact.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="seed.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-introduction.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-contact.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="seed-building"></a><div class="titlepage"></div>
@@ -28,7 +28,7 @@
 How to compile Seed itself
 </p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
 <a name="building"></a><h2>Building the Library on UNIX</h2>
@@ -65,7 +65,7 @@ How to compile Seed itself
         Before you can compile Seed, you need to have
         various external libraries installed on your system.
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>
 	  The <a class="ulink" href="http://live.gnome.org/GObjectIntrospection" target="_top">gobject-introspection library</a> is necessary to build Seed. It provides the bridge between Seed and many GObject-based libraries.
 	  </p></li>
@@ -88,7 +88,7 @@ How to compile Seed itself
 <p>
         Seed ships with a number of native modules which provide access to libraries which help with development but are not able to be introspected. Some of these modules depend on external libraries, and Seed's configuration will fail if they are not installed; if you wish to build Seed without a module for which you do not have the underlying library installed, check the Extra Configuration Options section of this document.
       </p>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>
       <a class="ulink" href="http://cairographics.org/" target="_top">Cairo</a> provides access to fast 2D graphics and numerous different types of output, including drawing to the screen, to an image, to a PDF, etc.
       </p></li>
@@ -211,7 +211,6 @@ How to compile Seed itself
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-contact.html b/doc/reference/html/seed-contact.html
index 3853bf7..24d5e07 100644
--- a/doc/reference/html/seed-contact.html
+++ b/doc/reference/html/seed-contact.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Contact Information</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Contact Information: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="seed.html" title="Part I. Seed Overview">
 <link rel="prev" href="seed-building.html" title="Compiling Seed">
 <link rel="next" href="js.html" title="Part II. Seed JavaScript Reference">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed-building.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="seed.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="js.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="seed.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-building.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="js.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="seed-contact"></a><div class="titlepage"></div>
@@ -28,11 +28,11 @@
 Where to find help, ask questions, or bring patches
 </p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
 <a name="build"></a><h2>Authors</h2>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">Robert Carr &lt;<a class="ulink" href="mailto:racarr@svn.gnome.org" target="_top">racarr@svn.gnome.org</a>&gt;</li>
 <li class="listitem">Tim Horton &lt;<a class="ulink" href="mailto:hortont@svn.gnome.org" target="_top">hortont@svn.gnome.org</a>&gt;</li>
 </ul></div>
@@ -48,7 +48,6 @@ Where to find help, ask questions, or bring patches
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-importer.html b/doc/reference/html/seed-importer.html
index b18dd5d..7bfa843 100644
--- a/doc/reference/html/seed-importer.html
+++ b/doc/reference/html/seed-importer.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Importer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Importer: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="js.html" title="Part II. Seed JavaScript Reference">
 <link rel="prev" href="js.html" title="Part II. Seed JavaScript Reference">
 <link rel="next" href="api.html" title="Part III. Seed API Reference">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="js.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="js.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="api.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="js.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="js.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="api.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="seed-importer"></a><div class="titlepage"></div>
@@ -28,12 +28,12 @@
 Importing gobject-introspection namespaces, native modules, and JavaScript modules
 </p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
 <a name="git"></a><h2>Overview</h2>
 <p>The Seed importer provides a way for applications written in JavaScript to reference functions outside of the current file. This is the heart of Seed's ability to work with other parts of the GNOME stack, as well as a way to write reasonably structured and sensible complex applications from JavaScript. The importer allows access to four types of external objects:</p>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">GObject-Introspection namespaces, which provide access to functiosn and data which were scanned using gobject-introspection from other C libraries; this is how one accesses most of the libraries of the GNOME stack from JavaScript</li>
 <li class="listitem">Native modules, which provide a way to load arbitrary shared libraries tailored explicitly to the Seed API, which often offer much higher performance for critical code, or provide an easy way to bind code (by hand) which the introspection scanner cannot parse.</li>
 <li class="listitem">JavaScript modules, which provide a way to access (in a namespaced manner) the global object of another script, offering a simple way to modularize code written against Seed.</li>
@@ -42,10 +42,10 @@ Importing gobject-introspection namespaces, native modules, and JavaScript modul
 <p>The global 'imports' object represents the runtime-side portion of the importer; all of your interactions with the importer will take place through this object.</p>
 </div>
 <div class="refsect1">
-<a name="idp4561216"></a><h2>The Imports Search Path</h2>
+<a name="id-1.3.3.4"></a><h2>The Imports Search Path</h2>
 <p>The path which the importer searches for native modules and JavaScript modules is defined by the searchPath property on the 'imports' global. This should be a JavaScript array of strings representing the order and locations to search for these modules; the default set of paths includes various Seed system directories, the directory in which the currently running script is located, and the current directory, in that order. You can change the path at any time; if an invalid value is assigned, the importer will throw an exception the next time something is imported, <span class="emphasis"><em>not</em></span> when the property is set.</p>
 <div class="example">
-<a name="idm40224"></a><p class="title"><b>Example 1. Adding a directory to the search path</b></p>
+<a name="id-1.3.3.4.3"></a><p class="title"><b>Example 1. Adding a directory to the search path</b></p>
 <div class="example-contents"><pre class="programlisting">
 imports.searchPath.unshift("/usr/local/share/random-seed-program-scripts/");
 </pre></div>
@@ -53,11 +53,11 @@ imports.searchPath.unshift("/usr/local/share/random-seed-program-scripts/");
 <br class="example-break">
 </div>
 <div class="refsect1">
-<a name="idm38736"></a><h2>Importing GObject-Introspection namespaces</h2>
+<a name="id-1.3.3.5"></a><h2>Importing GObject-Introspection namespaces</h2>
 <p>GObject-Introspection provides the metadata required in order to call functions, connect to signals, and interact with properties within any library which has been scanned. The hows and whys of introspection are outside of the scope of this article, but how to utilize this data is central to the very tenents of Seed (the minimal platform possible to interact with GObject-based libraries from a pleasant language).</p>
 <p>Namespaces are loaded as requested, and are loaded only once throughout the lifetime of a Seed program (subsequent requests for the same namespace will return the same object provided previously). The special property 'gi' on the imports global represents the interface for loading these namespaces. A request to import Gtk might look like the following:</p>
 <div class="example">
-<a name="idm36400"></a><p class="title"><b>Example 2. Using 'imports.gi' to import the Gtk namespace</b></p>
+<a name="id-1.3.3.5.4"></a><p class="title"><b>Example 2. Using 'imports.gi' to import the Gtk namespace</b></p>
 <div class="example-contents"><pre class="programlisting">
 Gtk = imports.gi.Gtk;
 </pre></div>
@@ -65,7 +65,7 @@ Gtk = imports.gi.Gtk;
 <br class="example-break"><p>This will import the Gtk namespace from GObject-Introspection, and assign it to the global "Gtk" object. Afterwards, Gtk-related functions can be accessed as properties of said object. Imports will <span class="emphasis"><em>never</em></span> add values to the global object or affect anything outside of their namespace.</p>
 <p>By default, 'imports.gi.NameSpace' will return the most recent installed version of the imported namespace; in order to request a different version, or to mark your program as requiring a particular version, the "imports.gi.versions.NameSpace" property can be set. Keep in mind that versioning for GObject-Introspection namespaces is slightly different from the actual library version numbers; for example, the version for Gtk is still "2.0", even though we're many versions past that. The import will raise an exception if the requested version could not be loaded:</p>
 <div class="example">
-<a name="idm33056"></a><p class="title"><b>Example 3. Using 'imports.gi.versions' to require Clutter 0.8</b></p>
+<a name="id-1.3.3.5.7"></a><p class="title"><b>Example 3. Using 'imports.gi.versions' to require Clutter 0.8</b></p>
 <div class="example-contents"><pre class="programlisting">
 imports.gi.versions.Clutter = "0.8";
 
@@ -82,11 +82,11 @@ catch(e)
 <br class="example-break">
 </div>
 <div class="refsect1">
-<a name="idm31456"></a><h2>Importing Native Modules</h2>
+<a name="id-1.3.3.6"></a><h2>Importing Native Modules</h2>
 <p>Seed ships with a number of (link!) native modules, which provide access to various parts of the system which GObject-Introspection cannot provide proper metadata for. An application developer could also decide to write performance-critical parts of their code as a native Seed module, as well, as one of the numerous ways to interface C with Seed.</p>
 <p>Native modules are loaded just like GObject-Introspection namespaces, except as toplevel objects on "imports", instead of "imports.gi". For example, to load the readline module that ships with Seed, one could:</p>
 <div class="example">
-<a name="idm29280"></a><p class="title"><b>Example 4. Loading the native module "readline"</b></p>
+<a name="id-1.3.3.6.4"></a><p class="title"><b>Example 4. Loading the native module "readline"</b></p>
 <div class="example-contents"><pre class="programlisting">
 readline = imports.readline;
 </pre></div>
@@ -95,7 +95,6 @@ readline = imports.readline;
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed-introduction.html b/doc/reference/html/seed-introduction.html
index 688557d..e43c5e9 100644
--- a/doc/reference/html/seed-introduction.html
+++ b/doc/reference/html/seed-introduction.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Introduction</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Introduction: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="seed.html" title="Part I. Seed Overview">
 <link rel="prev" href="seed.html" title="Part I. Seed Overview">
 <link rel="next" href="seed-building.html" title="Compiling Seed">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="seed.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-building.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="seed.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-building.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="seed-introduction"></a><div class="titlepage"></div>
@@ -28,14 +28,13 @@
 What Seed is all about
 </p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <p>
 Seed is a library and interpreter, dynamically bridging (through gobject-introspection) the WebKit JavaScriptCore engine with the GObject type system. In a more concrete sense, Seed enables you to immediately write applications around a significant portion of the GNOME platform, and easily embed JavaScript as a scripting language in your GObject library. Seed is built around the idea of "minimal-platform", in that it seems a theoretically ideal GNOME development language provides no platform of its own, but instead seamlessly integrates with the already quite large GNOME platform.
 </p>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/seed.devhelp2 b/doc/reference/html/seed.devhelp2
index 29c0532..da12248 100644
--- a/doc/reference/html/seed.devhelp2
+++ b/doc/reference/html/seed.devhelp2
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="Seed Reference Manual" link="index.html" author="" name="seed" version="2" language="c">
+<book xmlns="http://www.devhelp.net/book" title="Seed Reference Manual" link="index.html" author="" name="seed" version="2" language="c" online="http://library.gnome.org/devel/seed/unstable/">
   <chapters>
     <sub name="Seed Overview" link="seed.html">
       <sub name="Introduction" link="seed-introduction.html"/>
@@ -35,147 +34,145 @@
     <sub name="Index" link="ix01.html"/>
   </chapters>
   <functions>
+    <keyword type="function" name="seed_init ()" link="seed-Initialization.html#seed-init"/>
+    <keyword type="function" name="seed_init_with_context_group ()" link="seed-Initialization.html#seed-init-with-context-group"/>
+    <keyword type="function" name="seed_engine_set_search_path ()" link="seed-Initialization.html#seed-engine-set-search-path"/>
+    <keyword type="function" name="seed_engine_get_search_path ()" link="seed-Initialization.html#seed-engine-get-search-path"/>
     <keyword type="struct" name="struct SeedEngine" link="seed-Initialization.html#SeedEngine"/>
-    <keyword type="function" name="seed_init ()" link="seed-Initialization.html#seed-init"/>
-    <keyword type="function" name="seed_init_with_context_group ()" link="seed-Initialization.html#seed-init-with-context-group"/>
-    <keyword type="function" name="seed_engine_set_search_path ()" link="seed-Initialization.html#seed-engine-set-search-path"/>
-    <keyword type="function" name="seed_engine_get_search_path ()" link="seed-Initialization.html#seed-engine-get-search-path"/>
+    <keyword type="function" name="seed_context_create ()" link="seed-Contexts.html#seed-context-create"/>
+    <keyword type="function" name="seed_context_ref ()" link="seed-Contexts.html#seed-context-ref"/>
+    <keyword type="function" name="seed_context_unref ()" link="seed-Contexts.html#seed-context-unref"/>
+    <keyword type="function" name="seed_context_collect ()" link="seed-Contexts.html#seed-context-collect"/>
+    <keyword type="function" name="seed_context_get_global_object ()" link="seed-Contexts.html#seed-context-get-global-object"/>
+    <keyword type="function" name="seed_prepare_global_context ()" link="seed-Contexts.html#seed-prepare-global-context"/>
+    <keyword type="function" name="seed_importer_add_global ()" link="seed-Contexts.html#seed-importer-add-global"/>
+    <keyword type="function" name="seed_importer_set_search_path ()" link="seed-Contexts.html#seed-importer-set-search-path"/>
     <keyword type="typedef" name="SeedContext" link="seed-Contexts.html#SeedContext"/>
     <keyword type="typedef" name="SeedGlobalContext" link="seed-Contexts.html#SeedGlobalContext"/>
     <keyword type="typedef" name="SeedContextGroup" link="seed-Contexts.html#SeedContextGroup"/>
-    <keyword type="function" name="seed_context_create ()" link="seed-Contexts.html#seed-context-create"/>
-    <keyword type="function" name="seed_context_ref ()" link="seed-Contexts.html#seed-context-ref"/>
-    <keyword type="function" name="seed_context_unref ()" link="seed-Contexts.html#seed-context-unref"/>
-    <keyword type="function" name="seed_context_collect ()" link="seed-Contexts.html#seed-context-collect"/>
-    <keyword type="function" name="seed_context_get_global_object ()" link="seed-Contexts.html#seed-context-get-global-object"/>
-    <keyword type="function" name="seed_prepare_global_context ()" link="seed-Contexts.html#seed-prepare-global-context"/>
-    <keyword type="function" name="seed_importer_add_global ()" link="seed-Contexts.html#seed-importer-add-global"/>
-    <keyword type="function" name="seed_importer_set_search_path ()" link="seed-Contexts.html#seed-importer-set-search-path"/>
+    <keyword type="function" name="seed_make_script ()" link="seed-Evaluation.html#seed-make-script"/>
+    <keyword type="function" name="seed_evaluate ()" link="seed-Evaluation.html#seed-evaluate"/>
+    <keyword type="function" name="seed_simple_evaluate ()" link="seed-Evaluation.html#seed-simple-evaluate"/>
+    <keyword type="function" name="seed_script_new_from_file ()" link="seed-Evaluation.html#seed-script-new-from-file"/>
+    <keyword type="function" name="seed_script_exception ()" link="seed-Evaluation.html#seed-script-exception"/>
+    <keyword type="function" name="seed_script_destroy ()" link="seed-Evaluation.html#seed-script-destroy"/>
     <keyword type="struct" name="SeedScript" link="seed-Evaluation.html#SeedScript"/>
-    <keyword type="function" name="seed_make_script ()" link="seed-Evaluation.html#seed-make-script"/>
-    <keyword type="function" name="seed_evaluate ()" link="seed-Evaluation.html#seed-evaluate"/>
-    <keyword type="function" name="seed_simple_evaluate ()" link="seed-Evaluation.html#seed-simple-evaluate"/>
-    <keyword type="function" name="seed_script_new_from_file ()" link="seed-Evaluation.html#seed-script-new-from-file"/>
-    <keyword type="function" name="seed_script_exception ()" link="seed-Evaluation.html#seed-script-exception"/>
-    <keyword type="function" name="seed_script_destroy ()" link="seed-Evaluation.html#seed-script-destroy"/>
+    <keyword type="function" name="seed_make_exception ()" link="seed-Exceptions.html#seed-make-exception"/>
+    <keyword type="function" name="seed_exception_get_name ()" link="seed-Exceptions.html#seed-exception-get-name"/>
+    <keyword type="function" name="seed_exception_get_message ()" link="seed-Exceptions.html#seed-exception-get-message"/>
+    <keyword type="function" name="seed_exception_get_line ()" link="seed-Exceptions.html#seed-exception-get-line"/>
+    <keyword type="function" name="seed_exception_get_file ()" link="seed-Exceptions.html#seed-exception-get-file"/>
+    <keyword type="function" name="seed_exception_to_string ()" link="seed-Exceptions.html#seed-exception-to-string"/>
     <keyword type="typedef" name="SeedException" link="seed-Exceptions.html#SeedException"/>
-    <keyword type="function" name="seed_make_exception ()" link="seed-Exceptions.html#seed-make-exception"/>
-    <keyword type="function" name="seed_exception_get_name ()" link="seed-Exceptions.html#seed-exception-get-name"/>
-    <keyword type="function" name="seed_exception_get_message ()" link="seed-Exceptions.html#seed-exception-get-message"/>
-    <keyword type="function" name="seed_exception_get_line ()" link="seed-Exceptions.html#seed-exception-get-line"/>
-    <keyword type="function" name="seed_exception_get_file ()" link="seed-Exceptions.html#seed-exception-get-file"/>
-    <keyword type="function" name="seed_exception_to_string ()" link="seed-Exceptions.html#seed-exception-to-string"/>
-    <keyword type="function" name="seed_signal_connect ()" link="seed-Signals.html#seed-signal-connect"/>
-    <keyword type="function" name="seed_signal_connect_value ()" link="seed-Signals.html#seed-signal-connect-value"/>
+    <keyword type="function" name="seed_signal_connect ()" link="seed-Signals.html#seed-signal-connect"/>
+    <keyword type="function" name="seed_signal_connect_value ()" link="seed-Signals.html#seed-signal-connect-value"/>
+    <keyword type="function" name="seed_make_undefined ()" link="seed-Native-Type-Conversion.html#seed-make-undefined"/>
+    <keyword type="function" name="seed_make_null ()" link="seed-Native-Type-Conversion.html#seed-make-null"/>
+    <keyword type="function" name="seed_value_to_boolean ()" link="seed-Native-Type-Conversion.html#seed-value-to-boolean"/>
+    <keyword type="function" name="seed_value_from_boolean ()" link="seed-Native-Type-Conversion.html#seed-value-from-boolean"/>
+    <keyword type="function" name="seed_value_to_uint ()" link="seed-Native-Type-Conversion.html#seed-value-to-uint"/>
+    <keyword type="function" name="seed_value_from_uint ()" link="seed-Native-Type-Conversion.html#seed-value-from-uint"/>
+    <keyword type="function" name="seed_value_to_int ()" link="seed-Native-Type-Conversion.html#seed-value-to-int"/>
+    <keyword type="function" name="seed_value_from_int ()" link="seed-Native-Type-Conversion.html#seed-value-from-int"/>
+    <keyword type="function" name="seed_value_to_char ()" link="seed-Native-Type-Conversion.html#seed-value-to-char"/>
+    <keyword type="function" name="seed_value_from_char ()" link="seed-Native-Type-Conversion.html#seed-value-from-char"/>
+    <keyword type="function" name="seed_value_to_uchar ()" link="seed-Native-Type-Conversion.html#seed-value-to-uchar"/>
+    <keyword type="function" name="seed_value_from_uchar ()" link="seed-Native-Type-Conversion.html#seed-value-from-uchar"/>
+    <keyword type="function" name="seed_value_to_long ()" link="seed-Native-Type-Conversion.html#seed-value-to-long"/>
+    <keyword type="function" name="seed_value_from_long ()" link="seed-Native-Type-Conversion.html#seed-value-from-long"/>
+    <keyword type="function" name="seed_value_to_ulong ()" link="seed-Native-Type-Conversion.html#seed-value-to-ulong"/>
+    <keyword type="function" name="seed_value_from_ulong ()" link="seed-Native-Type-Conversion.html#seed-value-from-ulong"/>
+    <keyword type="function" name="seed_value_to_int64 ()" link="seed-Native-Type-Conversion.html#seed-value-to-int64"/>
+    <keyword type="function" name="seed_value_from_int64 ()" link="seed-Native-Type-Conversion.html#seed-value-from-int64"/>
+    <keyword type="function" name="seed_value_to_uint64 ()" link="seed-Native-Type-Conversion.html#seed-value-to-uint64"/>
+    <keyword type="function" name="seed_value_from_uint64 ()" link="seed-Native-Type-Conversion.html#seed-value-from-uint64"/>
+    <keyword type="function" name="seed_value_to_float ()" link="seed-Native-Type-Conversion.html#seed-value-to-float"/>
+    <keyword type="function" name="seed_value_from_float ()" link="seed-Native-Type-Conversion.html#seed-value-from-float"/>
+    <keyword type="function" name="seed_value_to_double ()" link="seed-Native-Type-Conversion.html#seed-value-to-double"/>
+    <keyword type="function" name="seed_value_from_double ()" link="seed-Native-Type-Conversion.html#seed-value-from-double"/>
+    <keyword type="function" name="seed_value_to_string ()" link="seed-Native-Type-Conversion.html#seed-value-to-string"/>
+    <keyword type="function" name="seed_value_from_string ()" link="seed-Native-Type-Conversion.html#seed-value-from-string"/>
+    <keyword type="function" name="seed_value_from_binary_string ()" link="seed-Native-Type-Conversion.html#seed-value-from-binary-string"/>
+    <keyword type="function" name="seed_value_to_object ()" link="seed-Native-Type-Conversion.html#seed-value-to-object"/>
+    <keyword type="function" name="seed_value_from_object ()" link="seed-Native-Type-Conversion.html#seed-value-from-object"/>
+    <keyword type="function" name="seed_value_to_filename ()" link="seed-Native-Type-Conversion.html#seed-value-to-filename"/>
+    <keyword type="function" name="seed_value_from_filename ()" link="seed-Native-Type-Conversion.html#seed-value-from-filename"/>
+    <keyword type="function" name="seed_value_to_format ()" link="seed-Native-Type-Conversion.html#seed-value-to-format"/>
+    <keyword type="function" name="seed_pointer_get_pointer ()" link="seed-Native-Type-Conversion.html#seed-pointer-get-pointer"/>
+    <keyword type="function" name="seed_make_pointer ()" link="seed-Native-Type-Conversion.html#seed-make-pointer"/>
+    <keyword type="function" name="seed_string_ref ()" link="seed-Native-Type-Conversion.html#seed-string-ref"/>
+    <keyword type="function" name="seed_string_unref ()" link="seed-Native-Type-Conversion.html#seed-string-unref"/>
+    <keyword type="function" name="seed_string_get_maximum_size ()" link="seed-Native-Type-Conversion.html#seed-string-get-maximum-size"/>
+    <keyword type="function" name="seed_string_to_utf8_buffer ()" link="seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer"/>
+    <keyword type="function" name="seed_string_is_equal ()" link="seed-Native-Type-Conversion.html#seed-string-is-equal"/>
+    <keyword type="function" name="seed_string_is_equal_utf8 ()" link="seed-Native-Type-Conversion.html#seed-string-is-equal-utf8"/>
     <keyword type="typedef" name="SeedValue" link="seed-Native-Type-Conversion.html#SeedValue"/>
     <keyword type="enum" name="enum SeedType" link="seed-Native-Type-Conversion.html#SeedType"/>
-    <keyword type="function" name="seed_make_undefined ()" link="seed-Native-Type-Conversion.html#seed-make-undefined"/>
-    <keyword type="function" name="seed_make_null ()" link="seed-Native-Type-Conversion.html#seed-make-null"/>
-    <keyword type="function" name="seed_value_to_boolean ()" link="seed-Native-Type-Conversion.html#seed-value-to-boolean"/>
-    <keyword type="function" name="seed_value_from_boolean ()" link="seed-Native-Type-Conversion.html#seed-value-from-boolean"/>
-    <keyword type="function" name="seed_value_to_uint ()" link="seed-Native-Type-Conversion.html#seed-value-to-uint"/>
-    <keyword type="function" name="seed_value_from_uint ()" link="seed-Native-Type-Conversion.html#seed-value-from-uint"/>
-    <keyword type="function" name="seed_value_to_int ()" link="seed-Native-Type-Conversion.html#seed-value-to-int"/>
-    <keyword type="function" name="seed_value_from_int ()" link="seed-Native-Type-Conversion.html#seed-value-from-int"/>
-    <keyword type="function" name="seed_value_to_char ()" link="seed-Native-Type-Conversion.html#seed-value-to-char"/>
-    <keyword type="function" name="seed_value_from_char ()" link="seed-Native-Type-Conversion.html#seed-value-from-char"/>
-    <keyword type="function" name="seed_value_to_uchar ()" link="seed-Native-Type-Conversion.html#seed-value-to-uchar"/>
-    <keyword type="function" name="seed_value_from_uchar ()" link="seed-Native-Type-Conversion.html#seed-value-from-uchar"/>
-    <keyword type="function" name="seed_value_to_long ()" link="seed-Native-Type-Conversion.html#seed-value-to-long"/>
-    <keyword type="function" name="seed_value_from_long ()" link="seed-Native-Type-Conversion.html#seed-value-from-long"/>
-    <keyword type="function" name="seed_value_to_ulong ()" link="seed-Native-Type-Conversion.html#seed-value-to-ulong"/>
-    <keyword type="function" name="seed_value_from_ulong ()" link="seed-Native-Type-Conversion.html#seed-value-from-ulong"/>
-    <keyword type="function" name="seed_value_to_int64 ()" link="seed-Native-Type-Conversion.html#seed-value-to-int64"/>
-    <keyword type="function" name="seed_value_from_int64 ()" link="seed-Native-Type-Conversion.html#seed-value-from-int64"/>
-    <keyword type="function" name="seed_value_to_uint64 ()" link="seed-Native-Type-Conversion.html#seed-value-to-uint64"/>
-    <keyword type="function" name="seed_value_from_uint64 ()" link="seed-Native-Type-Conversion.html#seed-value-from-uint64"/>
-    <keyword type="function" name="seed_value_to_float ()" link="seed-Native-Type-Conversion.html#seed-value-to-float"/>
-    <keyword type="function" name="seed_value_from_float ()" link="seed-Native-Type-Conversion.html#seed-value-from-float"/>
-    <keyword type="function" name="seed_value_to_double ()" link="seed-Native-Type-Conversion.html#seed-value-to-double"/>
-    <keyword type="function" name="seed_value_from_double ()" link="seed-Native-Type-Conversion.html#seed-value-from-double"/>
-    <keyword type="function" name="seed_value_to_string ()" link="seed-Native-Type-Conversion.html#seed-value-to-string"/>
-    <keyword type="function" name="seed_value_from_string ()" link="seed-Native-Type-Conversion.html#seed-value-from-string"/>
-    <keyword type="function" name="seed_value_from_binary_string ()" link="seed-Native-Type-Conversion.html#seed-value-from-binary-string"/>
-    <keyword type="function" name="seed_value_to_object ()" link="seed-Native-Type-Conversion.html#seed-value-to-object"/>
-    <keyword type="function" name="seed_value_from_object ()" link="seed-Native-Type-Conversion.html#seed-value-from-object"/>
-    <keyword type="function" name="seed_value_to_filename ()" link="seed-Native-Type-Conversion.html#seed-value-to-filename"/>
-    <keyword type="function" name="seed_value_from_filename ()" link="seed-Native-Type-Conversion.html#seed-value-from-filename"/>
-    <keyword type="function" name="seed_value_to_format ()" link="seed-Native-Type-Conversion.html#seed-value-to-format"/>
-    <keyword type="function" name="seed_pointer_get_pointer ()" link="seed-Native-Type-Conversion.html#seed-pointer-get-pointer"/>
-    <keyword type="function" name="seed_make_pointer ()" link="seed-Native-Type-Conversion.html#seed-make-pointer"/>
     <keyword type="typedef" name="SeedString" link="seed-Native-Type-Conversion.html#SeedString"/>
-    <keyword type="function" name="seed_string_ref ()" link="seed-Native-Type-Conversion.html#seed-string-ref"/>
-    <keyword type="function" name="seed_string_unref ()" link="seed-Native-Type-Conversion.html#seed-string-unref"/>
-    <keyword type="function" name="seed_string_get_maximum_size ()" link="seed-Native-Type-Conversion.html#seed-string-get-maximum-size"/>
-    <keyword type="function" name="seed_string_to_utf8_buffer ()" link="seed-Native-Type-Conversion.html#seed-string-to-utf8-buffer"/>
-    <keyword type="function" name="seed_string_is_equal ()" link="seed-Native-Type-Conversion.html#seed-string-is-equal"/>
-    <keyword type="function" name="seed_string_is_equal_utf8 ()" link="seed-Native-Type-Conversion.html#seed-string-is-equal-utf8"/>
-    <keyword type="function" name="seed_value_unprotect ()" link="seed-Operating-on-Native-Types.html#seed-value-unprotect"/>
-    <keyword type="function" name="seed_value_protect ()" link="seed-Operating-on-Native-Types.html#seed-value-protect"/>
-    <keyword type="function" name="seed_value_is_undefined ()" link="seed-Operating-on-Native-Types.html#seed-value-is-undefined"/>
-    <keyword type="function" name="seed_value_is_null ()" link="seed-Operating-on-Native-Types.html#seed-value-is-null"/>
-    <keyword type="function" name="seed_value_is_function ()" link="seed-Operating-on-Native-Types.html#seed-value-is-function"/>
-    <keyword type="function" name="seed_value_is_number ()" link="seed-Operating-on-Native-Types.html#seed-value-is-number"/>
-    <keyword type="function" name="seed_value_is_string ()" link="seed-Operating-on-Native-Types.html#seed-value-is-string"/>
-    <keyword type="function" name="seed_value_is_object_of_class ()" link="seed-Operating-on-Native-Types.html#seed-value-is-object-of-class"/>
-    <keyword type="function" name="seed_value_is_object ()" link="seed-Operating-on-Native-Types.html#seed-value-is-object"/>
-    <keyword type="function" name="seed_value_get_type ()" link="seed-Operating-on-Native-Types.html#seed-value-get-type"/>
+    <keyword type="function" name="seed_value_unprotect ()" link="seed-Operating-on-Native-Types.html#seed-value-unprotect"/>
+    <keyword type="function" name="seed_value_protect ()" link="seed-Operating-on-Native-Types.html#seed-value-protect"/>
+    <keyword type="function" name="seed_value_is_undefined ()" link="seed-Operating-on-Native-Types.html#seed-value-is-undefined"/>
+    <keyword type="function" name="seed_value_is_null ()" link="seed-Operating-on-Native-Types.html#seed-value-is-null"/>
+    <keyword type="function" name="seed_value_is_function ()" link="seed-Operating-on-Native-Types.html#seed-value-is-function"/>
+    <keyword type="function" name="seed_value_is_number ()" link="seed-Operating-on-Native-Types.html#seed-value-is-number"/>
+    <keyword type="function" name="seed_value_is_string ()" link="seed-Operating-on-Native-Types.html#seed-value-is-string"/>
+    <keyword type="function" name="seed_value_is_object_of_class ()" link="seed-Operating-on-Native-Types.html#seed-value-is-object-of-class"/>
+    <keyword type="function" name="seed_value_is_object ()" link="seed-Operating-on-Native-Types.html#seed-value-is-object"/>
+    <keyword type="function" name="seed_value_get_type ()" link="seed-Operating-on-Native-Types.html#seed-value-get-type"/>
+    <keyword type="function" name="seed_make_object ()" link="seed-JS-Objects.html#seed-make-object"/>
+    <keyword type="function" name="seed_make_array ()" link="seed-JS-Objects.html#seed-make-array"/>
+    <keyword type="function" name="seed_object_call ()" link="seed-JS-Objects.html#seed-object-call"/>
+    <keyword type="function" name="seed_object_set_property_at_index ()" link="seed-JS-Objects.html#seed-object-set-property-at-index"/>
+    <keyword type="function" name="seed_object_get_property_at_index ()" link="seed-JS-Objects.html#seed-object-get-property-at-index"/>
+    <keyword type="function" name="seed_object_is_of_class ()" link="seed-JS-Objects.html#seed-object-is-of-class"/>
+    <keyword type="function" name="seed_object_get_private ()" link="seed-JS-Objects.html#seed-object-get-private"/>
+    <keyword type="function" name="seed_object_set_private ()" link="seed-JS-Objects.html#seed-object-set-private"/>
+    <keyword type="function" name="seed_object_get_property ()" link="seed-JS-Objects.html#seed-object-get-property"/>
+    <keyword type="function" name="seed_object_set_property ()" link="seed-JS-Objects.html#seed-object-set-property"/>
+    <keyword type="function" name="seed_object_get_prototype ()" link="seed-JS-Objects.html#seed-object-get-prototype"/>
+    <keyword type="function" name="seed_object_copy_property_names ()" link="seed-JS-Objects.html#seed-object-copy-property-names"/>
+    <keyword type="function" name="SeedObjectInitializeCallback ()" link="seed-JS-Objects.html#SeedObjectInitializeCallback"/>
+    <keyword type="function" name="SeedObjectFinalizeCallback ()" link="seed-JS-Objects.html#SeedObjectFinalizeCallback"/>
+    <keyword type="function" name="SeedObjectHasPropertyCallback ()" link="seed-JS-Objects.html#SeedObjectHasPropertyCallback"/>
+    <keyword type="function" name="SeedObjectGetPropertyCallback ()" link="seed-JS-Objects.html#SeedObjectGetPropertyCallback"/>
+    <keyword type="function" name="SeedObjectSetPropertyCallback ()" link="seed-JS-Objects.html#SeedObjectSetPropertyCallback"/>
+    <keyword type="function" name="SeedObjectDeletePropertyCallback ()" link="seed-JS-Objects.html#SeedObjectDeletePropertyCallback"/>
+    <keyword type="function" name="SeedObjectGetPropertyNamesCallback ()" link="seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback"/>
+    <keyword type="function" name="SeedObjectCallAsFunctionCallback ()" link="seed-JS-Objects.html#SeedObjectCallAsFunctionCallback"/>
+    <keyword type="function" name="SeedObjectHasInstanceCallback ()" link="seed-JS-Objects.html#SeedObjectHasInstanceCallback"/>
+    <keyword type="function" name="SeedObjectConvertToTypeCallback ()" link="seed-JS-Objects.html#SeedObjectConvertToTypeCallback"/>
+    <keyword type="function" name="SeedObjectCallAsConstructorCallback ()" link="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback"/>
     <keyword type="typedef" name="SeedObject" link="seed-JS-Objects.html#SeedObject"/>
-    <keyword type="function" name="seed_make_object ()" link="seed-JS-Objects.html#seed-make-object"/>
-    <keyword type="function" name="seed_make_array ()" link="seed-JS-Objects.html#seed-make-array"/>
-    <keyword type="function" name="seed_object_call ()" link="seed-JS-Objects.html#seed-object-call"/>
-    <keyword type="function" name="seed_object_set_property_at_index ()" link="seed-JS-Objects.html#seed-object-set-property-at-index"/>
-    <keyword type="function" name="seed_object_get_property_at_index ()" link="seed-JS-Objects.html#seed-object-get-property-at-index"/>
-    <keyword type="function" name="seed_object_is_of_class ()" link="seed-JS-Objects.html#seed-object-is-of-class"/>
-    <keyword type="function" name="seed_object_get_private ()" link="seed-JS-Objects.html#seed-object-get-private"/>
-    <keyword type="function" name="seed_object_set_private ()" link="seed-JS-Objects.html#seed-object-set-private"/>
-    <keyword type="function" name="seed_object_get_property ()" link="seed-JS-Objects.html#seed-object-get-property"/>
-    <keyword type="function" name="seed_object_set_property ()" link="seed-JS-Objects.html#seed-object-set-property"/>
-    <keyword type="function" name="seed_object_get_prototype ()" link="seed-JS-Objects.html#seed-object-get-prototype"/>
-    <keyword type="function" name="seed_object_copy_property_names ()" link="seed-JS-Objects.html#seed-object-copy-property-names"/>
-    <keyword type="function" name="SeedObjectInitializeCallback ()" link="seed-JS-Objects.html#SeedObjectInitializeCallback"/>
-    <keyword type="function" name="SeedObjectFinalizeCallback ()" link="seed-JS-Objects.html#SeedObjectFinalizeCallback"/>
-    <keyword type="function" name="SeedObjectHasPropertyCallback ()" link="seed-JS-Objects.html#SeedObjectHasPropertyCallback"/>
-    <keyword type="function" name="SeedObjectGetPropertyCallback ()" link="seed-JS-Objects.html#SeedObjectGetPropertyCallback"/>
-    <keyword type="function" name="SeedObjectSetPropertyCallback ()" link="seed-JS-Objects.html#SeedObjectSetPropertyCallback"/>
-    <keyword type="function" name="SeedObjectDeletePropertyCallback ()" link="seed-JS-Objects.html#SeedObjectDeletePropertyCallback"/>
-    <keyword type="function" name="SeedObjectGetPropertyNamesCallback ()" link="seed-JS-Objects.html#SeedObjectGetPropertyNamesCallback"/>
-    <keyword type="function" name="SeedObjectCallAsFunctionCallback ()" link="seed-JS-Objects.html#SeedObjectCallAsFunctionCallback"/>
-    <keyword type="function" name="SeedObjectHasInstanceCallback ()" link="seed-JS-Objects.html#SeedObjectHasInstanceCallback"/>
-    <keyword type="function" name="SeedObjectConvertToTypeCallback ()" link="seed-JS-Objects.html#SeedObjectConvertToTypeCallback"/>
-    <keyword type="function" name="SeedObjectCallAsConstructorCallback ()" link="seed-JS-Objects.html#SeedObjectCallAsConstructorCallback"/>
-    <keyword type="function" name="SeedFunctionCallback ()" link="seed-Native-Functions.html#SeedFunctionCallback"/>
-    <keyword type="function" name="seed_make_function ()" link="seed-Native-Functions.html#seed-make-function"/>
-    <keyword type="function" name="seed_create_function ()" link="seed-Native-Functions.html#seed-create-function"/>
+    <keyword type="function" name="SeedFunctionCallback ()" link="seed-Native-Functions.html#SeedFunctionCallback"/>
+    <keyword type="function" name="seed_make_function ()" link="seed-Native-Functions.html#seed-make-function"/>
+    <keyword type="function" name="seed_create_function ()" link="seed-Native-Functions.html#seed-create-function"/>
+    <keyword type="function" name="seed_create_class ()" link="seed-JavaScript-Classes.html#seed-create-class"/>
+    <keyword type="function" name="seed_make_constructor ()" link="seed-JavaScript-Classes.html#seed-make-constructor"/>
     <keyword type="enum" name="enum SeedPropertyAttributes" link="seed-JavaScript-Classes.html#SeedPropertyAttributes"/>
     <keyword type="enum" name="enum SeedClassAttributes" link="seed-JavaScript-Classes.html#SeedClassAttributes"/>
     <keyword type="typedef" name="SeedClass" link="seed-JavaScript-Classes.html#SeedClass"/>
     <keyword type="macro" name="seed_empty_class" link="seed-JavaScript-Classes.html#seed-empty-class"/>
-    <keyword type="function" name="seed_create_class ()" link="seed-JavaScript-Classes.html#seed-create-class"/>
-    <keyword type="function" name="seed_make_constructor ()" link="seed-JavaScript-Classes.html#seed-make-constructor"/>
+    <keyword type="function" name="seed_closure_new ()" link="seed-SeedClosure.html#seed-closure-new"/>
+    <keyword type="function" name="seed_closure_get_callable ()" link="seed-SeedClosure.html#seed-closure-get-callable"/>
+    <keyword type="function" name="seed_closure_invoke ()" link="seed-SeedClosure.html#seed-closure-invoke"/>
+    <keyword type="function" name="seed_closure_invoke_with_context ()" link="seed-SeedClosure.html#seed-closure-invoke-with-context"/>
+    <keyword type="function" name="seed_closure_warn_exception ()" link="seed-SeedClosure.html#seed-closure-warn-exception"/>
     <keyword type="struct" name="struct SeedClosure" link="seed-SeedClosure.html#SeedClosure"/>
-    <keyword type="function" name="seed_closure_new ()" link="seed-SeedClosure.html#seed-closure-new"/>
-    <keyword type="function" name="seed_closure_get_callable ()" link="seed-SeedClosure.html#seed-closure-get-callable"/>
-    <keyword type="function" name="seed_closure_invoke ()" link="seed-SeedClosure.html#seed-closure-invoke"/>
-    <keyword type="function" name="seed_closure_invoke_with_context ()" link="seed-SeedClosure.html#seed-closure-invoke-with-context"/>
-    <keyword type="function" name="seed_closure_warn_exception ()" link="seed-SeedClosure.html#seed-closure-warn-exception"/>
     <keyword type="macro" name="CHECK_ARG_COUNT()" link="seed-Modules.html#CHECK-ARG-COUNT:CAPS"/>
     <keyword type="macro" name="DEFINE_ENUM_MEMBER()" link="seed-Modules.html#DEFINE-ENUM-MEMBER:CAPS"/>
     <keyword type="macro" name="DEFINE_ENUM_MEMBER_EXT()" link="seed-Modules.html#DEFINE-ENUM-MEMBER-EXT:CAPS"/>
-    <keyword type="function" name="SeedModuleInitCallback ()" link="seed-Modules.html#SeedModuleInitCallback"/>
-    <keyword type="function" name="readline.readline (prompt)" link="readline-module.html#readline-readline"/>
-    <keyword type="function" name="readline.bind (key, function)" link="readline-module.html#readline-bind"/>
-    <keyword type="function" name="readline.done ()" link="readline-module.html#readline-done"/>
-    <keyword type="function" name="readline.buffer()" link="readline-module.html#readline-buffer"/>
-    <keyword type="function" name="readline.insert (string)" link="readline-module.html#readline-insert"/>
-    <keyword type="function" name="new sqlite.Database(filename)" link="sqlite-module.html#sqlite-database"/>
-    <keyword type="function" name="database.exec(command, callback)" link="sqlite-module.html#sqlite-exec"/>
-    <keyword type="function" name="database.close()" link="sqlite-module.html#sqlite-close"/>
-    <keyword type="function" name="builder.connect_signals (object, user_data)" link="GtkBuilder-module.html#gtkbuilder-connect-signals"/>
-    <keyword type="function" name="new sandbox.Context()" link="Sandbox-module.html#sandbox-context"/>
-    <keyword type="function" name="context.eval(source)" link="Sandbox-module.html#sandbox-eval"/>
-    <keyword type="function" name="context.add_globals()" link="Sandbox-module.html#sandbox-addglobals"/>
-    <keyword type="function" name="context.destroy()" link="Sandbox-module.html#sandbox-destroy"/>
-    <keyword type="function" name="context.global" link="Sandbox-module.html#sandbox-global"/>
+    <keyword type="function" name="SeedModuleInitCallback ()" link="seed-Modules.html#SeedModuleInitCallback"/>
+    <keyword type="constant" name="SEED_TYPE_UNDEFINED" link="seed-Native-Type-Conversion.html#SEED-TYPE-UNDEFINED:CAPS"/>
+    <keyword type="constant" name="SEED_TYPE_NULL" link="seed-Native-Type-Conversion.html#SEED-TYPE-NULL:CAPS"/>
+    <keyword type="constant" name="SEED_TYPE_BOOLEAN" link="seed-Native-Type-Conversion.html#SEED-TYPE-BOOLEAN:CAPS"/>
+    <keyword type="constant" name="SEED_TYPE_NUMBER" link="seed-Native-Type-Conversion.html#SEED-TYPE-NUMBER:CAPS"/>
+    <keyword type="constant" name="SEED_TYPE_STRING" link="seed-Native-Type-Conversion.html#SEED-TYPE-STRING:CAPS"/>
+    <keyword type="constant" name="SEED_TYPE_OBJECT" link="seed-Native-Type-Conversion.html#SEED-TYPE-OBJECT:CAPS"/>
+    <keyword type="constant" name="SEED_PROPERTY_ATTRIBUTE_NONE" link="seed-JavaScript-Classes.html#SEED-PROPERTY-ATTRIBUTE-NONE:CAPS"/>
+    <keyword type="constant" name="SEED_PROPERTY_ATTRIBUTE_READ_ONLY" link="seed-JavaScript-Classes.html#SEED-PROPERTY-ATTRIBUTE-READ-ONLY:CAPS"/>
+    <keyword type="constant" name="SEED_PROPERTY_ATTRIBUTE_DONT_ENUM" link="seed-JavaScript-Classes.html#SEED-PROPERTY-ATTRIBUTE-DONT-ENUM:CAPS"/>
+    <keyword type="constant" name="SEED_PROPERTY_ATTRIBUTE_DONT_DELETE" link="seed-JavaScript-Classes.html#SEED-PROPERTY-ATTRIBUTE-DONT-DELETE:CAPS"/>
+    <keyword type="constant" name="SEED_CLASS_ATTRIBUTE_NONE" link="seed-JavaScript-Classes.html#SEED-CLASS-ATTRIBUTE-NONE:CAPS"/>
+    <keyword type="constant" name="SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE" link="seed-JavaScript-Classes.html#SEED-CLASS-ATTRIBUTE-NO-SHARED-PROTOTYPE:CAPS"/>
   </functions>
 </book>
diff --git a/doc/reference/html/seed.html b/doc/reference/html/seed.html
index 8ba56b2..cc9a3c5 100644
--- a/doc/reference/html/seed.html
+++ b/doc/reference/html/seed.html
@@ -2,29 +2,29 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Part I. Seed Overview</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Part I. Seed Overview: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="index.html" title="Seed Reference Manual">
 <link rel="prev" href="index.html" title="Seed Reference Manual">
 <link rel="next" href="seed-introduction.html" title="Introduction">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-introduction.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="index.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-introduction.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="seed"></a>Part I. Seed Overview</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="seed-introduction.html">Introduction</a></span><span class="refpurpose"> — 
 What Seed is all about
@@ -44,7 +44,6 @@ Where to find help, ask questions, or bring patches
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/sqlite-module.html b/doc/reference/html/sqlite-module.html
index 7aa6d31..0489791 100644
--- a/doc/reference/html/sqlite-module.html
+++ b/doc/reference/html/sqlite-module.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SQLite</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>SQLite: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="modules.html" title="Part IV. Seed Module Reference">
 <link rel="prev" href="readline-module.html" title="readline">
 <link rel="next" href="GtkBuilder-module.html" title="GtkBuilder">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="readline-module.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="modules.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="GtkBuilder-module.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="modules.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="readline-module.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="GtkBuilder-module.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div>
@@ -33,7 +33,7 @@
 </div></div>
 </div></div>
 <div class="refsect1">
-<a name="idp9619168"></a><h2>API Reference</h2>
+<a name="id-1.5.4.3"></a><h2>API Reference</h2>
 <p>
       The sqlite module allows for manipulation and querying of sqlite databases.
       </p>
@@ -51,62 +51,10 @@ sqlite.[OK, ERROR, INTERNAL, PERM ABORT, BUSY,
         SCHEMA, TOOBIG, CONSTRAINT, MISMATCH, MISUSE,
         NOLFS, AUTH, FORMAT, RANGE, NOTADB, ROW, DONE]
     </pre>
-<p>
-</p>
-<div class="refsect2">
-<a name="sqlite-database"></a><h3>new sqlite.Database(filename)</h3>
-<p>Constructs a new sqlite.Database</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span></span></p></td>
-<td>A new sqlite.Database object, the <em class="parameter"><code>status</code></em> property will be one of the SQLite status enums</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="sqlite-exec"></a><h3>database.exec(command, callback)</h3>
-<p>Executes the SQLite <em class="parameter"><code>command</code></em> on the given database. If <em class="parameter"><code>callback</code></em> is defined, it is called with each table entry from the given command, with a single argument. The argument has properties for each value in the returned table entry.</p>
-<p>Keep in mind that, just like in C, it is necessary to sanitize user input in your SQL before passing it to the database.</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>command</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em></span></p></td>
-<td>undefined</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span></span></p></td>
-<td>An SQLite status enum representing the result of the operation</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<p>
-</p>
-<hr>
-<div class="refsect2">
-<a name="sqlite-close"></a><h3>database.close()</h3>
-<p>Closes an SQLite database and syncs</p>
-</div>
-<p>
-</p>
+<span style="color: red">&lt;xi:include&gt;&lt;/xi:include&gt;</span>
 </div>
 <div class="refsect1">
-<a name="idp6699632"></a><h2>Examples</h2>
+<a name="id-1.5.4.4"></a><h2>Examples</h2>
 <p>Below are several examples of using the Seed sqlite module. For additional resources, consult the examples/ folder of the Seed source</p>
 <div class="example">
 <a name="readline-repl-example"></a><p class="title"><b>Example 15. </b></p>
@@ -133,7 +81,6 @@ db.close();
 </div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/style.css b/doc/reference/html/style.css
index d6f6c26..3675420 100644
--- a/doc/reference/html/style.css
+++ b/doc/reference/html/style.css
@@ -1,15 +1,23 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
   background: #eeeeec;
-  border: solid 1px #d3d7cf;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
   padding: 0.5em;
 }
 .programlisting
 {
   /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
   background: #e6f3ff;
   border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0.5em;
 }
 .variablelist
@@ -22,89 +30,6 @@
   vertical-align: top;
 }
 
-@media screen {
-  sup a.footnote
-  {
-    position: relative;
-    top: 0em ! important;
-    
-  }
-  /* this is needed so that the local anchors are displayed below the naviagtion */
-  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
-  {
-    display: inline-block;
-    position: relative;
-    top:-5em;
-  }
-  /* this seems to be a bug in the xsl style sheets when generating indexes */
-  div.index div.index
-  {
-    top: 0em;
-  }
-  /* make space for the fixed navigation bar and add space at the bottom so that
-   * link targets appear somewhat close to top
-   */
-  body
-  {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
-  }
-  /* style and size the navigation bar */
-  table.navigation#top
-  {
-    position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
-    margin-top: 0;
-    margin-bottom: 0;
-    top: 0;
-    left: 0;
-    height: 3em;
-    z-index: 10;
-  }
-  .navigation a, .navigation a:visited
-  {
-    /* tango:scarlet red 3 */
-    color: #a40000;
-  }
-  .navigation a:hover
-  {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
-  }
-  td.shortcuts
-  {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
-    font-size: 80%;
-    white-space: nowrap;
-  }
-}
-@media print {
-  table.navigation {
-    visibility: collapse;
-    display: none;
-  }
-  div.titlepage table.navigation {
-    visibility: visible;
-    display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
-    margin-top: 0;
-    margin-bottom: 0;
-    top: 0;
-    left: 0;
-    height: 3em;
-  }
-}
-
-.navigation .title
-{
-  font-size: 200%;
-}
-
 div.gallery-float
 {
   float: left;
@@ -132,6 +57,72 @@ a:hover
   color: #729fcf;
 }
 
+div.informaltable table
+{
+  border-collapse: separate;
+  border-spacing: 1em 0.3em;
+  border: none;
+}
+
+div.informaltable table td, div.informaltable table th
+{
+  vertical-align: top;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
+td p
+{
+  margin: 0.25em;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -154,14 +145,44 @@ div.table table th
   background-color: #d3d7cf;
 }
 
+h4
+{
+  color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+  font-weight: bold;
+}
+
+dl.toc > dl
+{
+  padding-bottom: 0.5em;
+}
+
+.parameter
+{
+  font-style: normal;
 }
 
 .footer
@@ -173,31 +194,70 @@ hr
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
   background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
   border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
 }
 .note
 {
   /* tango:chameleon 0/0.5 */
   background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
   border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
 }
-.note, .warning
+div.blockquote
+{
+  border-color: #eeeeec;
+}
+.note, .warning, div.blockquote
 {
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
-.note h3, .warning h3
+.note p, .warning p
 {
-  margin-top: 0.0em
+  margin: 0;
 }
-.note p, .warning p
+
+div.warning h3.title,
+div.note h3.title
+{
+  display: none;
+}
+
+p + div.section
 {
-  margin-bottom: 0.0em
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
 }
 
 /* blob links */
@@ -210,33 +270,52 @@ h2 .extralinks, h3 .extralinks
   font-weight: normal;
 }
 
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
 .annotation
 {
   /* tango:aluminium 5 */
   color: #555753;
-  font-size: 80%;
   font-weight: normal;
 }
 
+.structfield
+{
+  font-style: normal;
+  font-weight: normal;
+}
+
+acronym,abbr 
+{
+  border-bottom: 1px dotted gray;
+}
+
 /* code listings */
 
-.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
-.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
-.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
-.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
-.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .normal,
+.listing_code .programlisting .normal a,
+.listing_code .programlisting .number,
+.listing_code .programlisting .cbracket,
+.listing_code .programlisting .symbol     { color: #555753; }
+.listing_code .programlisting .comment,
 .listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
-.listing_code .programlisting .normal     { color: #000000; }
-.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .function,
+.listing_code .programlisting .function a,
 .listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
-.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
-.listing_code .programlisting .type       { color: #000000; }
-.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
-.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+.listing_code .programlisting .string     { color: #ad7fa8; } /* tango: plum */
+.listing_code .programlisting .keyword,
+.listing_code .programlisting .usertype,
+.listing_code .programlisting .type,
+.listing_code .programlisting .type a     { color: #4e9a06; } /* tango: chameleon 3  */
 
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0px;
 }
 
@@ -248,19 +327,153 @@ h2 .extralinks, h3 .extralinks
 .listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
   /* tango:aluminium 6 */
   color: #2e3436;
 }
 .listing_code {
   /* tango:sky blue 0 */
   background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
 }
 .listing_code .programlisting {
   /* override from previous */
   border: none 0px;
   padding: 0px;
+  background: none;
 }
 .listing_lines pre, .listing_code pre {
   margin: 0px;
 }
 
+@media screen {
+  /* these have a <sup> as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
+  {
+    position: relative;
+    top: 0em ! important;
+  }
+  /* this is needed so that the local anchors are displayed below the naviagtion */
+  div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
+  {
+    display: inline-block;
+    position: relative;
+    top:-5em;
+  }
+  /* this seems to be a bug in the xsl style sheets when generating indexes */
+  div.index div.index
+  {
+    top: 0em;
+  }
+  /* make space for the fixed navigation bar and add space at the bottom so that
+   * link targets appear somewhat close to top
+   */
+  body
+  {
+    padding-top: 2.5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
+  }
+  /* style and size the navigation bar */
+  table.navigation#top
+  {
+    position: fixed;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
+    border-spacing: 5px;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    z-index: 10;
+  }
+  table.navigation#top td
+  {
+    padding-left: 6px;
+    padding-right: 6px;
+  }
+  .navigation a, .navigation a:visited
+  {
+    /* tango:sky blue 3 */
+    color: #204a87;
+  }
+  .navigation a:hover
+  {
+    /* tango:sky blue 2 */
+    color: #3465a4;
+  }
+  td.shortcuts
+  {
+    /* tango:sky blue 2 */
+    color: #3465a4;
+    font-size: 80%;
+    white-space: nowrap;
+  }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+  .navigation .title
+  {
+    font-size: 80%;
+    max-width: none;
+    margin: 0px;
+    font-weight: normal;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
+  .listing_lines { display: none; }
+}
+@media print {
+  table.navigation {
+    visibility: collapse;
+    display: none;
+  }
+  div.titlepage table.navigation {
+    visibility: visible;
+    display: table;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
+    margin-top: 0;
+    margin-bottom: 0;
+    top: 0;
+    left: 0;
+    height: 3em;
+  }
+}
+
diff --git a/doc/reference/html/types.html b/doc/reference/html/types.html
index 418d514..6861bdd 100644
--- a/doc/reference/html/types.html
+++ b/doc/reference/html/types.html
@@ -2,27 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Values and Type Conversion</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>Values and Type Conversion: Seed Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Seed Reference Manual">
 <link rel="up" href="api.html" title="Part III. Seed API Reference">
 <link rel="prev" href="seed-Signals.html" title="GObject Signals">
 <link rel="next" href="seed-Native-Type-Conversion.html" title="Type Conversion">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="seed-Signals.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Seed Reference Manual</th>
-<td><a accesskey="n" href="seed-Native-Type-Conversion.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="seed-Signals.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="seed-Native-Type-Conversion.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="types"></a>Values and Type Conversion</h2></div></div></div>
-<div class="toc"><dl>
+<div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="seed-Native-Type-Conversion.html">Type Conversion</a></span><span class="refpurpose"> — Moving between JavaScript and C intrinsic types</span>
 </dt>
@@ -35,7 +35,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
+<hr>Generated by GTK-Doc V1.25</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/reference/html/up-insensitive.png b/doc/reference/html/up-insensitive.png
new file mode 100644
index 0000000..f404986
--- /dev/null
+++ b/doc/reference/html/up-insensitive.png
diff --git a/doc/reference/html/up.png b/doc/reference/html/up.png
index 8eb591f..80b4b37 100644
--- a/doc/reference/html/up.png
+++ b/doc/reference/html/up.png
diff --git a/doc/reference/tmpl/seed-closure.sgml b/doc/reference/tmpl/seed-closure.sgml
deleted file mode 100644
index fad2dbd..0000000
--- a/doc/reference/tmpl/seed-closure.sgml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Using JavaScript closures
-
-<!-- ##### SECTION Short_Description ##### -->
-Creating and invoking closures over JavaScript functions using GClosure
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Long description
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT SeedClosure ##### -->
-<para>
-
-</para>
-
-@closure: 
-@function: 
-@user_data: 
-@return_type: 
-@description: 
-
-<!-- ##### FUNCTION seed_closure_new ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@function: 
-@user_data: 
-@description: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_closure_get_callable ##### -->
-<para>
-
-</para>
-
-@c: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_closure_invoke ##### -->
-<para>
-
-</para>
-
-@closure: 
-@args: 
-@argc: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_closure_invoke_with_context ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@closure: 
-@args: 
-@argc: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_closure_warn_exception ##### -->
-<para>
-
-</para>
-
-@c: 
-@ctx: 
-@exception: 
-
-
diff --git a/doc/reference/tmpl/seed-context.sgml b/doc/reference/tmpl/seed-context.sgml
deleted file mode 100644
index edf9908..0000000
--- a/doc/reference/tmpl/seed-context.sgml
+++ /dev/null
@@ -1,124 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Working with Contexts
-
-<!-- ##### SECTION Short_Description ##### -->
-Self-contained JavaScript execution environments
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #SeedContext provides a complete "universe" for the execution of JavaScript. You can use seed_context_create() to create a sandboxed context that lacks the import system, so it can be used to execute somewhat untrusted JavaScript (as it has no way to access the rest of your system). You can also expose the default set of globals (including "print", "imports", and "Seed") to create more powerful but still self-contained environments within which to execute code.
-</para>
-
-<example>
-<title>Using a Seed context as a form of sandboxing</title>
-<programlisting>
-...
-ctx = seed_context_create(NULL, NULL);
-script = seed_make_script(ctx, "print(imports)", NULL, 0);
-// nothing is printed, because imports is undefined, because we're in a sandbox
-...
-</programlisting>
-</example>
-
-<para>The <link linkend="Sandbox-module">sandbox</link> module provides access to this system from the JavaScript side of Seed.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### TYPEDEF SeedContext ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF SeedGlobalContext ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF SeedContextGroup ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION seed_context_create ##### -->
-<para>
-
-</para>
-
-@group: 
-@global_class: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_context_ref ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_context_unref ##### -->
-<para>
-
-</para>
-
-@ctx: 
-
-
-<!-- ##### FUNCTION seed_context_collect ##### -->
-<para>
-
-</para>
-
-@ctx: 
-
-
-<!-- ##### FUNCTION seed_context_get_global_object ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_prepare_global_context ##### -->
-<para>
-
-</para>
-
-@ctx: 
-
-
-<!-- ##### FUNCTION seed_importer_add_global ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@name: 
-
-
-<!-- ##### FUNCTION seed_importer_set_search_path ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@search_path: 
-
-
diff --git a/doc/reference/tmpl/seed-eval.sgml b/doc/reference/tmpl/seed-eval.sgml
deleted file mode 100644
index f3fbecd..0000000
--- a/doc/reference/tmpl/seed-eval.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Evaluating JavaScript
-
-<!-- ##### SECTION Short_Description ##### -->
-Creating and interpreting scripts
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Seed relies on WebKit's JavaScriptCore interpreter to actually evaluate snippets of JavaScript; however, it provides a handful of useful wrapper functions to quickly create and evaluate scripts. seed_make_script() and seed_evaluate() are the workhorse functions; these allow you to control every detail of the created script and its evaluation environment (including customizing the "this" object during evaluation, and setting a starting line number and filename from which the script originates). seed_simple_evaluate() provides an interface to execute a string of JavaScript without previously creating a #SeedScript, and, while requiring less supporting code, is less flexible.
-</para>
-
-<example>
-<title>Create and evaluate a string of JavaScript with seed_make_script()</title>
-<programlisting>
-SeedEngine * eng;
-&nbsp;
-...
-&nbsp;    
-SeedScript * script;
-/* Create a simple #SeedScript */
-script = seed_make_script(eng->context, "print('Hello, world!')", NULL, 0);
-&nbsp;
-/* Evaluate the #SeedScript in the default context */
-seed_evaluate(eng->context, script, 0);
-&nbsp;
-...
-</programlisting>
-</example>
-
-<example>
-<title>Create and evaluate a string of JavaScript with seed_simple_evaluate()</title>
-<programlisting>
-SeedEngine * eng;
-&nbsp;
-...
-&nbsp;
-/* Evaluate a simple JavaScript snippet in the default context */
-seed_simple_evaluate(eng->context, "print('Hello, world!')", NULL);
-&nbsp;
-...
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT SeedScript ##### -->
-<para>
-
-</para>
-
-@script: 
-@exception: 
-@source_url: 
-@line_number: 
-
-<!-- ##### FUNCTION seed_make_script ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@js: 
-@source_url: 
-@line_number: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_evaluate ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@s: 
-@this_object: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_simple_evaluate ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@source: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_new_from_file ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@file: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_exception ##### -->
-<para>
-
-</para>
-
-@s: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_destroy ##### -->
-<para>
-
-</para>
-
-@s: 
-
-
diff --git a/doc/reference/tmpl/seed-exception.sgml b/doc/reference/tmpl/seed-exception.sgml
deleted file mode 100644
index 55c6c38..0000000
--- a/doc/reference/tmpl/seed-exception.sgml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Exception Handling
-
-<!-- ##### SECTION Short_Description ##### -->
-Throwing and catching exceptions
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Seed uses exceptions as a method of handling runtime errors within scripts. An exception consists of a name (a list of commonly-used exception names is below), a message, detailing the error, and the line number and filename from which the exception was raised. If Seed cannot determine from where the exception was raised, the line number and filename will be undefined. seed_exception_to_string() provides a simple way to convert all of these into a consistent representation to display to users.
-</para>
-
-<para>
-All Seed callbacks take an exception argument; calling
-seed_make_exception() with this argument and the details you wish to
-fill it with will propogate that exception up the chain. Exceptions
-can be <emphasis>caught</emphasis> either by a try/catch block in the
-calling JavaScript, or by observing the exception property, dealing
-with it, and then clearing the exception.
-
-It is important to note that calling seed_make_exception() does not
-in fact <emphasis>throw</emphasis> the exception, but just creates an
-object which, when stored in the exception pointer passed to a callback,
-causes JSC to throw an exception once flow is returned.
-</para>
-
-<example>
-<title>Throw an exception, because <function>random_callback</function> was called with the wrong number of arguments</title>
-<programlisting>
-SeedValue random_callback(SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue arguments[],
-                          SeedException *exception)
-{
-    ...
-&nbsp;
-    if(argument_count != 1)
-    {
-        seed_make_exception(ctx, exception, "ArgumentError",
-                            "wrong number of arguments; expected 1, got %Zd",
-                            argument_count);
-        return seed_make_undefined(ctx);
-    }
-&nbsp;
-    ...
-}
-</programlisting>
-</example>
-
-<note>
-<title>Predefined Exception Names</title>
-<para>
-<itemizedlist>
-  <listitem><emphasis>InvalidPropertyValue</emphasis> - a property was set to a value out of range</listitem>
-  <listitem><emphasis>PropertyError</emphasis> - a warning occurred in GLib while trying to set a property</listitem>
-  <listitem><emphasis>ArgumentError</emphasis> - a function was called with the wrong number of arguments</listitem>
-  <listitem><emphasis>ConversionError</emphasis> - one of the type conversion functions threw an exception</listitem>
-  <listitem><emphasis>TypeError</emphasis> - a required argument was of the wrong type</listitem>
-  <listitem><emphasis>SyntaxError</emphasis> - a syntax error was thrown from JavaScriptCore</listitem>
-  <listitem><emphasis>ParseError</emphasis> - a parsing error was thrown from JavaScriptCore (make sure you close all of your brackets!)</listitem>
-  <listitem><emphasis>ReferenceError</emphasis> - a reference error was thrown from JavaScriptCore (most likely, you tried to access a variable which was undefined)</listitem>
-</itemizedlist>
-</para>
-</note>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### TYPEDEF SeedException ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION seed_make_exception ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@exception: 
-@name: 
-@message: 
-@...: 
-
-
-<!-- ##### FUNCTION seed_exception_get_name ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_exception_get_message ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_exception_get_line ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_exception_get_file ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_exception_to_string ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@exception: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-jsclass.sgml b/doc/reference/tmpl/seed-jsclass.sgml
deleted file mode 100644
index c0ea39b..0000000
--- a/doc/reference/tmpl/seed-jsclass.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Creating JavaScript classes
-
-<!-- ##### SECTION Short_Description ##### -->
-Dealing with Seed class definitions and constructors
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Defining new Seed classes allows for implementing more complex
-behavior than possible with the traditional JavaScript object system
-and default class.
-
-When writing Seed modules, it is often the best pattern to define many
-of your types through classes and static functions/value.
-
-Please note that inside the finalize callback of a class, it is not
-legal to call any method requiring a #SeedContext (with the exception
-of protect/unprotect, though it is not guaranteed this will continue
-to work with future versions of JSCore).
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM SeedPropertyAttributes ##### -->
-<para>
-
-</para>
-
-@SEED_PROPERTY_ATTRIBUTE_NONE: 
-@SEED_PROPERTY_ATTRIBUTE_READ_ONLY: 
-@SEED_PROPERTY_ATTRIBUTE_DONT_ENUM: 
-@SEED_PROPERTY_ATTRIBUTE_DONT_DELETE: 
-
-<!-- ##### ENUM SeedClassAttributes ##### -->
-<para>
-
-</para>
-
-@SEED_CLASS_ATTRIBUTE_NONE: 
-@SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE: 
-
-<!-- ##### TYPEDEF SeedClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO seed_empty_class ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION seed_create_class ##### -->
-<para>
-
-</para>
-
-@def: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_make_constructor ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@klass: 
-@constructor: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-main.sgml b/doc/reference/tmpl/seed-main.sgml
deleted file mode 100644
index 26fd9c7..0000000
--- a/doc/reference/tmpl/seed-main.sgml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Initialization
-
-<!-- ##### SECTION Short_Description ##### -->
-Overall setup of the Seed engine
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Before any other Seed functions can be used, you must initialize the engine, which creates an initial JavaScript context and sets up JavaScriptCore and GLib. To do this in most cases, you will use seed_init(), which will provide you with a #SeedEngine. Only one #SeedEngine is permitted per application; use a #SeedContext to sandbox code execution.
-</para>
-
-<example>
-<title>Very simple <function>main</function> function for a Seed program</title>
-<programlisting>
-int main (int argc, char **argv)
-{
-    SeedEngine * eng;
-    SeedScript * script;
-&nbsp;
-    /* Initialize the Seed engine */
-    eng = seed_init(&amp;argc, &amp;argv);
-&nbsp;
-    /* Create a simple #SeedScript */
-    script = seed_make_script(eng->context, "print('Hello, world!')", NULL, 0);
-&nbsp;
-    /* Evaluate the #SeedScript in the default context */
-    seed_evaluate(eng->context, script, 0);
-&nbsp;
-    g_free(script);
-    return 0;
-}
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT SeedEngine ##### -->
-<para>
-
-</para>
-
-@context: 
-@global: 
-@search_path: 
-@group: 
-
-<!-- ##### FUNCTION seed_init ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_init_with_context_group ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_engine_set_search_path ##### -->
-<para>
-
-</para>
-
-@eng: 
-@path: 
-
-
-<!-- ##### FUNCTION seed_engine_get_search_path ##### -->
-<para>
-
-</para>
-
-@eng: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-main.sgml.sgml b/doc/reference/tmpl/seed-main.sgml.sgml
deleted file mode 100644
index 463c7a4..0000000
--- a/doc/reference/tmpl/seed-main.sgml.sgml
+++ /dev/null
@@ -1,226 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-seed-main.sgml
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION seed_init ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_init_with_context_group ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_importer_add_global ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@name: 
-
-
-<!-- ##### FUNCTION seed_importer_set_search_path ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@search_path: 
-
-
-<!-- ##### FUNCTION seed_engine_set_search_path ##### -->
-<para>
-
-</para>
-
-@eng: 
-@path: 
-
-
-<!-- ##### FUNCTION seed_engine_get_search_path ##### -->
-<para>
-
-</para>
-
-@eng: 
-@Returns: 
-
-
-<!-- ##### STRUCT SeedScript ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION seed_make_script ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@js: 
-@source_url: 
-@line_number: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_evaluate ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@s: 
-@this: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_simple_evaluate ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@source: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_new_from_file ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@file: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_exception ##### -->
-<para>
-
-</para>
-
-@s: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_make_function ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@callback: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_create_function ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@name: 
-@callback: 
-@object: 
-
-
-<!-- ##### FUNCTION seed_make_constructor ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@class: 
-@Param3: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_pointer_get_pointer ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@pointer: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedFunctionCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@function: 
-@this_object: 
-@argument_count: 
-@arguments: 
-@excecption: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedModuleInitCallback ##### -->
-<para>
-
-</para>
-
-@eng: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_signal_connect ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@signal: 
-@script: 
-
-
-<!-- ##### FUNCTION seed_signal_connect_value ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@signal: 
-@function: 
-@user_data: 
-
-
diff --git a/doc/reference/tmpl/seed-modules.sgml b/doc/reference/tmpl/seed-modules.sgml
deleted file mode 100644
index 6528873..0000000
--- a/doc/reference/tmpl/seed-modules.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Seed Modules
-
-<!-- ##### SECTION Short_Description ##### -->
-Native C modules for Seed
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Seed includes a simple system for creating C modules which can be loaded and manipulated from JavaScript. This is used for implementing performance-critical code closer to the silicon, as well as binding non-introspectable libraries in an attractive way.
-</para>
-
-<para>Numerous binding modules are included in the Seed repository; when writing a new native module, it would be wise to look over these before beginning, as they have many tidbits of useful knowledge for writing modules.</para>
-
-<example>
-<title>Very simple example C module</title>
-<programlisting>
-#include &lt;glib.h&gt;
-#include &lt;seed-module.h&gt;
-
-SeedObject seed_module_init(SeedEngine * eng)
-{
-    /* Say hello! */
-    g_print("Hello, Seed Module World!\n");
-&nbsp;
-    /* Return an empty object as the module's namespace */
-    return seed_make_object (eng->context, NULL, NULL);
-}
-</programlisting>
-</example>
-
-<para>Above is a C module which does absolutely nothing useful. When a module is loaded, seed_module_init() is called, which should have the signature of SeedModuleInitCallback(). You're passed the global #SeedEngine, and the value you return is the namespace for your module. Say, for example, you place a static function on that object:</para>
-
-<example>
-<title>C module with a function</title>
-<programlisting>
-#include &lt;glib.h&gt;
-#include &lt;seed-module.h&gt;
-
-/* Our function, with the signature of SeedFunctionCallback(); say hello! */
-SeedValue say_hello_to(SeedContext ctx,
-                       SeedObject function,
-                       SeedObject this_object,
-                       gsize argument_count,
-                       const SeedValue arguments[],
-                       SeedException *exception)
-{
-    guchar * name;
-&nbsp;
-    /* Check that only one argument was passed into the function.
-       CHECK_ARG_COUNT() is from seed-module.h, which you might find useful. */
-    CHECK_ARG_COUNT("hello.say_hello_to", 1);
-&nbsp;
-    /* Convert the first argument, a #SeedValue, to a C string */
-    name = seed_value_to_string(ctx, arguments[0], exception);
-&nbsp;    
-    g_print("Hello, %s!\n", name);
-&nbsp;    
-    g_free(name);
-&nbsp;    
-    return seed_make_null(ctx);
-}
-&nbsp;
-/* Define an array of #seed_static_function */
-seed_static_function gettext_funcs[] = {
-    {"say_hello_to", say_hello_to, 0}
-};
-&nbsp;
-SeedObject seed_module_init(SeedEngine * eng)
-{
-    SeedGlobalContext ctx = eng->context;
-&nbsp;
-    /* Create a new class definition with our array of static functions */
-    seed_class_definition ns_class_def = seed_empty_class;
-    ns_class_def.static_functions = example_funcs;
-&nbsp;
-    /* Create a class from the class definition we just created */
-    SeedClass ns_class = seed_create_class(&amp;ns_class_def);
-&nbsp;
-    /* Instantiate the class; this instance will be the namespace we return */
-    ns_ref = seed_make_object (ctx, ns_class, NULL);
-    seed_value_protect (ctx, ns_ref);
-&nbsp;
-    return ns_ref;
-}
-</programlisting>
-</example>
-
-<para>After building and installing this module (look in the Seed build system for examples of how to get this to work, as well as a copy of seed-module.h, which will be very useful), it will be loadable with the normal Seed import system. Assuming it's installed as libseed_hello.so:</para>
-
-<example>
-<title>Utilize our second example C module from JavaScript</title>
-<programlisting>
-hello = imports.hello;
-
-hello.say_hello_to("Tim");
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### MACRO CHECK_ARG_COUNT ##### -->
-<para>
-
-</para>
-
-@name: 
-@argnum: 
-
-
-<!-- ##### MACRO DEFINE_ENUM_MEMBER ##### -->
-<para>
-
-</para>
-
-@holder: 
-@member: 
-
-
-<!-- ##### MACRO DEFINE_ENUM_MEMBER_EXT ##### -->
-<para>
-
-</para>
-
-@holder: 
-@name: 
-@val: 
-
-
-<!-- ##### USER_FUNCTION SeedModuleInitCallback ##### -->
-<para>
-
-</para>
-
-@eng: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-nativefuncs.sgml b/doc/reference/tmpl/seed-nativefuncs.sgml
deleted file mode 100644
index e09b611..0000000
--- a/doc/reference/tmpl/seed-nativefuncs.sgml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Creating native functions
-
-<!-- ##### SECTION Short_Description ##### -->
-C functions as first-class JavaScript objects
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Exposing native C functions to JavaScript is one of the fundamental use cases for libseed when used in an embedding environment; if your application cannot be introspected, or you only have a small number of functions to expose, this is the simplest way to do that.
-</para>
-
-<para>
-All native C callbacks should have the prototype of SeedFunctionCallback(). 
-</para>
-
-<example>
-<title>Simple C program which embeds Seed with one exposed function</title>
-<programlisting>
-#include &lt;glib.h&gt;
-#include &lt;seed.h&gt;
-&nbsp;
-/* Our function, with the signature of SeedFunctionCallback(); say hello! */
-SeedValue hello_world(SeedContext ctx,
-                      SeedObject function,
-                      SeedObject this_object,
-                      gsize argument_count,
-                      const SeedValue arguments[],
-                      SeedException *exception)
-{
-    g_print("Hello, World!\n");
-    return seed_make_null(ctx);
-}
-&nbsp;
-int main(gint argc, gchar ** argv)
-{
-    SeedEngine * eng;
-&nbsp;
-    /* Initialize the Seed engine */
-    eng = seed_init(&amp;argc, &amp;argv);
-&nbsp;
-    /* Expose a C function to JavaScript */
-    seed_create_function(eng-&gt;context, "hello_world",
-                         (SeedFunctionCallback)hello_world,
-                         eng-&gt;global);
-&nbsp;
-    /* Call the newly created JavaScript function */
-    seed_simple_evaluate(eng-&gt;context, "hello_world()", NULL);
-&nbsp;
-    return 0;
-}
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### USER_FUNCTION SeedFunctionCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@function: 
-@this_object: 
-@argument_count: 
-@arguments: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_make_function ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@func: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_create_function ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@name: 
-@func: 
-@obj: 
-
-
diff --git a/doc/reference/tmpl/seed-nativetypes.sgml b/doc/reference/tmpl/seed-nativetypes.sgml
deleted file mode 100644
index e28fc1a..0000000
--- a/doc/reference/tmpl/seed-nativetypes.sgml
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Operating on JavaScript types
-
-<!-- ##### SECTION Short_Description ##### -->
-Determining the type of a SeedValue
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Long description
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION seed_value_unprotect ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-
-
-<!-- ##### FUNCTION seed_value_protect ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-
-
-<!-- ##### FUNCTION seed_value_is_undefined ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_is_null ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_is_function ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_is_number ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_is_string ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_is_object_of_class ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@klass: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_is_object ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_get_type ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@value: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-object.sgml b/doc/reference/tmpl/seed-object.sgml
deleted file mode 100644
index ba8635a..0000000
--- a/doc/reference/tmpl/seed-object.sgml
+++ /dev/null
@@ -1,285 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Working with JavaScript objects
-
-<!-- ##### SECTION Short_Description ##### -->
-Using properties, constructing objects, etc.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Long description
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### TYPEDEF SeedObject ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION seed_make_object ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@klass: 
-@private_object: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_make_array ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@elements: 
-@num_elements: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_call ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@this_object: 
-@argument_count: 
-@arguments: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_set_property_at_index ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@index: 
-@value: 
-@exception: 
-
-
-<!-- ##### FUNCTION seed_object_get_property_at_index ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@index: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_is_of_class ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@obj: 
-@klass: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_get_private ##### -->
-<para>
-
-</para>
-
-@object: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_set_private ##### -->
-<para>
-
-</para>
-
-@object: 
-@value: 
-
-
-<!-- ##### FUNCTION seed_object_get_property ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_set_property ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@name: 
-@value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_get_prototype ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@obj: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_object_copy_property_names ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectInitializeCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectFinalizeCallback ##### -->
-<para>
-
-</para>
-
-@object: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectHasPropertyCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@string: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectGetPropertyCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@property_name: 
-@e: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectSetPropertyCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@property_name: 
-@value: 
-@e: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectDeletePropertyCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@property_name: 
-@e: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectGetPropertyNamesCallback ##### -->
-<para>
-
-</para>
-
-@void: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectCallAsFunctionCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@function: 
-@this_object: 
-@argument_count: 
-@arguments: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectHasInstanceCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@constructor: 
-@instance_p: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectConvertToTypeCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@type: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedObjectCallAsConstructorCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@constructor: 
-@argument_count: 
-@arguments: 
-@exception: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-signals.sgml b/doc/reference/tmpl/seed-signals.sgml
deleted file mode 100644
index 17eba9f..0000000
--- a/doc/reference/tmpl/seed-signals.sgml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GObject Signals
-
-<!-- ##### SECTION Short_Description ##### -->
-Connecting JavaScript functions to signals
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Long description
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### FUNCTION seed_signal_connect ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@signal: 
-@script: 
-
-
-<!-- ##### FUNCTION seed_signal_connect_value ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@object: 
-@signal: 
-@function: 
-@user_data: 
-
-
diff --git a/doc/reference/tmpl/seed-string.sgml b/doc/reference/tmpl/seed-string.sgml
deleted file mode 100644
index c3e4d06..0000000
--- a/doc/reference/tmpl/seed-string.sgml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-SeedString
-
-<!-- ##### SECTION Short_Description ##### -->
-This one should go away eventually
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Long description
-</para>
diff --git a/doc/reference/tmpl/seed-typeconversion.sgml b/doc/reference/tmpl/seed-typeconversion.sgml
deleted file mode 100644
index 084a8d3..0000000
--- a/doc/reference/tmpl/seed-typeconversion.sgml
+++ /dev/null
@@ -1,474 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Type Conversion
-
-<!-- ##### SECTION Short_Description ##### -->
-Moving between JavaScript and C intrinsic types
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Long description
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### TYPEDEF SeedValue ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM SeedType ##### -->
-<para>
-
-</para>
-
-@SEED_TYPE_UNDEFINED: 
-@SEED_TYPE_NULL: 
-@SEED_TYPE_BOOLEAN: 
-@SEED_TYPE_NUMBER: 
-@SEED_TYPE_STRING: 
-@SEED_TYPE_OBJECT: 
-
-<!-- ##### FUNCTION seed_make_undefined ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_make_null ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_boolean ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_boolean ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_uint ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_uint ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_int ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_int ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_char ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_char ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_uchar ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_uchar ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_long ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_long ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_ulong ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_ulong ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_int64 ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_int64 ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_uint64 ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_uint64 ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_float ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_float ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_double ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_double ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_string ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_string ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_binary_string ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@bytes: 
-@n_bytes: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_object ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_object ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_filename ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_from_filename ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@val: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_value_to_format ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@format: 
-@values: 
-@exception: 
-@...: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_pointer_get_pointer ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@pointer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_make_pointer ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@pointer: 
-@Returns: 
-
-
-<!-- ##### TYPEDEF SeedString ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION seed_string_ref ##### -->
-<para>
-
-</para>
-
-@string: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_string_unref ##### -->
-<para>
-
-</para>
-
-@string: 
-
-
-<!-- ##### FUNCTION seed_string_get_maximum_size ##### -->
-<para>
-
-</para>
-
-@string: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_string_to_utf8_buffer ##### -->
-<para>
-
-</para>
-
-@string: 
-@buffer: 
-@buffer_size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_string_is_equal ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_string_is_equal_utf8 ##### -->
-<para>
-
-</para>
-
-@a: 
-@b: 
-@Returns: 
-
-
diff --git a/doc/reference/tmpl/seed-unused.sgml b/doc/reference/tmpl/seed-unused.sgml
deleted file mode 100644
index 0516322..0000000
--- a/doc/reference/tmpl/seed-unused.sgml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- ##### SECTION ./tmpl/seed-main.sgml.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/seed-main.sgml.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/seed-main.sgml.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/seed-main.sgml.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/seed-main.sgml.sgml:Title ##### -->
-seed-main.sgml
-
-
-<!-- ##### SECTION ./tmpl/seed-string.sgml:Long_Description ##### -->
-<para>
-Long description
-</para>
-
-
-<!-- ##### SECTION ./tmpl/seed-string.sgml:Short_Description ##### -->
-This one should go away eventually
-
-
-<!-- ##### SECTION ./tmpl/seed-string.sgml:Title ##### -->
-SeedString
-
-
-<!-- ##### SECTION ./tmpl/seed.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/seed.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/seed.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/seed.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/seed.sgml:Title ##### -->
-seed
-
-
diff --git a/doc/reference/tmpl/seed.sgml b/doc/reference/tmpl/seed.sgml
deleted file mode 100644
index 28a745c..0000000
--- a/doc/reference/tmpl/seed.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-seed
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION seed_init ##### -->
-<para>
-
-</para>
-
-@argc: 
-@argv: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_engine_set_search_path ##### -->
-<para>
-
-</para>
-
-@eng: 
-@path: 
-
-
-<!-- ##### FUNCTION seed_engine_get_search_path ##### -->
-<para>
-
-</para>
-
-@eng: 
-@Returns: 
-
-
-<!-- ##### STRUCT SeedScript ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION seed_make_script ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@js: 
-@source_url: 
-@line_number: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_evaluate ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@s: 
-@this: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_simple_evaluate ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@source: 
-@exception: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_new_from_file ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@file: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_script_exception ##### -->
-<para>
-
-</para>
-
-@s: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_create_function ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@name: 
-@callback: 
-@object: 
-
-
-<!-- ##### FUNCTION seed_make_constructor ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@class: 
-@Param3: 
-@Returns: 
-
-
-<!-- ##### FUNCTION seed_pointer_get_pointer ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@pointer: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION SeedFunctionCallback ##### -->
-<para>
-
-</para>
-
-@ctx: 
-@function: 
-@this_object: 
-@argument_count: 
-@arguments: 
-@exception: 
-
-
-<!-- ##### USER_FUNCTION SeedModuleInitCallback ##### -->
-<para>
-
-</para>
-
-@eng: 
-@Returns: 
-
-
diff --git a/doc/reference/version.xml b/doc/reference/version.xml
index f280719..fcdb2e1 100644
--- a/doc/reference/version.xml
+++ b/doc/reference/version.xml
@@ -1 +1 @@
-3.8.1
+4.0.0
diff --git a/doc/tutorial-standalone/Makefile.in b/doc/tutorial-standalone/Makefile.in
index bf29f8c..d96ef81 100644
--- a/doc/tutorial-standalone/Makefile.in
+++ b/doc/tutorial-standalone/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,22 +89,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/tutorial-standalone
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/tutorial.html.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = tutorial.html
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +150,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(tutorialdir)"
 DATA = $(tutorial_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/tutorial.html.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -167,6 +215,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -180,6 +230,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -203,8 +254,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -216,6 +276,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -310,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -358,7 +420,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/tutorial-standalone/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu doc/tutorial-standalone/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -405,11 +466,11 @@ uninstall-tutorialDATA:
 	@list='$(tutorial_DATA)'; test -n "$(tutorialdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(tutorialdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -548,16 +609,19 @@ uninstall-am: uninstall-tutorialDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	install-tutorialDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-tutorialDATA
+	cscopelist-am ctags-am 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-strip install-tutorialDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-tutorialDATA
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
deleted file mode 100644
index e9f11bf..0000000
--- a/extensions/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-EXTRA_DIST= GLib.js Gio.js Seed.js.in Gtk.js GObject.js Clutter.js Gst.js repl.js
-
-extensiondir=$(datadir)/seed@SEED_GTK_VERSION@/extensions
-extension_DATA = GLib.js Gio.js Seed.js Gtk.js GObject.js Clutter.js Gst.js
-
-repldir=$(datadir)/seed@SEED_GTK_VERSION@
-repl_DATA = repl.js
-
-Seed.js: Seed.js.in
-	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e "s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
diff --git a/gtk-doc.make b/gtk-doc.make
index 1f75dfd..e4a12a5 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -33,9 +34,9 @@ EXTRA_DIST = 				\
 	$(HTML_IMAGES)			\
 	$(SETUP_FILES)
 
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -49,9 +50,13 @@ REPORT_FILES = \
 	$(DOC_MODULE)-undeclared.txt \
 	$(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+		chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 
-if ENABLE_GTK_DOC
 if GTK_DOC_BUILD_HTML
 HTML_BUILD_STAMP=html-build.stamp
 else
@@ -63,9 +68,11 @@ else
 PDF_BUILD_STAMP=
 endif
 
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+if ENABLE_GTK_DOC
+all-local: all-gtk-doc
 endif
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -74,36 +81,45 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
+
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file`; \
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
-	@touch setup-build.stamp
+	$(AM_V_at)touch setup-build.stamp
+
 
 #### scan ####
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
+
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    echo "  DOC   Introspecting gobjects"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -115,59 +131,60 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '  DOC   Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '  DOC   Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo "<!ENTITY package \"$(PACKAGE)\">"; \
+		echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
+		echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
+		echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
+		echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
+		echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
+		echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
+	) > $@
+
 #### html ####
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -180,18 +197,20 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -206,23 +225,28 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 clean-local:
 	@rm -f *~ *.bak
 	@rm -rf .libs
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+	  rm -f $(DOC_MODULE).types; \
+	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -258,18 +282,18 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+if HAVE_GTK_DOC
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
+	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
+	@echo "*** please install gtk-doc and rerun 'configure'. ***"
 	@false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
-	@mkdir $(distdir)/tmpl
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/install-sh b/install-sh
index a9244eb..59990a1 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,25 +35,21 @@ scriptversion=2011-01-19.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -190,7 +186,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,12 +198,21 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -240,7 +245,7 @@ fi
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -269,41 +274,15 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,81 @@ do
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +377,51 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +456,12 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +474,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
diff --git a/extensions/Clutter.js b/jsextensions/Clutter.js
index 574eda1..574eda1 100644
--- a/extensions/Clutter.js
+++ b/jsextensions/Clutter.js
diff --git a/extensions/GLib.js b/jsextensions/GLib.js
index 5aec39a..5aec39a 100644
--- a/extensions/GLib.js
+++ b/jsextensions/GLib.js
diff --git a/extensions/GObject.js b/jsextensions/GObject.js
index d8d4e9f..d8d4e9f 100644
--- a/extensions/GObject.js
+++ b/jsextensions/GObject.js
diff --git a/extensions/Gio.js b/jsextensions/Gio.js
index cc3db2a..cc3db2a 100644
--- a/extensions/Gio.js
+++ b/jsextensions/Gio.js
diff --git a/extensions/Gst.js b/jsextensions/Gst.js
index a49a8e6..a49a8e6 100644
--- a/extensions/Gst.js
+++ b/jsextensions/Gst.js
diff --git a/extensions/Gtk.js b/jsextensions/Gtk.js
index 286fc9f..286fc9f 100644
--- a/extensions/Gtk.js
+++ b/jsextensions/Gtk.js
diff --git a/jsextensions/Makefile.am b/jsextensions/Makefile.am
new file mode 100644
index 0000000..769fe02
--- /dev/null
+++ b/jsextensions/Makefile.am
@@ -0,0 +1,30 @@
+GLIB_COMPILE_RESOURCES=glib-compile-resources
+js_files=Clutter.js \
+          gjs/Gtk.js \
+          gjs/GObject.js \
+          gjs/Gio.js \
+          gjs/GLib.js \
+          GObject.js \
+          Gio.js \
+          Gst.js \
+          GLib.js \
+          Gtk.js \
+          repl.js
+
+resources=$(js_files) \
+		  Seed.js
+
+Seed.js: Seed.js.in
+	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e "s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
+
+libseed-resources.c: libseed.gresources.xml Seed.js.in $(resources)
+	$(GLIB_COMPILE_RESOURCES) libseed.gresources.xml --target=$@ --sourcedir=. --generate-source
+
+all: libseed-resources.c
+
+clean:
+	rm libseed-resources.c
+
+EXTRA_DIST = libseed.gresources.xml \
+			 Seed.js.in \
+			 $(js_files)
diff --git a/extensions/Makefile.in b/jsextensions/Makefile.in
index abf89cb..d76b3d6 100644
--- a/extensions/Makefile.in
+++ b/jsextensions/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,25 +13,62 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,22 +87,32 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = extensions
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+subdir = jsextensions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -74,35 +120,8 @@ am__can_run_installinfo = \
     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__installdirs = "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(repldir)"
-DATA = $(extension_DATA) $(repl_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -166,6 +185,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -179,6 +200,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -202,8 +224,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -215,6 +246,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -309,6 +341,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -317,11 +350,26 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = GLib.js Gio.js Seed.js.in Gtk.js GObject.js Clutter.js Gst.js repl.js
-extensiondir = $(datadir)/seed@SEED_GTK_VERSION@/extensions
-extension_DATA = GLib.js Gio.js Seed.js Gtk.js GObject.js Clutter.js Gst.js
-repldir = $(datadir)/seed@SEED_GTK_VERSION@
-repl_DATA = repl.js
+GLIB_COMPILE_RESOURCES = glib-compile-resources
+js_files = Clutter.js \
+          gjs/Gtk.js \
+          gjs/GObject.js \
+          gjs/Gio.js \
+          gjs/GLib.js \
+          GObject.js \
+          Gio.js \
+          Gst.js \
+          GLib.js \
+          Gtk.js \
+          repl.js
+
+resources = $(js_files) \
+		  Seed.js
+
+EXTRA_DIST = libseed.gresources.xml \
+			 Seed.js.in \
+			 $(js_files)
+
 all: all-am
 
 .SUFFIXES:
@@ -334,10 +382,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu jsextensions/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu extensions/Makefile
-.PRECIOUS: Makefile
+	  $(AUTOMAKE) --gnu jsextensions/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -361,53 +408,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-extensionDATA: $(extension_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(extension_DATA)'; test -n "$(extensiondir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(extensiondir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(extensiondir)" || exit $$?; \
-	done
+tags TAGS:
 
-uninstall-extensionDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(extension_DATA)'; test -n "$(extensiondir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(extensiondir)'; $(am__uninstall_files_from_dir)
-install-replDATA: $(repl_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(repl_DATA)'; test -n "$(repldir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(repldir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(repldir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(repldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(repldir)" || exit $$?; \
-	done
-
-uninstall-replDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(repl_DATA)'; test -n "$(repldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(repldir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -442,11 +447,8 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile
 installdirs:
-	for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(repldir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -477,8 +479,6 @@ distclean-generic:
 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
@@ -497,7 +497,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-extensionDATA install-replDATA
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -541,27 +541,36 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-extensionDATA uninstall-replDATA
+uninstall-am:
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-extensionDATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-replDATA 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-extensionDATA uninstall-replDATA
+	cscopelist-am ctags-am 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-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 Seed.js: Seed.js.in
 	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)@SEED_GTK_VERSION@|" -e "s|%pkgdatadir%|$(pkgdatadir)@SEED_GTK_VERSION@|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@
 
+libseed-resources.c: libseed.gresources.xml Seed.js.in $(resources)
+	$(GLIB_COMPILE_RESOURCES) libseed.gresources.xml --target=$@ --sourcedir=. --generate-source
+
+all: libseed-resources.c
+
+clean:
+	rm libseed-resources.c
+
 # 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/extensions/Seed.js.in b/jsextensions/Seed.js.in
index 7f10e21..0fe9deb 100644
--- a/extensions/Seed.js.in
+++ b/jsextensions/Seed.js.in
@@ -1,6 +1,7 @@
 if(!imports.searchPath || (imports.searchPath.length == 0))
 {
-	imports.searchPath = [ "%gnomejsdir%",
+	imports.searchPath = [ "/org/seed",
+	                       "%gnomejsdir%",
 	                       "%pkglibdir%",
 	                       "%pkgdatadir%",
 	                       "/usr/local/lib/seed",
@@ -8,7 +9,7 @@ if(!imports.searchPath || (imports.searchPath.length == 0))
 	                       "/usr/lib/seed",
 	                       "/usr/share/seed" ];
 
-        GLib = imports.gi.GLib;
+	const GLib = imports.gi.GLib;
 	if(Seed.argv.length > 1)
 	{
 		__script_path__ = GLib.path_get_dirname(Seed.argv[1]);
@@ -35,6 +36,12 @@ if(!imports.searchPath || (imports.searchPath.length == 0))
 	imports.searchPath.unshift(".");
 }
 
+// TODO: This will work, but won't work if not installed
+// that's a bit OK at the moment, as Seed doesn't work properly uninstalled anyway.
+// But it should be fixed soon!
+const GIRepository = imports.gi.GIRepository;
+GIRepository.Repository.prepend_search_path("%pkglibdir%/girepository-1.0/");
+
 Seed.sprintf = function ()
 {
     if (typeof arguments == "undefined") { return null; }
diff --git a/jsextensions/gjs/GLib.js b/jsextensions/gjs/GLib.js
new file mode 100644
index 0000000..f4161a2
--- /dev/null
+++ b/jsextensions/gjs/GLib.js
@@ -0,0 +1,285 @@
+// Copyright 2011 Giovanni Campagna
+//
+// 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.
+
+const ByteArray = imports.byteArray;
+
+let GLib;
+let originalVariantClass;
+
+const SIMPLE_TYPES = ['b', 'y', 'n', 'q', 'i', 'u', 'x', 't', 'h', 'd', 's', 'o', 'g'];
+
+function _read_single_type(signature, forceSimple) {
+    let char = signature.shift();
+    let isSimple = false;
+
+    if (SIMPLE_TYPES.indexOf(char) == -1) {
+	if (forceSimple)
+	    throw new TypeError('Invalid GVariant signature (a simple type was expected)');
+    } else
+	isSimple = true;
+
+    if (char == 'm' || char == 'a')
+	return [char].concat(_read_single_type(signature, false));
+    if (char == '{') {
+	let key = _read_single_type(signature, true);
+	let val = _read_single_type(signature, false);
+	let close = signature.shift();
+	if (close != '}')
+	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}"');
+	return [char].concat(key, val, close);
+    }
+    if (char == '(') {
+	let res = [char];
+	while (true) {
+	    if (signature.length == 0)
+		throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
+	    let next = signature[0];
+	    if (next == ')') {
+		signature.shift();
+		return res.concat(next);
+	    }
+	    let el = _read_single_type(signature);
+	    res = res.concat(el);
+	}
+    }
+
+    // Valid types are simple types, arrays, maybes, tuples, dictionary entries and variants
+    if (!isSimple && char != 'v')
+	throw new TypeError('Invalid GVariant signature (' + char + ' is not a valid type)');
+
+    return [char];
+}
+
+function _makeBytes(byteArray) {
+    if (byteArray instanceof ByteArray.ByteArray)
+        return byteArray.toGBytes();
+    else
+        return new GLib.Bytes(byteArray);
+}
+
+function _pack_variant(signature, value) {
+    if (signature.length == 0)
+	    throw new TypeError('GVariant signature cannot be empty');
+
+    let char = signature.shift();
+    switch (char) {
+    case 'b':
+	return GLib.Variant.new_boolean(value);
+    case 'y':
+	return GLib.Variant.new_byte(value);
+    case 'n':
+	return GLib.Variant.new_int16(value);
+    case 'q':
+	return GLib.Variant.new_uint16(value);
+    case 'i':
+	return GLib.Variant.new_int32(value);
+    case 'u':
+	return GLib.Variant.new_uint32(value);
+    case 'x':
+	return GLib.Variant.new_int64(value);
+    case 't':
+	return GLib.Variant.new_uint64(value);
+    case 'h':
+	return GLib.Variant.new_handle(value);
+    case 'd':
+	return GLib.Variant.new_double(value);
+    case 's':
+	return GLib.Variant.new_string(value);
+    case 'o':
+	return GLib.Variant.new_object_path(value);
+    case 'g':
+	return GLib.Variant.new_signature(value);
+    case 'v':
+	return GLib.Variant.new_variant(value);
+    case 'm':
+	if (value != null)
+	    return GLib.Variant.new_maybe(null, _pack_variant(signature, value));
+	else
+	    return GLib.Variant.new_maybe(new GLib.VariantType(_read_single_type(signature, false).join('')), null);
+    case 'a':
+	let arrayType = _read_single_type(signature, false);
+	if (arrayType[0] == 's') {
+	    // special case for array of strings
+	    return GLib.Variant.new_strv(value);
+	}
+	if (arrayType[0] == 'y') {
+	    // special case for array of bytes
+	    return GLib.Variant.new_from_bytes(new GLib.VariantType('ay'),
+                                               _makeBytes(value), true);
+	}
+
+	let arrayValue = [];
+	if (arrayType[0] == '{') {
+	    // special case for dictionaries
+	    for (let key in value) {
+		let copy = [].concat(arrayType);
+		let child = _pack_variant(copy, [key, value[key]]);
+		arrayValue.push(child);
+	    }
+	} else {
+	    for (let i = 0; i < value.length; i++) {
+		let copy = [].concat(arrayType);
+		let child = _pack_variant(copy, value[i]);
+		arrayValue.push(child);
+	    }
+	}
+	return GLib.Variant.new_array(new GLib.VariantType(arrayType.join('')), arrayValue);
+
+    case '(':
+	let children = [ ];
+	for (let i = 0; i < value.length; i++) {
+	    let next = signature[0];
+	    if (next == ')')
+		break;
+	    children.push(_pack_variant(signature, value[i]));
+	}
+
+	if (signature[0] != ')')
+	    throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
+	signature.shift();
+	return GLib.Variant.new_tuple(children);
+    case '{':
+	let key = _pack_variant(signature, value[0]);
+	let child = _pack_variant(signature, value[1]);
+
+	if (signature[0] != '}')
+	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}")');
+	signature.shift();
+
+	return GLib.Variant.new_dict_entry(key, child);
+    default:
+	throw new TypeError('Invalid GVariant signature (unexpected character ' + char + ')');
+    }
+}
+
+function _unpack_variant(variant, deep) {
+    switch (String.fromCharCode(variant.classify())) {
+    case 'b':
+	return variant.get_boolean();
+    case 'y':
+	return variant.get_byte();
+    case 'n':
+	return variant.get_int16();
+    case 'q':
+	return variant.get_uint16();
+    case 'i':
+	return variant.get_int32();
+    case 'u':
+	return variant.get_uint32();
+    case 'x':
+	return variant.get_int64();
+    case 't':
+	return variant.get_uint64();
+    case 'h':
+	return variant.get_handle();
+    case 'd':
+	return variant.get_double();
+    case 'o':
+    case 'g':
+    case 's':
+	// g_variant_get_string has length as out argument
+	return variant.get_string()[0];
+    case 'v':
+	return variant.get_variant();
+    case 'm':
+	let val = variant.get_maybe();
+	if (deep && val)
+	    return _unpack_variant(val, deep);
+	else
+	    return val;
+    case 'a':
+	if (variant.is_of_type(new GLib.VariantType('a{?*}'))) {
+	    // special case containers
+	    let ret = { };
+	    let nElements = variant.n_children();
+	    for (let i = 0; i < nElements; i++) {
+		// always unpack the dictionary entry, and always unpack
+		// the key (or it cannot be added as a key)
+		let val = _unpack_variant(variant.get_child_value(i), deep);
+		let key;
+		if (!deep)
+		    key = _unpack_variant(val[0], true);
+		else
+		    key = val[0];
+		ret[key] = val[1];
+	    }
+	    return ret;
+	}
+        if (variant.is_of_type(new GLib.VariantType('ay'))) {
+            // special case byte arrays
+            return variant.get_data_as_bytes().toArray();
+        }
+
+	// fall through
+    case '(':
+    case '{':
+	let ret = [ ];
+	let nElements = variant.n_children();
+	for (let i = 0; i < nElements; i++) {
+	    let val = variant.get_child_value(i);
+	    if (deep)
+		ret.push(_unpack_variant(val, deep));
+	    else
+		ret.push(val);
+	}
+	return ret;
+    }
+
+    throw new Error('Assertion failure: this code should not be reached');
+}
+
+function _init() {
+    // this is imports.gi.GLib
+
+    GLib = this;
+
+    // small HACK: we add a matches() method to standard Errors so that
+    // you can do "catch(e if e.matches(Ns.FooError, Ns.FooError.SOME_CODE))"
+    // without checking instanceof
+    Error.prototype.matches = function() { return false; };
+
+    this.Variant._new_internal = function(sig, value) {
+	let signature = Array.prototype.slice.call(sig);
+
+	let variant = _pack_variant(signature, value);
+	if (signature.length != 0)
+	    throw new TypeError('Invalid GVariant signature (more than one single complete type)');
+
+	return variant;
+    };
+
+    // Deprecate version of new GLib.Variant()
+    this.Variant.new = function(sig, value) {
+	return new GLib.Variant(sig, value);
+    };
+    this.Variant.prototype.unpack = function() {
+	return _unpack_variant(this, false);
+    };
+    this.Variant.prototype.deep_unpack = function() {
+	return _unpack_variant(this, true);
+    };
+    this.Variant.prototype.toString = function() {
+	return '[object variant of type "' + this.get_type_string() + '"]';
+    };
+
+    this.Bytes.prototype.toArray = function() {
+	return imports.byteArray.fromGBytes(this);
+    };
+}
diff --git a/jsextensions/gjs/GObject.js b/jsextensions/gjs/GObject.js
new file mode 100644
index 0000000..e2fbb65
--- /dev/null
+++ b/jsextensions/gjs/GObject.js
@@ -0,0 +1,413 @@
+// Copyright 2011 Jasper St. Pierre
+//
+// 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.
+
+const Lang = imports.lang;
+const Gi = imports._gi;
+const GjsPrivate = imports.gi.GjsPrivate;
+
+let GObject;
+
+// Some common functions between GObject.Class and GObject.Interface
+
+function _createSignals(gtype, signals) {
+    for (let signalName in signals) {
+        let obj = signals[signalName];
+        let flags = (obj.flags !== undefined) ? obj.flags : GObject.SignalFlags.RUN_FIRST;
+        let accumulator = (obj.accumulator !== undefined) ? obj.accumulator : GObject.AccumulatorType.NONE;
+        let rtype = (obj.return_type !== undefined) ? obj.return_type : GObject.TYPE_NONE;
+        let paramtypes = (obj.param_types !== undefined) ? obj.param_types : [];
+
+        try {
+            obj.signal_id = Gi.signal_new(gtype, signalName, flags, accumulator, rtype, paramtypes);
+        } catch (e) {
+            throw new TypeError('Invalid signal ' + signalName + ': ' + e.message);
+        }
+    }
+}
+
+function _createGTypeName(name, gtypename) {
+    if (gtypename)
+        return gtypename;
+    else
+        return 'Gjs_' + name;
+}
+
+function _getGObjectInterfaces(interfaces) {
+    return interfaces.filter((iface) => iface.hasOwnProperty('$gtype'));
+}
+
+function _propertiesAsArray(propertyObj) {
+    let propertiesArray = [];
+    if (propertyObj) {
+        for (let prop in propertyObj) {
+            propertiesArray.push(propertyObj[prop]);
+        }
+    }
+    return propertiesArray;
+}
+
+const GObjectMeta = new Lang.Class({
+    Name: 'GObjectClass',
+    Extends: Lang.Class,
+
+    _init: function (params) {
+        // retrieve signals and remove them from params before chaining
+	let signals = params.Signals;
+        delete params.Signals;
+
+        this.parent(params);
+
+        if (signals)
+            _createSignals(this.$gtype, signals);
+
+	let propertyObj = { };
+	Object.getOwnPropertyNames(params).forEach(function(name) {
+            if (name == 'Name' || name == 'Extends' || name == 'Abstract')
+		return;
+
+            let descriptor = Object.getOwnPropertyDescriptor(params, name);
+
+            if (typeof descriptor.value === 'function') {
+		let wrapped = this.prototype[name];
+
+                if (name.slice(0, 6) == 'vfunc_') {
+                    Gi.hook_up_vfunc(this.prototype, name.slice(6), wrapped);
+                } else if (name.slice(0, 3) == 'on_') {
+                    let id = GObject.signal_lookup(name.slice(3).replace('_', '-'), this.$gtype);
+                    if (id != 0) {
+                        GObject.signal_override_class_closure(id, this.$gtype, function() {
+                            let argArray = Array.prototype.slice.call(arguments);
+                            let emitter = argArray.shift();
+
+                            return wrapped.apply(emitter, argArray);
+                        });
+                    }
+                }
+	    }
+	}.bind(this));
+    },
+
+    _isValidClass: function(klass) {
+        let proto = klass.prototype;
+
+        if (!proto)
+            return false;
+
+        // If proto == GObject.Object.prototype, then
+        // proto.__proto__ is Object, so "proto instanceof GObject.Object"
+        // will return false.
+        return proto == GObject.Object.prototype ||
+            proto instanceof GObject.Object;
+    },
+
+    // If we want an object with a custom JSClass, we can't just
+    // use a function. We have to use a custom constructor here.
+    _construct: function(params) {
+        if (!params.Name)
+            throw new TypeError("Classes require an explicit 'Name' parameter.");
+        let name = params.Name;
+
+        let gtypename = _createGTypeName(params.Name, params.GTypeName);
+
+        if (!params.Extends)
+            params.Extends = GObject.Object;
+        let parent = params.Extends;
+
+        if (!this._isValidClass(parent))
+            throw new TypeError('GObject.Class used with invalid base class (is ' + parent + ')');
+
+        let interfaces = params.Implements || [];
+        if (parent instanceof Lang.Class)
+            interfaces = interfaces.filter((iface) => !parent.implements(iface));
+        let gobjectInterfaces = _getGObjectInterfaces(interfaces);
+
+        let propertiesArray = _propertiesAsArray(params.Properties);
+        delete params.Properties;
+
+        let newClass = Gi.register_type(parent.prototype, gtypename,
+            gobjectInterfaces, propertiesArray);
+
+        // See Class.prototype._construct in lang.js for the reasoning
+        // behind this direct __proto__ set.
+        newClass.__proto__ = this.constructor.prototype;
+        newClass.__super__ = parent;
+
+        newClass._init.apply(newClass, arguments);
+
+        Object.defineProperties(newClass.prototype, {
+            '__metaclass__': { writable: false,
+                               configurable: false,
+                               enumerable: false,
+                               value: this.constructor },
+            '__interfaces__': { writable: false,
+                                configurable: false,
+                                enumerable: false,
+                                value: interfaces }
+        });
+
+        interfaces.forEach((iface) => {
+            if (iface instanceof Lang.Interface)
+                iface._check(newClass.prototype);
+        });
+
+        return newClass;
+    },
+
+    // Overrides Lang.Class.implements()
+    implements: function (iface) {
+        if (iface instanceof GObject.Interface) {
+            return GObject.type_is_a(this.$gtype, iface.$gtype);
+        } else {
+            return this.parent(iface);
+        }
+    }
+});
+
+function GObjectInterface(params) {
+    return this._construct.apply(this, arguments);
+}
+
+GObjectMeta.MetaInterface = GObjectInterface;
+
+GObjectInterface.__super__ = Lang.Interface;
+GObjectInterface.prototype = Object.create(Lang.Interface.prototype);
+GObjectInterface.prototype.constructor = GObjectInterface;
+GObjectInterface.prototype.__name__ = 'GObjectInterface';
+
+GObjectInterface.prototype._construct = function (params) {
+    if (!params.Name) {
+        throw new TypeError("Interfaces require an explicit 'Name' parameter.");
+    }
+
+    let gtypename = _createGTypeName(params.Name, params.GTypeName);
+    delete params.GTypeName;
+
+    let interfaces = params.Requires || [];
+    let gobjectInterfaces = _getGObjectInterfaces(interfaces);
+
+    let properties = _propertiesAsArray(params.Properties);
+    delete params.Properties;
+
+    let newInterface = Gi.register_interface(gtypename, gobjectInterfaces,
+        properties);
+
+    // See Class.prototype._construct in lang.js for the reasoning
+    // behind this direct __proto__ set.
+    newInterface.__proto__ = this.constructor.prototype;
+    newInterface.__super__ = GObjectInterface;
+    newInterface.prototype.constructor = newInterface;
+
+    newInterface._init.apply(newInterface, arguments);
+
+    Object.defineProperty(newInterface.prototype, '__metaclass__', {
+        writable: false,
+        configurable: false,
+        enumerable: false,
+        value: this.constructor
+    });
+
+    return newInterface;
+};
+
+GObjectInterface.prototype._init = function (params) {
+    let signals = params.Signals;
+    delete params.Signals;
+
+    Lang.Interface.prototype._init.call(this, params);
+
+    _createSignals(this.$gtype, signals);
+};
+
+function _init() {
+
+    GObject = this;
+
+    function _makeDummyClass(obj, name, upperName, gtypeName, actual) {
+        let gtype = GObject.type_from_name(gtypeName);
+        obj['TYPE_' + upperName] = gtype;
+        obj[name] = function(v) { return new actual(v); };
+        obj[name].$gtype = gtype;
+    }
+
+    _makeDummyClass(this, 'VoidType', 'NONE', 'void', function() {});
+    _makeDummyClass(this, 'Char', 'CHAR', 'gchar', Number);
+    _makeDummyClass(this, 'UChar', 'UCHAR', 'guchar', Number);
+    _makeDummyClass(this, 'Unichar', 'UNICHAR', 'gint', String);
+
+    this.TYPE_BOOLEAN = GObject.type_from_name('gboolean');
+    this.Boolean = Boolean;
+    Boolean.$gtype = this.TYPE_BOOLEAN;
+
+    _makeDummyClass(this, 'Int', 'INT', 'gint', Number);
+    _makeDummyClass(this, 'UInt', 'UINT', 'guint', Number);
+    _makeDummyClass(this, 'Long', 'LONG', 'glong', Number);
+    _makeDummyClass(this, 'ULong', 'ULONG', 'gulong', Number);
+    _makeDummyClass(this, 'Int64', 'INT64', 'gint64', Number);
+    _makeDummyClass(this, 'UInt64', 'UINT64', 'guint64', Number);
+
+    this.TYPE_ENUM = GObject.type_from_name('GEnum');
+    this.TYPE_FLAGS = GObject.type_from_name('GFlags');
+
+    _makeDummyClass(this, 'Float', 'FLOAT', 'gfloat', Number);
+    this.TYPE_DOUBLE = GObject.type_from_name('gdouble');
+    this.Double = Number;
+    Number.$gtype = this.TYPE_DOUBLE;
+
+    this.TYPE_STRING = GObject.type_from_name('gchararray');
+    this.String = String;
+    String.$gtype = this.TYPE_STRING;
+
+    this.TYPE_POINTER = GObject.type_from_name('gpointer');
+    this.TYPE_BOXED = GObject.type_from_name('GBoxed');
+    this.TYPE_PARAM = GObject.type_from_name('GParam');
+    this.TYPE_INTERFACE = GObject.type_from_name('GInterface');
+    this.TYPE_OBJECT = GObject.type_from_name('GObject');
+    this.TYPE_VARIANT = GObject.type_from_name('GVariant');
+
+    _makeDummyClass(this, 'Type', 'GTYPE', 'GType', GObject.type_from_name);
+
+    this.ParamSpec.char = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_char(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.uchar = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_uchar(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.int = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_int(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.uint = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_uint(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.long = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_long(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.ulong = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_ulong(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.int64 = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_int64(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.uint64 = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_uint64(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.float = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_float(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.boolean = function(name, nick, blurb, flags, default_value) {
+        return GObject.param_spec_boolean(name, nick, blurb, default_value, flags);
+    };
+
+    this.ParamSpec.flags = function(name, nick, blurb, flags, flags_type, default_value) {
+        return GObject.param_spec_flags(name, nick, blurb, flags_type, default_value, flags);
+    };
+
+    this.ParamSpec.enum = function(name, nick, blurb, flags, enum_type, default_value) {
+        return GObject.param_spec_enum(name, nick, blurb, enum_type, default_value, flags);
+    };
+
+    this.ParamSpec.double = function(name, nick, blurb, flags, minimum, maximum, default_value) {
+        return GObject.param_spec_double(name, nick, blurb, minimum, maximum, default_value, flags);
+    };
+
+    this.ParamSpec.string = function(name, nick, blurb, flags, default_value) {
+        return GObject.param_spec_string(name, nick, blurb, default_value, flags);
+    };
+
+    this.ParamSpec.boxed = function(name, nick, blurb, flags, boxed_type) {
+        return GObject.param_spec_boxed(name, nick, blurb, boxed_type, flags);
+    };
+
+    this.ParamSpec.object = function(name, nick, blurb, flags, object_type) {
+        return GObject.param_spec_object(name, nick, blurb, object_type, flags);
+    };
+
+    this.ParamSpec.param = function(name, nick, blurb, flags, param_type) {
+        return GObject.param_spec_param(name, nick, blurb, param_type, flags);
+    };
+
+    // XXX:: Commented out due to compatibility issues
+    //this.ParamSpec.override = Gi.override_property;
+
+    Object.defineProperties(this.ParamSpec.prototype, {
+        'name': { configurable: false,
+                  enumerable: false,
+                  get: function() { return this.get_name() } },
+        '_nick': { configurable: false,
+                   enumerable: false,
+                   get: function() { return this.get_nick() } },
+        'nick': { configurable: false,
+                  enumerable: false,
+                  get: function() { return this.get_nick() } },
+        '_blurb': { configurable: false,
+                    enumerable: false,
+                    get: function() { return this.get_blurb() } },
+        'blurb': { configurable: false,
+                   enumerable: false,
+                   get: function() { return this.get_blurb() } },
+        'default_value': { configurable: false,
+                           enumerable: false,
+                           get: function() { return this.get_default_value() } },
+        'flags':  { configurable: false,
+                    enumerable: false,
+                    get: function() { return GjsPrivate.param_spec_get_flags(this) } },
+        'value_type':  { configurable: false,
+                         enumerable: false,
+                         get: function() { return GjsPrivate.param_spec_get_value_type(this) } },
+        'owner_type':  { configurable: false,
+                         enumerable: false,
+                         get: function() { return GjsPrivate.param_spec_get_owner_type(this) } },
+    });
+
+
+    this.Class = GObjectMeta;
+    this.Interface = GObjectInterface;
+
+    /* XXX: removed due to compability issues between gjs and seed
+     * 
+     * //this.Object.prototype.__metaclass__ = this.Class;
+     *
+     * // For compatibility with Lang.Class... we need a _construct
+     * // or the Lang.Class constructor will fail.
+     * this.Object.prototype._construct = function() {
+     *     this._init.apply(this, arguments);
+     *     return this;
+     * };
+
+     * // fake enum for signal accumulators, keep in sync with gi/object.c
+     * this.AccumulatorType = {
+     *     NONE: 0,
+     *     FIRST_WINS: 1,
+     *     TRUE_HANDLED: 2
+     * };
+
+     * this.Object.prototype.disconnect = function(id) {
+     *     return GObject.signal_handler_disconnect(this, id);
+     * };
+     */
+}
diff --git a/jsextensions/gjs/Gio.js b/jsextensions/gjs/Gio.js
new file mode 100644
index 0000000..950641b
--- /dev/null
+++ b/jsextensions/gjs/Gio.js
@@ -0,0 +1,394 @@
+// Copyright 2011 Giovanni Campagna
+//
+// 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.
+
+var GLib = imports.gi.GLib;
+var GObject = imports.gi.GObject;
+var GjsPrivate = imports.gi.GjsPrivate;
+var Lang = imports.lang;
+var Signals = imports.signals;
+var Gio;
+
+function _signatureLength(sig) {
+    var counter = 0;
+    // make it an array
+    var signature = Array.prototype.slice.call(sig);
+    while (signature.length) {
+        GLib._read_single_type(sig);
+        counter++;
+    }
+    return counter;
+}
+
+function _proxyInvoker(methodName, sync, inSignature, arg_array) {
+    var replyFunc;
+    var flags = 0;
+    var cancellable = null;
+
+    /* Convert arg_array to a *real* array */
+    arg_array = Array.prototype.slice.call(arg_array);
+
+    /* The default replyFunc only logs the responses */
+    replyFunc = _logReply;
+
+    var signatureLength = inSignature.length;
+    var minNumberArgs = signatureLength;
+    var maxNumberArgs = signatureLength + 3;
+
+    if (arg_array.length < minNumberArgs) {
+        throw new Error("Not enough arguments passed for method: " + methodName +
+                       ". Expected " + minNumberArgs + ", got " + arg_array.length);
+    } else if (arg_array.length > maxNumberArgs) {
+        throw new Error("Too many arguments passed for method: " + methodName +
+                       ". Maximum is " + maxNumberArgs +
+                        " + one callback and/or flags");
+    }
+
+    while (arg_array.length > signatureLength) {
+        var argNum = arg_array.length - 1;
+        var arg = arg_array.pop();
+        if (typeof(arg) == "function" && !sync) {
+            replyFunc = arg;
+        } else if (typeof(arg) == "number") {
+            flags = arg;
+        } else if (arg instanceof Gio.Cancellable) {
+            cancellable = arg;
+        } else {
+            throw new Error("Argument " + argNum + " of method " + methodName +
+                            " is " + typeof(arg) + ". It should be a callback, flags or a Gio.Cancellable");
+        }
+    }
+
+    var inVariant = new GLib.Variant('(' + inSignature.join('') + ')', arg_array);
+
+    var asyncCallback = function (proxy, result) {
+        var outVariant = null, succeeded = false;
+        try {
+            outVariant = proxy.call_finish(result);
+            succeeded = true;
+        } catch (e) {
+            replyFunc(null, e);
+        }
+
+        if (succeeded)
+            replyFunc(outVariant.deep_unpack(), null);
+    };
+
+    if (sync) {
+        return this.call_sync(methodName,
+                              inVariant,
+                              flags,
+                              -1,
+                              cancellable).deep_unpack();
+    } else {
+        return this.call(methodName,
+                         inVariant,
+                         flags,
+                         -1,
+                         cancellable,
+                         asyncCallback);
+    }
+}
+
+function _logReply(result, exc) {
+    if (exc != null) {
+        log("Ignored exception from dbus method: " + exc.toString());
+    }
+}
+
+function _makeProxyMethod(method, sync) {
+    var i;
+    var name = method.name;
+    var inArgs = method.in_args;
+    var inSignature = [ ];
+    for (i = 0; i < inArgs.length; i++)
+        inSignature.push(inArgs[i].signature);
+
+    return function() {
+        return _proxyInvoker.call(this, name, sync, inSignature, arguments);
+    };
+}
+
+function _convertToNativeSignal(proxy, sender_name, signal_name, parameters) {
+    Signals._emit.call(proxy, signal_name, sender_name, parameters.deep_unpack());
+}
+
+function _propertyGetter(name) {
+    let value = this.get_cached_property(name);
+    return value ? value.deep_unpack() : null;
+}
+
+function _propertySetter(value, name, signature) {
+    let variant = new GLib.Variant(signature, value);
+    this.set_cached_property(name, variant);
+
+    this.call('org.freedesktop.DBus.Properties.Set',
+              new GLib.Variant('(ssv)',
+                               [this.g_interface_name,
+                                name, variant]),
+              Gio.DBusCallFlags.NONE, -1, null,
+              Lang.bind(this, function(proxy, result) {
+                  try {
+                      this.call_finish(result);
+                  } catch(e) {
+                      log('Could not set property ' + name + ' on remote object ' +
+                          this.g_object_path + ': ' + e.message);
+                  }
+              }));
+}
+
+function _addDBusConvenience() {
+    let info = this.g_interface_info;
+    if (!info)
+        return;
+
+    if (info.signals.length > 0)
+        this.connect('g-signal', _convertToNativeSignal);
+
+    let i, methods = info.methods;
+    for (i = 0; i < methods.length; i++) {
+        var method = methods[i];
+        this[method.name + 'Remote'] = _makeProxyMethod(methods[i], false);
+        this[method.name + 'Sync'] = _makeProxyMethod(methods[i], true);
+    }
+
+    let properties = info.properties;
+    for (i = 0; i < properties.length; i++) {
+        let name = properties[i].name;
+        let signature = properties[i].signature;
+        Object.defineProperty(this, name, { get: Lang.bind(this, _propertyGetter, name),
+                                            set: Lang.bind(this, _propertySetter, name, signature),
+                                            configurable: true,
+                                            enumerable: true });
+    }
+}
+
+function _makeProxyWrapper(interfaceXml) {
+    var info = _newInterfaceInfo(interfaceXml);
+    var iname = info.name;
+    return function(bus, name, object, asyncCallback, cancellable) {
+        var obj = new Gio.DBusProxy({ g_connection: bus,
+                                      g_interface_name: iname,
+                                      g_interface_info: info,
+                                      g_name: name,
+                                      g_object_path: object });
+        if (!cancellable)
+            cancellable = null;
+        if (asyncCallback)
+            obj.init_async(GLib.PRIORITY_DEFAULT, cancellable, function(initable, result) {
+                let caughtErrorWhenInitting = null;
+                try {
+                    initable.init_finish(result);
+                } catch(e) {
+                    caughtErrorWhenInitting = e;
+                }
+
+                if (caughtErrorWhenInitting === null) {
+                    asyncCallback(initable, null);
+                } else {
+                    asyncCallback(null, caughtErrorWhenInitting);
+                }
+            });
+        else
+            obj.init(cancellable);
+        return obj;
+    };
+}
+
+
+function _newNodeInfo(constructor, value) {
+    if (typeof value == 'string')
+        return constructor(value);
+    else if (value instanceof XML)
+        return constructor(value.toXMLString());
+    else
+        throw TypeError('Invalid type ' + Object.prototype.toString.call(value));
+}
+
+function _newInterfaceInfo(value) {
+    var nodeInfo = Gio.DBusNodeInfo.new_for_xml(value);
+    return nodeInfo.interfaces[0];
+}
+
+function _injectToMethod(klass, method, addition) {
+    var previous = klass[method];
+
+    klass[method] = function() {
+        addition.apply(this, arguments);
+        return previous.apply(this, arguments);
+    };
+}
+
+function _wrapFunction(klass, method, addition) {
+    var previous = klass[method];
+
+    klass[method] = function() {
+        var args = Array.prototype.slice.call(arguments);
+        args.unshift(previous);
+        return addition.apply(this, args);
+    };
+}
+
+function _makeOutSignature(args) {
+    var ret = '(';
+    for (var i = 0; i < args.length; i++)
+        ret += args[i].signature;
+
+    return ret + ')';
+}
+
+function _handleMethodCall(info, impl, method_name, parameters, invocation) {
+    // prefer a sync version if available
+    if (this[method_name]) {
+        let retval;
+        try {
+            retval = this[method_name].apply(this, parameters.deep_unpack());
+        } catch (e) {
+            if (e instanceof GLib.Error) {
+                invocation.return_gerror(e);
+            } else {
+                let name = e.name;
+                if (name.indexOf('.') == -1) {
+                    // likely to be a normal JS error
+                    name = 'org.gnome.gjs.JSError.' + name;
+                }
+                logError(e, "Exception in method call: " + method_name);
+                invocation.return_dbus_error(name, e.message);
+            }
+            return;
+        }
+        if (retval === undefined) {
+            // undefined (no return value) is the empty tuple
+            retval = new GLib.Variant('()', []);
+        }
+        try {
+            if (!(retval instanceof GLib.Variant)) {
+                // attempt packing according to out signature
+                let methodInfo = info.lookup_method(method_name);
+                let outArgs = methodInfo.out_args;
+                let outSignature = _makeOutSignature(outArgs);
+                if (outArgs.length == 1) {
+                    // if one arg, we don't require the handler wrapping it
+                    // into an Array
+                    retval = [retval];
+                }
+                retval = new GLib.Variant(outSignature, retval);
+            }
+            invocation.return_value(retval);
+        } catch(e) {
+            // if we don't do this, the other side will never see a reply
+            invocation.return_dbus_error('org.gnome.gjs.JSError.ValueError',
+                                         "Service implementation returned an incorrect value type");
+        }
+    } else if (this[method_name + 'Async']) {
+        this[method_name + 'Async'](parameters.deep_unpack(), invocation);
+    } else {
+        log('Missing handler for DBus method ' + method_name);
+        invocation.return_gerror(new Gio.DBusError({ code: Gio.DBusError.UNKNOWN_METHOD,
+                                                     message: 'Method ' + method_name + ' is not implemented' }));
+    }
+}
+
+function _handlePropertyGet(info, impl, property_name) {
+    let propInfo = info.lookup_property(property_name);
+    let jsval = this[property_name];
+    if (jsval != undefined)
+        return new GLib.Variant(propInfo.signature, jsval);
+    else
+        return null;
+}
+
+function _handlePropertySet(info, impl, property_name, new_value) {
+    this[property_name] = new_value.deep_unpack();
+}
+
+function _wrapJSObject(interfaceInfo, jsObj) {
+    var info;
+    if (interfaceInfo instanceof Gio.DBusInterfaceInfo)
+        info = interfaceInfo;
+    else
+        info = Gio.DBusInterfaceInfo.new_for_xml(interfaceInfo);
+    info.cache_build();
+
+    var impl = new GjsPrivate.DBusImplementation({ g_interface_info: info });
+    impl.connect('handle-method-call', function(impl, method_name, parameters, invocation) {
+        return _handleMethodCall.call(jsObj, info, impl, method_name, parameters, invocation);
+    });
+    impl.connect('handle-property-get', function(impl, property_name) {
+        return _handlePropertyGet.call(jsObj, info, impl, property_name);
+    });
+    impl.connect('handle-property-set', function(impl, property_name, value) {
+        return _handlePropertySet.call(jsObj, info, impl, property_name, value);
+    });
+
+    return impl;
+}
+
+function _init() {
+    Gio = this;
+
+    Gio.DBus = {
+        get session() {
+            return Gio.bus_get_sync(Gio.BusType.SESSION, null);
+        },
+        get system() {
+            return Gio.bus_get_sync(Gio.BusType.SYSTEM, null);
+        },
+
+        // Namespace some functions
+        get:        Gio.bus_get,
+        get_finish: Gio.bus_get_finish,
+        get_sync:   Gio.bus_get_sync,
+
+        own_name:               Gio.bus_own_name,
+        own_name_on_connection: Gio.bus_own_name_on_connection,
+        unown_name:             Gio.bus_unown_name,
+
+        watch_name:               Gio.bus_watch_name,
+        watch_name_on_connection: Gio.bus_watch_name_on_connection,
+        unwatch_name:             Gio.bus_unwatch_name
+    };
+
+    Gio.DBusConnection.prototype.watch_name = function(name, flags, appeared, vanished) {
+        return Gio.bus_watch_name_on_connection(this, name, flags, appeared, vanished);
+    };
+    Gio.DBusConnection.prototype.unwatch_name = function(id) {
+        return Gio.bus_unwatch_name(id);
+    };
+    Gio.DBusConnection.prototype.own_name = function(name, flags, acquired, lost) {
+        return Gio.bus_own_name_on_connection(this, name, flags, acquired, lost);
+    };
+    Gio.DBusConnection.prototype.unown_name = function(id) {
+        return Gio.bus_unown_name(id);
+    };
+
+    _injectToMethod(Gio.DBusProxy.prototype, 'init', _addDBusConvenience);
+    _injectToMethod(Gio.DBusProxy.prototype, 'init_async', _addDBusConvenience);
+    Gio.DBusProxy.prototype.connectSignal = Signals._connect;
+    Gio.DBusProxy.prototype.disconnectSignal = Signals._disconnect;
+
+    Gio.DBusProxy.makeProxyWrapper = _makeProxyWrapper;
+
+    // Some helpers
+    _wrapFunction(Gio.DBusNodeInfo, 'new_for_xml', _newNodeInfo);
+    Gio.DBusInterfaceInfo.new_for_xml = _newInterfaceInfo;
+
+    Gio.DBusExportedObject = GjsPrivate.DBusImplementation;
+    Gio.DBusExportedObject.wrapJSObject = _wrapJSObject;
+}
diff --git a/jsextensions/gjs/Gtk.js b/jsextensions/gjs/Gtk.js
new file mode 100644
index 0000000..8a23977
--- /dev/null
+++ b/jsextensions/gjs/Gtk.js
@@ -0,0 +1,113 @@
+// application/javascript;version=1.8
+// Copyright 2013 Giovanni Campagna
+//
+// 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.
+
+const Lang = imports.lang;
+const GObject = imports.gi.GObject;
+
+var GjsPrivate = imports.gi.GjsPrivate;
+
+let Gtk;
+
+const GtkWidgetClass = new Lang.Class({
+    Name: 'GtkWidgetClass',
+    Extends: GObject.Class,
+
+    _init: function(params) {
+        let template = params.Template;
+        delete params.Template;
+
+        let children = params.Children;
+        delete params.Children;
+
+        let internalChildren = params.InternalChildren;
+        delete params.InternalChildren;
+
+        if (template) {
+            params._instance_init = function() {
+                this.init_template();
+            };
+        }
+
+        this.parent(params);
+
+        if (template) {
+            if (typeof template == 'string' &&
+                template.startsWith('resource:///'))
+                Gtk.Widget.set_template_from_resource.call(this, template.slice(11));
+            else
+                Gtk.Widget.set_template.call(this, template);
+        }
+
+        this.Template = template;
+        this.Children = children;
+        this.InternalChildren = internalChildren;
+
+        if (children) {
+            for (let i = 0; i < children.length; i++)
+                Gtk.Widget.bind_template_child_full.call(this, children[i], false, 0);
+        }
+
+        if (internalChildren) {
+            for (let i = 0; i < internalChildren.length; i++)
+                Gtk.Widget.bind_template_child_full.call(this, internalChildren[i], true, 0);
+        }
+    },
+
+    _isValidClass: function(klass) {
+        let proto = klass.prototype;
+
+        if (!proto)
+            return false;
+
+        // If proto == Gtk.Widget.prototype, then
+        // proto.__proto__ is GObject.InitiallyUnowned, so
+        // "proto instanceof Gtk.Widget"
+        // will return false.
+        return proto == Gtk.Widget.prototype ||
+            proto instanceof Gtk.Widget;
+    },
+});
+
+function _init() {
+
+    Gtk = this;
+
+    Gtk.Widget.prototype.__metaclass__ = GtkWidgetClass;
+    if (GjsPrivate.gtk_container_child_set_property) {
+        Gtk.Container.prototype.child_set_property = function(child, property, value) {
+            GjsPrivate.gtk_container_child_set_property(this, child, property, value);
+        };
+    }
+
+    Gtk.Widget.prototype._init = function(params) {
+        GObject.Object.prototype._init.call(this, params);
+
+        if (this.constructor.Template) {
+            let children = this.constructor.Children || [];
+            for (let child of children)
+                this[child.replace('-', '_', 'g')] = this.get_template_child(this.constructor, child);
+
+            let internalChildren = this.constructor.InternalChildren || [];
+            for (let child of internalChildren)
+                this['_' + child.replace('-', '_', 'g')] = this.get_template_child(this.constructor, child);
+        }
+    };
+}
diff --git a/jsextensions/libseed.gresources.xml b/jsextensions/libseed.gresources.xml
new file mode 100644
index 0000000..d6c2d64
--- /dev/null
+++ b/jsextensions/libseed.gresources.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/seed/extensions">
+	<file>Gio.js</file>
+	<file>GLib.js</file>
+	<file>Gtk.js</file>
+	<file>GObject.js</file>
+	<file>Gst.js</file>
+	<file>gjs/Gio.js</file>
+	<file>gjs/GLib.js</file>
+	<file>gjs/Gtk.js</file>
+	<file>gjs/GObject.js</file>
+	<file>Seed.js</file>
+	<file>Clutter.js</file>
+  </gresource>
+
+  <gresource prefix="/org/seed">
+	<file>repl.js</file>
+  </gresource>
+</gresources>
diff --git a/extensions/repl.js b/jsextensions/repl.js
index 6e80cf3..6e80cf3 100755
--- a/extensions/repl.js
+++ b/jsextensions/repl.js
diff --git a/libgjs-private/Makefile.am b/libgjs-private/Makefile.am
new file mode 100644
index 0000000..9d8bcc2
--- /dev/null
+++ b/libgjs-private/Makefile.am
@@ -0,0 +1,54 @@
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+
+lib_LTLIBRARIES = \
+	libseed_gjsprivate.la
+
+libgjs_private_source_files = \
+	gjs-gdbus-wrapper.c    \
+	gjs-gdbus-wrapper.h      \
+	gjs-util.c     \
+	gjs-util.h       \
+	gjs-gtk-util.h   \
+	gjs-gtk-util.c   \
+	$(NULL)
+
+libseed_gjsprivate_la_SOURCES = $(libgjs_private_source_files)
+
+AM_CPPFLAGS = \
+	-I@top_srcdir@/libseed/ \
+	$(GOBJECT_INTROSPECTION_CFLAGS) \
+	$(SEED_DEBUG_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(SEED_PROFILE_CFLAGS)
+
+libseed_gjsprivate_la_LDFLAGS = \
+	-module -avoid-version \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_gjsprivate_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(GTK_LIBS) \
+	$(SEED_PROFILE_LIBS)
+
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=@top_srcdir@ --add-include-path=$(GTK_CFLAGS) --warn-all
+INTROSPECTION_COMPILER_ARGS = \
+	--includedir=@top_srcdir@
+
+GjsPrivate-1.0.gir: libseed_gjsprivate.la
+GjsPrivate_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+GjsPrivate_1_0_gir_CFLAGS = $(INCLUDES)
+GjsPrivate_1_0_gir_LIBS = libseed_gjsprivate.la
+GjsPrivate_1_0_gir_FILES = $(libgjs_private_source_files)
+INTROSPECTION_GIRS += GjsPrivate-1.0.gir
+
+GjsPrivate_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gjs --symbol-prefix=gjs_ --warn-all
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(pkglibdir)@SEED_GTK_VERSION@/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
+
diff --git a/libgjs-private/Makefile.in b/libgjs-private/Makefile.in
new file mode 100644
index 0000000..fe8513e
--- /dev/null
+++ b/libgjs-private/Makefile.in
@@ -0,0 +1,856 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = libgjs-private
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+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__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
+	"$(DESTDIR)$(typelibdir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libseed_gjsprivate_la_DEPENDENCIES =  \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__objects_1 = gjs-gdbus-wrapper.lo gjs-util.lo gjs-gtk-util.lo
+am_libseed_gjsprivate_la_OBJECTS = $(am__objects_1)
+libseed_gjsprivate_la_OBJECTS = $(am_libseed_gjsprivate_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libseed_gjsprivate_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libseed_gjsprivate_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libseed_gjsprivate_la_SOURCES)
+DIST_SOURCES = $(libseed_gjsprivate_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(gir_DATA) $(typelib_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CAIRO_MODULE = @BUILD_CAIRO_MODULE@
+BUILD_CANVAS_MODULE = @BUILD_CANVAS_MODULE@
+BUILD_DBUS_MODULE = @BUILD_DBUS_MODULE@
+BUILD_DYNAMICOBJECT_MODULE = @BUILD_DYNAMICOBJECT_MODULE@
+BUILD_EXAMPLE_MODULE = @BUILD_EXAMPLE_MODULE@
+BUILD_FFI_MODULE = @BUILD_FFI_MODULE@
+BUILD_GETTEXT_MODULE = @BUILD_GETTEXT_MODULE@
+BUILD_GTKBUILDER_MODULE = @BUILD_GTKBUILDER_MODULE@
+BUILD_LIBXML_MODULE = @BUILD_LIBXML_MODULE@
+BUILD_MPFR_MODULE = @BUILD_MPFR_MODULE@
+BUILD_MULTIPROCESSING_MODULE = @BUILD_MULTIPROCESSING_MODULE@
+BUILD_OS_MODULE = @BUILD_OS_MODULE@
+BUILD_READLINE_MODULE = @BUILD_READLINE_MODULE@
+BUILD_SQLITE_MODULE = @BUILD_SQLITE_MODULE@
+BUILD_XORG_MODULE = @BUILD_XORG_MODULE@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
+DBUSGLIB_LDFLAGS = @DBUSGLIB_LDFLAGS@
+DBUSGLIB_LIBS = @DBUSGLIB_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LDFLAGS = @DBUS_LDFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+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_LDFLAGS = @FFI_LDFLAGS@
+FFI_LIBS = @FFI_LIBS@
+FGREP = @FGREP@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LDFLAGS = @GDK_LDFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
+GNOME_JS_DIR = @GNOME_JS_DIR@
+GNOME_JS_LIBS = @GNOME_JS_LIBS@
+GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
+GOBJECT_INTROSPECTION_LDFLAGS = @GOBJECT_INTROSPECTION_LDFLAGS@
+GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
+GOBJECT_INTROSPECTION_VERSION = @GOBJECT_INTROSPECTION_VERSION@
+GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LDFLAGS = @GTK_LDFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LDFLAGS = @LIBXML_LDFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXSS_CFLAGS = @LIBXSS_CFLAGS@
+LIBXSS_LIBS = @LIBXSS_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SEED_DEBUG_CFLAGS = @SEED_DEBUG_CFLAGS@
+SEED_GTK_VERSION = @SEED_GTK_VERSION@
+SEED_PROFILE_CFLAGS = @SEED_PROFILE_CFLAGS@
+SEED_PROFILE_LIBS = @SEED_PROFILE_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LDFLAGS = @WEBKIT_LDFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_PC = @WEBKIT_PC@
+XGETTEXT = @XGETTEXT@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+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@
+INTROSPECTION_GIRS = GjsPrivate-1.0.gir
+lib_LTLIBRARIES = \
+	libseed_gjsprivate.la
+
+libgjs_private_source_files = \
+	gjs-gdbus-wrapper.c    \
+	gjs-gdbus-wrapper.h      \
+	gjs-util.c     \
+	gjs-util.h       \
+	gjs-gtk-util.h   \
+	gjs-gtk-util.c   \
+	$(NULL)
+
+libseed_gjsprivate_la_SOURCES = $(libgjs_private_source_files)
+AM_CPPFLAGS = \
+	-I@top_srcdir@/libseed/ \
+	$(GOBJECT_INTROSPECTION_CFLAGS) \
+	$(SEED_DEBUG_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(SEED_PROFILE_CFLAGS)
+
+libseed_gjsprivate_la_LDFLAGS = \
+	-module -avoid-version \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_gjsprivate_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(GTK_LIBS) \
+	$(SEED_PROFILE_LIBS)
+
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=@top_srcdir@ --add-include-path=$(GTK_CFLAGS) --warn-all
+
+INTROSPECTION_COMPILER_ARGS = \
+	--includedir=@top_srcdir@
+
+GjsPrivate_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+GjsPrivate_1_0_gir_CFLAGS = $(INCLUDES)
+GjsPrivate_1_0_gir_LIBS = libseed_gjsprivate.la
+GjsPrivate_1_0_gir_FILES = $(libgjs_private_source_files)
+GjsPrivate_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gjs --symbol-prefix=gjs_ --warn-all
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+typelibdir = $(pkglibdir)@SEED_GTK_VERSION@/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgjs-private/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgjs-private/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libseed_gjsprivate.la: $(libseed_gjsprivate_la_OBJECTS) $(libseed_gjsprivate_la_DEPENDENCIES) $(EXTRA_libseed_gjsprivate_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libseed_gjsprivate_la_LINK) -rpath $(libdir) $(libseed_gjsprivate_la_OBJECTS) $(libseed_gjsprivate_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gjs-gdbus-wrapper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gjs-gtk-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gjs-util.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-girDATA: $(gir_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
+	done
+
+uninstall-girDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
+install-typelibDATA: $(typelib_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \
+	done
+
+uninstall-typelibDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  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 $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)"; 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:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+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-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-girDATA install-typelibDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+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 -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
+	uninstall-typelibDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-girDATA install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip install-typelibDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-girDATA \
+	uninstall-libLTLIBRARIES uninstall-typelibDATA
+
+.PRECIOUS: Makefile
+
+-include $(INTROSPECTION_MAKEFILE)
+
+GjsPrivate-1.0.gir: libseed_gjsprivate.la
+
+# 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/libgjs-private/gjs-gdbus-wrapper.c b/libgjs-private/gjs-gdbus-wrapper.c
new file mode 100644
index 0000000..f01d629
--- /dev/null
+++ b/libgjs-private/gjs-gdbus-wrapper.c
@@ -0,0 +1,336 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* Copyright 2011 Giovanni Campagna. All Rights Reserved. */
+
+#include <config.h>
+#include <string.h>
+
+#include "gjs-gdbus-wrapper.h"
+
+enum
+{
+    PROP_0,
+    PROP_G_INTERFACE_INFO,
+    PROP_LAST
+};
+
+enum
+{
+    SIGNAL_HANDLE_METHOD,
+    SIGNAL_HANDLE_PROPERTY_GET,
+    SIGNAL_HANDLE_PROPERTY_SET,
+    SIGNAL_LAST,
+};
+
+static guint signals[SIGNAL_LAST];
+
+struct _GjsDBusImplementationPrivate
+{
+    GDBusInterfaceVTable vtable;
+    GDBusInterfaceInfo* ifaceinfo;
+
+    // from gchar* to GVariant*
+    GHashTable* outstanding_properties;
+    guint idle_id;
+};
+
+G_DEFINE_TYPE(GjsDBusImplementation,
+              gjs_dbus_implementation,
+              G_TYPE_DBUS_INTERFACE_SKELETON)
+
+static void
+gjs_dbus_implementation_method_call(GDBusConnection* connection,
+                                    const char* sender,
+                                    const char* object_path,
+                                    const char* interface_name,
+                                    const char* method_name,
+                                    GVariant* parameters,
+                                    GDBusMethodInvocation* invocation,
+                                    gpointer user_data)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(user_data);
+
+    g_signal_emit(self, signals[SIGNAL_HANDLE_METHOD], 0, method_name,
+                  parameters, invocation);
+    g_object_unref(invocation);
+}
+
+static GVariant*
+gjs_dbus_implementation_property_get(GDBusConnection* connection,
+                                     const char* sender,
+                                     const char* object_path,
+                                     const char* interface_name,
+                                     const char* property_name,
+                                     GError** error,
+                                     gpointer user_data)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(user_data);
+    GVariant* value;
+
+    g_signal_emit(self, signals[SIGNAL_HANDLE_PROPERTY_GET], 0, property_name,
+                  &value);
+
+    /* Marshaling GErrors is not supported, so this is the best we can do
+       (GIO will assert if value is NULL and error is not set) */
+    if (!value)
+        g_set_error(error, g_quark_from_static_string("gjs-error-domain"), 0,
+                    "Property retrieval failed");
+
+    return value;
+}
+
+static gboolean
+gjs_dbus_implementation_property_set(GDBusConnection* connection,
+                                     const char* sender,
+                                     const char* object_path,
+                                     const char* interface_name,
+                                     const char* property_name,
+                                     GVariant* value,
+                                     GError** error,
+                                     gpointer user_data)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(user_data);
+
+    g_signal_emit(self, signals[SIGNAL_HANDLE_PROPERTY_SET], 0, property_name,
+                  value);
+
+    return TRUE;
+}
+
+static void
+gjs_dbus_implementation_init(GjsDBusImplementation* self)
+{
+    GjsDBusImplementationPrivate* priv
+      = G_TYPE_INSTANCE_GET_PRIVATE(self, GJS_TYPE_DBUS_IMPLEMENTATION,
+                                    GjsDBusImplementationPrivate);
+
+    self->priv = priv;
+
+    priv->vtable.method_call = gjs_dbus_implementation_method_call;
+    priv->vtable.get_property = gjs_dbus_implementation_property_get;
+    priv->vtable.set_property = gjs_dbus_implementation_property_set;
+
+    priv->outstanding_properties
+      = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+                              (GDestroyNotify) g_variant_unref);
+}
+
+static void
+gjs_dbus_implementation_finalize(GObject* object)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(object);
+
+    g_dbus_interface_info_unref(self->priv->ifaceinfo);
+    g_hash_table_unref(self->priv->outstanding_properties);
+
+    G_OBJECT_CLASS(gjs_dbus_implementation_parent_class)->finalize(object);
+}
+
+static void
+gjs_dbus_implementation_set_property(GObject* object,
+                                     guint property_id,
+                                     const GValue* value,
+                                     GParamSpec* pspec)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(object);
+
+    switch (property_id) {
+        case PROP_G_INTERFACE_INFO:
+            self->priv->ifaceinfo
+              = (GDBusInterfaceInfo*) g_value_dup_boxed(value);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    }
+}
+
+static GDBusInterfaceInfo*
+gjs_dbus_implementation_get_info(GDBusInterfaceSkeleton* skeleton)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(skeleton);
+
+    return self->priv->ifaceinfo;
+}
+
+static GDBusInterfaceVTable*
+gjs_dbus_implementation_get_vtable(GDBusInterfaceSkeleton* skeleton)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(skeleton);
+
+    return &(self->priv->vtable);
+}
+
+static GVariant*
+gjs_dbus_implementation_get_properties(GDBusInterfaceSkeleton* skeleton)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(skeleton);
+
+    GDBusInterfaceInfo* info = self->priv->ifaceinfo;
+    GDBusPropertyInfo** props;
+    GVariantBuilder builder;
+
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+
+    for (props = info->properties; *props; ++props) {
+        GDBusPropertyInfo* prop = *props;
+        GVariant* value;
+
+        /* If we have a cached value, we use that instead of querying again */
+        if ((value = (GVariant*) g_hash_table_lookup(
+               self->priv->outstanding_properties, prop->name))) {
+            g_variant_builder_add(&builder, "{sv}", prop->name, value);
+            continue;
+        }
+
+        g_signal_emit(self, signals[SIGNAL_HANDLE_PROPERTY_GET], 0, prop->name,
+                      &value);
+        g_variant_builder_add(&builder, "{sv}", prop->name, value);
+    }
+
+    return g_variant_builder_end(&builder);
+}
+
+static void
+gjs_dbus_implementation_flush(GDBusInterfaceSkeleton* skeleton)
+{
+    GjsDBusImplementation* self = GJS_DBUS_IMPLEMENTATION(skeleton);
+
+    GVariantBuilder changed_props;
+    GVariantBuilder invalidated_props;
+    GHashTableIter iter;
+    GVariant* val;
+    gchar* prop_name;
+
+    g_variant_builder_init(&changed_props, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_init(&invalidated_props, G_VARIANT_TYPE_STRING_ARRAY);
+
+    g_hash_table_iter_init(&iter, self->priv->outstanding_properties);
+    while (g_hash_table_iter_next(&iter, (void**) &prop_name, (void**) &val)) {
+        if (val)
+            g_variant_builder_add(&changed_props, "{sv}", prop_name, val);
+        else
+            g_variant_builder_add(&invalidated_props, "s", prop_name);
+    }
+
+    g_dbus_connection_emit_signal(
+      g_dbus_interface_skeleton_get_connection(skeleton), NULL, /* bus name */
+      g_dbus_interface_skeleton_get_object_path(skeleton),
+      "org.freedesktop.DBus.Properties", "PropertiesChanged",
+      g_variant_new("(s@a{sv}@as)", self->priv->ifaceinfo->name,
+                    g_variant_builder_end(&changed_props),
+                    g_variant_builder_end(&invalidated_props)),
+      NULL /* error */);
+
+    g_hash_table_remove_all(self->priv->outstanding_properties);
+    if (self->priv->idle_id) {
+        g_source_remove(self->priv->idle_id);
+        self->priv->idle_id = 0;
+    }
+}
+
+void
+gjs_dbus_implementation_class_init(GjsDBusImplementationClass* klass)
+{
+    GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
+    GDBusInterfaceSkeletonClass* skeleton_class
+      = G_DBUS_INTERFACE_SKELETON_CLASS(klass);
+
+    g_type_class_add_private(klass, sizeof(GjsDBusImplementationPrivate));
+
+    gobject_class->finalize = gjs_dbus_implementation_finalize;
+    gobject_class->set_property = gjs_dbus_implementation_set_property;
+
+    skeleton_class->get_info = gjs_dbus_implementation_get_info;
+    skeleton_class->get_vtable = gjs_dbus_implementation_get_vtable;
+    skeleton_class->get_properties = gjs_dbus_implementation_get_properties;
+    skeleton_class->flush = gjs_dbus_implementation_flush;
+
+    g_object_class_install_property(
+      gobject_class, PROP_G_INTERFACE_INFO,
+      g_param_spec_boxed("g-interface-info", "Interface Info",
+                         "A DBusInterfaceInfo representing the exported object",
+                         G_TYPE_DBUS_INTERFACE_INFO,
+                         (GParamFlags)(G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE
+                                       | G_PARAM_CONSTRUCT_ONLY)));
+
+    signals[SIGNAL_HANDLE_METHOD]
+      = g_signal_new("handle-method-call", G_TYPE_FROM_CLASS(klass),
+                     (GSignalFlags) 0,              /* flags */
+                     0,                             /* closure */
+                     NULL,                          /* accumulator */
+                     NULL,                          /* accumulator data */
+                     NULL,                          /* C marshal */
+                     G_TYPE_NONE, 3, G_TYPE_STRING, /* method name */
+                     G_TYPE_VARIANT,                /* parameters */
+                     G_TYPE_DBUS_METHOD_INVOCATION);
+
+    signals[SIGNAL_HANDLE_PROPERTY_GET]
+      = g_signal_new("handle-property-get", G_TYPE_FROM_CLASS(klass),
+                     (GSignalFlags) 0, /* flags */
+                     0,                /* closure */
+                     g_signal_accumulator_first_wins,
+                     NULL, /* accumulator data */
+                     NULL, /* C marshal */
+                     G_TYPE_VARIANT, 1, G_TYPE_STRING /* property name */);
+
+    signals[SIGNAL_HANDLE_PROPERTY_SET]
+      = g_signal_new("handle-property-set", G_TYPE_FROM_CLASS(klass),
+                     (GSignalFlags) 0,              /* flags */
+                     0,                             /* closure */
+                     NULL,                          /* accumulator */
+                     NULL,                          /* accumulator data */
+                     NULL,                          /* C marshal */
+                     G_TYPE_NONE, 2, G_TYPE_STRING, /* property name */
+                     G_TYPE_VARIANT /* parameters */);
+}
+
+static gboolean
+idle_cb(gpointer data)
+{
+    GDBusInterfaceSkeleton* skeleton = G_DBUS_INTERFACE_SKELETON(data);
+
+    g_dbus_interface_skeleton_flush(skeleton);
+    return FALSE;
+}
+
+/**
+ * gjs_dbus_implementation_emit_property_changed:
+ * @self: a #GjsDBusImplementation
+ * @property: the name of the property that changed
+ * @newvalue: (allow-none): the new value, or %NULL to just invalidate it
+ *
+ * Queue a PropertyChanged signal for emission, or update the one queued
+ * adding @property
+ */
+void
+gjs_dbus_implementation_emit_property_changed(GjsDBusImplementation* self,
+                                              gchar* property,
+                                              GVariant* newvalue)
+{
+    g_hash_table_replace(self->priv->outstanding_properties, g_strdup(property),
+                         g_variant_ref(newvalue));
+
+    if (!self->priv->idle_id)
+        self->priv->idle_id = g_idle_add(idle_cb, self);
+}
+
+/**
+ * gjs_dbus_implementation_emit_signal:
+ * @self: a #GjsDBusImplementation
+ * @signal_name: the name of the signal
+ * @parameters: (allow-none): signal parameters, or %NULL for none
+ *
+ * Emits a signal named @signal_name from the object and interface represented
+ * by @self. This signal has no destination.
+ */
+void
+gjs_dbus_implementation_emit_signal(GjsDBusImplementation* self,
+                                    gchar* signal_name,
+                                    GVariant* parameters)
+{
+    GDBusInterfaceSkeleton* skeleton = G_DBUS_INTERFACE_SKELETON(self);
+
+    g_dbus_connection_emit_signal(
+      g_dbus_interface_skeleton_get_connection(skeleton), NULL,
+      g_dbus_interface_skeleton_get_object_path(skeleton),
+      self->priv->ifaceinfo->name, signal_name, parameters, NULL);
+}
diff --git a/libgjs-private/gjs-gdbus-wrapper.h b/libgjs-private/gjs-gdbus-wrapper.h
new file mode 100644
index 0000000..3d55b09
--- /dev/null
+++ b/libgjs-private/gjs-gdbus-wrapper.h
@@ -0,0 +1,74 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* Copyright 2011 Giovanni Campagna
+ *
+ * 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.
+ */
+
+#ifndef __GJS_UTIL_DBUS_H__
+#define __GJS_UTIL_DBUS_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GjsDBusImplementation GjsDBusImplementation;
+typedef struct _GjsDBusImplementationClass GjsDBusImplementationClass;
+typedef struct _GjsDBusImplementationPrivate GjsDBusImplementationPrivate;
+
+#define GJS_TYPE_DBUS_IMPLEMENTATION (gjs_dbus_implementation_get_type())
+#define GJS_DBUS_IMPLEMENTATION(object)                                        \
+    (G_TYPE_CHECK_INSTANCE_CAST((object), GJS_TYPE_DBUS_IMPLEMENTATION,        \
+                                GjsDBusImplementation))
+#define GJS_DBUS_IMPLEMENTATION_CLASS(klass)                                   \
+    (G_TYPE_CHECK_CLASS_CAST((klass), GJS_TYPE_DBUS_IMPLEMENTATION,            \
+                             GjsDBusImplementationClass))
+#define GJS_IS_DBUS_IMPLEMENTATION(object)                                     \
+    (G_TYPE_CHECK_INSTANCE_TYPE((object), GJS_TYPE_DBUS_IMPLEMENTATION))
+#define GJS_IS_DBUS_IMPLEMENTATION_CLASS(klass)                                \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), GJS_TYPE_DBUS_IMPLEMENTATION))
+#define GJS_DBUS_IMPLEMENTATION_GET_CLASS(obj)                                 \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), GJS_TYPE_DBUS_IMPLEMENTATION,            \
+                               GjsDBusImplementationClass))
+
+struct _GjsDBusImplementation
+{
+    GDBusInterfaceSkeleton parent;
+
+    GjsDBusImplementationPrivate* priv;
+};
+
+struct _GjsDBusImplementationClass
+{
+    GDBusInterfaceSkeletonClass parent_class;
+};
+
+GType gjs_dbus_implementation_get_type(void);
+
+void gjs_dbus_implementation_emit_property_changed(GjsDBusImplementation* self,
+                                                   gchar* property,
+                                                   GVariant* newvalue);
+void gjs_dbus_implementation_emit_signal(GjsDBusImplementation* self,
+                                         gchar* signal_name,
+                                         GVariant* parameters);
+
+G_END_DECLS
+
+#endif /* __GJS_UTIL_DBUS_H__ */
diff --git a/libgjs-private/gjs-gtk-util.c b/libgjs-private/gjs-gtk-util.c
new file mode 100644
index 0000000..4a6cebf
--- /dev/null
+++ b/libgjs-private/gjs-gtk-util.c
@@ -0,0 +1,63 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* Copyright 2014 Endless Mobile, Inc.
+ *
+ * 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 <config.h>
+#include <gtk/gtk.h>
+
+#include "gjs-gtk-util.h"
+
+void
+gjs_gtk_container_child_set_property(GtkContainer* container,
+                                     GtkWidget* child,
+                                     const gchar* property,
+                                     const GValue* value)
+{
+    GParamSpec* pspec;
+
+    pspec
+      = gtk_container_class_find_child_property(G_OBJECT_GET_CLASS(container),
+                                                property);
+    if (pspec == NULL) {
+        g_warning("%s does not have a property called %s",
+                  g_type_name(G_OBJECT_TYPE(container)), property);
+        return;
+    }
+
+    if ((G_VALUE_TYPE(value) == G_TYPE_POINTER)
+        && (g_value_get_pointer(value) == NULL)
+        && !g_value_type_transformable(G_VALUE_TYPE(value),
+                                       pspec->value_type)) {
+        /* Set an empty value. This will happen when we set a NULL value from
+         * JS.
+         * Since GJS doesn't know the GParamSpec for this property, it
+         * will just put NULL into a G_TYPE_POINTER GValue, which will later
+         * fail when trying to transform it to the GParamSpec's GType.
+         */
+        GValue null_value = G_VALUE_INIT;
+        g_value_init(&null_value, pspec->value_type);
+        gtk_container_child_set_property(container, child, property,
+                                         &null_value);
+        g_value_unset(&null_value);
+    } else {
+        gtk_container_child_set_property(container, child, property, value);
+    }
+}
diff --git a/libgjs-private/gjs-gtk-util.h b/libgjs-private/gjs-gtk-util.h
new file mode 100644
index 0000000..0f048aa
--- /dev/null
+++ b/libgjs-private/gjs-gtk-util.h
@@ -0,0 +1,37 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* Copyright 2014 Endless Mobile, Inc.
+ *
+ * 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.
+ */
+
+#ifndef __GJS_PRIVATE_GTK_UTIL_H__
+#define __GJS_PRIVATE_GTK_UTIL_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+void gjs_gtk_container_child_set_property(GtkContainer* container,
+                                          GtkWidget* child,
+                                          const gchar* property,
+                                          const GValue* value);
+
+G_END_DECLS
+
+#endif /* __GJS_PRIVATE_GTK_UTIL_H__ */
diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
new file mode 100644
index 0000000..9bda1c9
--- /dev/null
+++ b/libgjs-private/gjs-util.c
@@ -0,0 +1,110 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* Copyright 2012 Giovanni Campagna <scampa.giovanni@gmail.com>
+ *
+ * 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 <config.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include "gjs-util.h"
+
+char*
+gjs_format_int_alternative_output(int n)
+{
+    return g_strdup_printf("%Id", n);
+}
+
+GType
+gjs_locale_category_get_type(void)
+{
+    static volatile size_t g_define_type_id__volatile = 0;
+    if (g_once_init_enter(&g_define_type_id__volatile)) {
+        static const GEnumValue v[]
+          = { { GJS_LOCALE_CATEGORY_ALL, "GJS_LOCALE_CATEGORY_ALL", "all" },
+              { GJS_LOCALE_CATEGORY_COLLATE, "GJS_LOCALE_CATEGORY_COLLATE",
+                "collate" },
+              { GJS_LOCALE_CATEGORY_CTYPE, "GJS_LOCALE_CATEGORY_CTYPE",
+                "ctype" },
+              { GJS_LOCALE_CATEGORY_MESSAGES, "GJS_LOCALE_CATEGORY_MESSAGES",
+                "messages" },
+              { GJS_LOCALE_CATEGORY_MONETARY, "GJS_LOCALE_CATEGORY_MONETARY",
+                "monetary" },
+              { GJS_LOCALE_CATEGORY_NUMERIC, "GJS_LOCALE_CATEGORY_NUMERIC",
+                "numeric" },
+              { GJS_LOCALE_CATEGORY_TIME, "GJS_LOCALE_CATEGORY_TIME", "time" },
+              { 0, NULL, NULL } };
+        GType g_define_type_id
+          = g_enum_register_static(g_intern_static_string("GjsLocaleCategory"),
+                                   v);
+
+        g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);
+    }
+    return g_define_type_id__volatile;
+}
+
+/**
+ * gjs_setlocale:
+ * @category:
+ * @locale: (allow-none):
+ *
+ * Returns:
+ */
+const char*
+gjs_setlocale(GjsLocaleCategory category, const char* locale)
+{
+    /* According to man setlocale(3), the return value may be allocated in
+     * static storage. */
+    return (const char*) setlocale(category, locale);
+}
+
+void
+gjs_textdomain(const char* domain)
+{
+    textdomain(domain);
+}
+
+void
+gjs_bindtextdomain(const char* domain, const char* location)
+{
+    bindtextdomain(domain, location);
+    /* Always use UTF-8; we assume it internally here */
+    bind_textdomain_codeset(domain, "UTF-8");
+}
+
+GParamFlags
+gjs_param_spec_get_flags(GParamSpec* pspec)
+{
+    return pspec->flags;
+}
+
+GType
+gjs_param_spec_get_value_type(GParamSpec* pspec)
+{
+    return pspec->value_type;
+}
+
+GType
+gjs_param_spec_get_owner_type(GParamSpec* pspec)
+{
+    return pspec->owner_type;
+}
diff --git a/libgjs-private/gjs-util.h b/libgjs-private/gjs-util.h
new file mode 100644
index 0000000..ae09733
--- /dev/null
+++ b/libgjs-private/gjs-util.h
@@ -0,0 +1,58 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/* Copyright 2012 Giovanni Campagna <scampa.giovanni@gmail.com>
+ *
+ * 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.
+ */
+
+#ifndef __GJS_PRIVATE_UTIL_H__
+#define __GJS_PRIVATE_UTIL_H__
+
+#include <locale.h>
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* For imports.format */
+char* gjs_format_int_alternative_output(int n);
+
+/* For imports.gettext */
+typedef enum {
+    GJS_LOCALE_CATEGORY_ALL = LC_ALL,
+    GJS_LOCALE_CATEGORY_COLLATE = LC_COLLATE,
+    GJS_LOCALE_CATEGORY_CTYPE = LC_CTYPE,
+    GJS_LOCALE_CATEGORY_MESSAGES = LC_MESSAGES,
+    GJS_LOCALE_CATEGORY_MONETARY = LC_MONETARY,
+    GJS_LOCALE_CATEGORY_NUMERIC = LC_NUMERIC,
+    GJS_LOCALE_CATEGORY_TIME = LC_TIME
+} GjsLocaleCategory;
+
+const char* gjs_setlocale(GjsLocaleCategory category, const char* locale);
+void gjs_textdomain(const char* domain);
+void gjs_bindtextdomain(const char* domain, const char* location);
+GType gjs_locale_category_get_type(void) G_GNUC_CONST;
+
+/* For imports.overrides.GObject */
+GParamFlags gjs_param_spec_get_flags(GParamSpec* pspec);
+GType gjs_param_spec_get_value_type(GParamSpec* pspec);
+GType gjs_param_spec_get_owner_type(GParamSpec* pspec);
+
+G_END_DECLS
+
+#endif
diff --git a/libseed/Makefile.am b/libseed/Makefile.am
index 5ff186b..9e056d2 100644
--- a/libseed/Makefile.am
+++ b/libseed/Makefile.am
@@ -25,18 +25,24 @@ libseed@SEED_GTK_VERSION@_la_SOURCES = \
 	seed-importer.h \
 	seed-path.h
 
+nodist_libseed@SEED_GTK_VERSION@_la_SOURCES = \
+	../jsextensions/libseed-resources.c
+
+
 libseed@SEED_GTK_VERSION@_la_CFLAGS = \
 	-Wall \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	$(WEBKIT_CFLAGS) \
 	$(SEED_OSX_CFLAGS) \
 	$(SEED_DEBUG_CFLAGS) \
+	$(SEED_GJSCOMPAT_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS) \
 	$(FFI_CFLAGS) \
 	-DGOBJECT_INTROSPECTION_VERSION=$(GOBJECT_INTROSPECTION_VERSION)
 
 libseed@SEED_GTK_VERSION@_la_LDFLAGS = \
-	$(FFI_LDFLAGS)
+	$(FFI_LDFLAGS) \
+	-export-symbols-regex "^seed_.*"
 
 libseed@SEED_GTK_VERSION@_la_LIBADD = \
 	$(GOBJECT_INTROSPECTION_LIBS) \
@@ -44,7 +50,8 @@ libseed@SEED_GTK_VERSION@_la_LIBADD = \
 	$(SEED_PROFILE_LIBS) \
 	$(SEED_OSX_LIBS) \
 	$(GIO_LIBS) \
-	$(FFI_LIBS) -ldl
+	$(GMODULE_LIBS) \
+	$(FFI_LIBS) $(LIBDL)
 
 seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
 
diff --git a/libseed/Makefile.in b/libseed/Makefile.in
index e12fbcf..d6d5cb3 100644
--- a/libseed/Makefile.in
+++ b/libseed/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 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.
@@ -17,23 +16,61 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,13 +90,17 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libseed
-DIST_COMMON = $(seedheaders_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/seed-path.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(seedheaders_HEADERS) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = seed-path.h
 CONFIG_CLEAN_VPATH_FILES =
@@ -95,6 +136,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libseed@SEED_GTK_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libseed@SEED_GTK_VERSION@_la_OBJECTS =  \
 	libseed@SEED_GTK_VERSION@_la-seed-closure.lo \
@@ -107,15 +149,31 @@ am_libseed@SEED_GTK_VERSION@_la_OBJECTS =  \
 	libseed@SEED_GTK_VERSION@_la-seed-gtype.lo \
 	libseed@SEED_GTK_VERSION@_la-seed-types.lo \
 	libseed@SEED_GTK_VERSION@_la-seed-importer.lo
+nodist_libseed@SEED_GTK_VERSION@_la_OBJECTS =  \
+	libseed@SEED_GTK_VERSION@_la-libseed-resources.lo
 libseed@SEED_GTK_VERSION@_la_OBJECTS =  \
-	$(am_libseed@SEED_GTK_VERSION@_la_OBJECTS)
+	$(am_libseed@SEED_GTK_VERSION@_la_OBJECTS) \
+	$(nodist_libseed@SEED_GTK_VERSION@_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed@SEED_GTK_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed@SEED_GTK_VERSION@_la_CFLAGS) $(CFLAGS) \
 	$(libseed@SEED_GTK_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -128,21 +186,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libseed@SEED_GTK_VERSION@_la_SOURCES)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libseed@SEED_GTK_VERSION@_la_SOURCES) \
+	$(nodist_libseed@SEED_GTK_VERSION@_la_SOURCES)
 DIST_SOURCES = $(libseed@SEED_GTK_VERSION@_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -150,8 +205,27 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(seedheaders_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/seed-path.h.in \
+	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -215,6 +289,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -228,6 +304,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -251,8 +328,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -264,6 +350,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -358,6 +445,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -393,18 +481,23 @@ libseed@SEED_GTK_VERSION@_la_SOURCES = \
 	seed-importer.h \
 	seed-path.h
 
+nodist_libseed@SEED_GTK_VERSION@_la_SOURCES = \
+	../jsextensions/libseed-resources.c
+
 libseed@SEED_GTK_VERSION@_la_CFLAGS = \
 	-Wall \
 	$(GOBJECT_INTROSPECTION_CFLAGS) \
 	$(WEBKIT_CFLAGS) \
 	$(SEED_OSX_CFLAGS) \
 	$(SEED_DEBUG_CFLAGS) \
+	$(SEED_GJSCOMPAT_CFLAGS) \
 	$(SEED_PROFILE_CFLAGS) \
 	$(FFI_CFLAGS) \
 	-DGOBJECT_INTROSPECTION_VERSION=$(GOBJECT_INTROSPECTION_VERSION)
 
 libseed@SEED_GTK_VERSION@_la_LDFLAGS = \
-	$(FFI_LDFLAGS)
+	$(FFI_LDFLAGS) \
+	-export-symbols-regex "^seed_.*"
 
 libseed@SEED_GTK_VERSION@_la_LIBADD = \
 	$(GOBJECT_INTROSPECTION_LIBS) \
@@ -412,7 +505,8 @@ libseed@SEED_GTK_VERSION@_la_LIBADD = \
 	$(SEED_PROFILE_LIBS) \
 	$(SEED_OSX_LIBS) \
 	$(GIO_LIBS) \
-	$(FFI_LIBS) -ldl
+	$(GMODULE_LIBS) \
+	$(FFI_LIBS) $(LIBDL)
 
 seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
 seedheadersdir = $(pkgincludedir)@SEED_GTK_VERSION@
@@ -432,7 +526,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libseed/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu libseed/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -452,6 +545,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 seed-path.h: $(top_builddir)/config.status $(srcdir)/seed-path.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -478,12 +572,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed@SEED_GTK_VERSION@.la: $(libseed@SEED_GTK_VERSION@_la_OBJECTS) $(libseed@SEED_GTK_VERSION@_la_DEPENDENCIES) $(EXTRA_libseed@SEED_GTK_VERSION@_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed@SEED_GTK_VERSION@_la_LINK) -rpath $(libdir) $(libseed@SEED_GTK_VERSION@_la_OBJECTS) $(libseed@SEED_GTK_VERSION@_la_LIBADD) $(LIBS)
 
@@ -493,6 +590,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libseed@SEED_GTK_VERSION@_la-libseed-resources.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libseed@SEED_GTK_VERSION@_la-seed-api.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libseed@SEED_GTK_VERSION@_la-seed-builtins.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libseed@SEED_GTK_VERSION@_la-seed-closure.Plo@am__quote@
@@ -509,14 +607,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -595,6 +693,13 @@ libseed@SEED_GTK_VERSION@_la-seed-importer.lo: seed-importer.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseed@SEED_GTK_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libseed@SEED_GTK_VERSION@_la-seed-importer.lo `test -f 'seed-importer.c' || echo '$(srcdir)/'`seed-importer.c
 
+libseed@SEED_GTK_VERSION@_la-libseed-resources.lo: ../jsextensions/libseed-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseed@SEED_GTK_VERSION@_la_CFLAGS) $(CFLAGS) -MT libseed@SEED_GTK_VERSION@_la-libseed-resources.lo -MD -MP -MF $(DEPDIR)/libseed@SEED_GTK_VERSION@_la-libseed-resources.Tpo -c -o libseed@SEED_GTK_VERSION@_la-libseed-resources.lo `test -f '../jsextensions/libseed-resources.c' || echo '$(srcdir)/'`../jsextensions/libseed-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libseed@SEED_GTK_VERSION@_la-libseed-resources.Tpo $(DEPDIR)/libseed@SEED_GTK_VERSION@_la-libseed-resources.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../jsextensions/libseed-resources.c' object='libseed@SEED_GTK_VERSION@_la-libseed-resources.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libseed@SEED_GTK_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libseed@SEED_GTK_VERSION@_la-libseed-resources.lo `test -f '../jsextensions/libseed-resources.c' || echo '$(srcdir)/'`../jsextensions/libseed-resources.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -622,26 +727,15 @@ uninstall-seedheadersHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(seedheadersdir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -653,15 +747,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -670,6 +760,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -814,20 +919,23 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-seedheadersHEADERS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-seedheadersHEADERS \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-libLTLIBRARIES uninstall-seedheadersHEADERS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am \
+	install-seedheadersHEADERS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-seedheadersHEADERS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/libseed/seed-api.c b/libseed/seed-api.c
index 7ec4b11..c35c050 100644
--- a/libseed/seed-api.c
+++ b/libseed/seed-api.c
@@ -34,9 +34,9 @@
  *
  */
 void
-seed_value_protect (JSContextRef ctx, JSValueRef value)
+seed_value_protect(JSContextRef ctx, JSValueRef value)
 {
-  JSValueProtect (ctx, value);
+    JSValueProtect(ctx, value);
 }
 
 /**
@@ -49,9 +49,9 @@ seed_value_protect (JSContextRef ctx, JSValueRef value)
  *
  */
 void
-seed_value_unprotect (JSContextRef ctx, JSValueRef value)
+seed_value_unprotect(JSContextRef ctx, JSValueRef value)
 {
-  JSValueUnprotect (ctx, value);
+    JSValueUnprotect(ctx, value);
 }
 
 /**
@@ -69,9 +69,9 @@ seed_value_unprotect (JSContextRef ctx, JSValueRef value)
  *
  */
 JSGlobalContextRef
-seed_context_create (JSContextGroupRef group, JSClassRef global_class)
+seed_context_create(JSContextGroupRef group, JSClassRef global_class)
 {
-  return JSGlobalContextCreateInGroup (group, global_class);
+    return JSGlobalContextCreateInGroup(group, global_class);
 }
 
 /**
@@ -84,9 +84,9 @@ seed_context_create (JSContextGroupRef group, JSClassRef global_class)
  *
  */
 JSGlobalContextRef
-seed_context_ref (JSGlobalContextRef ctx)
+seed_context_ref(JSGlobalContextRef ctx)
 {
-  return JSGlobalContextRetain (ctx);
+    return JSGlobalContextRetain(ctx);
 }
 
 /**
@@ -97,9 +97,9 @@ seed_context_ref (JSGlobalContextRef ctx)
  *
  */
 void
-seed_context_unref (JSGlobalContextRef ctx)
+seed_context_unref(JSGlobalContextRef ctx)
 {
-  JSGlobalContextRelease (ctx);
+    JSGlobalContextRelease(ctx);
 }
 
 /**
@@ -112,9 +112,9 @@ seed_context_unref (JSGlobalContextRef ctx)
  *
  */
 void
-seed_context_collect (JSGlobalContextRef ctx)
+seed_context_collect(JSGlobalContextRef ctx)
 {
-  JSGarbageCollect(ctx);
+    JSGarbageCollect(ctx);
 }
 
 /**
@@ -128,9 +128,9 @@ seed_context_collect (JSGlobalContextRef ctx)
  *
  */
 JSObjectRef
-seed_make_object (JSContextRef ctx, JSClassRef class, gpointer private)
+seed_make_object(JSContextRef ctx, JSClassRef class, gpointer private)
 {
-  return JSObjectMake (ctx, class, private);
+    return JSObjectMake(ctx, class, private);
 }
 
 /**
@@ -146,27 +146,30 @@ seed_make_object (JSContextRef ctx, JSClassRef class, gpointer private)
  *
  */
 void
-seed_object_set_property_at_index (JSContextRef ctx,
-				   JSObjectRef object,
-				   gint index,
-				   JSValueRef value, JSValueRef * exception)
+seed_object_set_property_at_index(JSContextRef ctx,
+                                  JSObjectRef object,
+                                  gint index,
+                                  JSValueRef value,
+                                  JSValueRef* exception)
 {
-  JSObjectSetPropertyAtIndex (ctx, object, index, value, exception);
+    JSObjectSetPropertyAtIndex(ctx, object, index, value, exception);
 }
 
 JSValueRef
-seed_object_get_property_at_index (JSContextRef ctx,
-				   JSObjectRef object,
-				   gint index, JSValueRef * exception)
+seed_object_get_property_at_index(JSContextRef ctx,
+                                  JSObjectRef object,
+                                  gint index,
+                                  JSValueRef* exception)
 {
-  return JSObjectGetPropertyAtIndex (ctx, object, index, exception);
+    return JSObjectGetPropertyAtIndex(ctx, object, index, exception);
 }
 
 /**
  * seed_object_call
  * @ctx: A #SeedContext.
  * @object: A #SeedObject to call.
- * @this: The #SeedObject to use as the 'this' object inside the called function.
+ * @this: The #SeedObject to use as the 'this' object inside the called
+ * function.
  * @argument_count: The number of arguments in the @arguments array.
  * @arguments: An array (@argument_count long) of #SeedValues to pass in as the
  *             function's arguments.
@@ -180,14 +183,15 @@ seed_object_get_property_at_index (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_object_call (JSContextRef ctx,
-		  JSObjectRef object,
-		  JSObjectRef this,
-		  size_t argument_count,
-		  const JSValueRef arguments[], JSValueRef * exception)
+seed_object_call(JSContextRef ctx,
+                 JSObjectRef object,
+                 JSObjectRef this,
+                 size_t argument_count,
+                 const JSValueRef arguments[],
+                 JSValueRef* exception)
 {
-  return JSObjectCallAsFunction (ctx, object, this,
-				 argument_count, arguments, exception);
+    return JSObjectCallAsFunction(ctx, object, this, argument_count, arguments,
+                                  exception);
 }
 
 /**
@@ -196,7 +200,7 @@ seed_object_call (JSContextRef ctx,
  * @js: A string representing the contents of the script.
  * @source_url: The filename of the script, for reference in errors, or %NULL.
  * @line_number: The line number of the beginning of the script, for reference
- *               in error messages, or %NULL.
+ *               in error messages, or 0.
  *
  * Creates a new #SeedScript instance with @js as the contents, then
  * checks for proper syntax.
@@ -207,28 +211,28 @@ seed_object_call (JSContextRef ctx,
  * Return value: The newly created #SeedScript.
  *
  */
-SeedScript *
-seed_make_script (JSContextRef ctx,
-		  const gchar * js,
-		  const gchar * source_url, gint line_number)
+SeedScript*
+seed_make_script(JSContextRef ctx,
+                 const gchar* js,
+                 const gchar* source_url,
+                 gint line_number)
 {
-  SeedScript *ret = g_new0 (SeedScript, 1);
+    SeedScript* ret = g_new0(SeedScript, 1);
 
-  if (js)
-    ret->script = JSStringCreateWithUTF8CString (js);
-  else
-    ret->script = JSStringCreateWithUTF8CString ("");
+    if (js)
+        ret->script = JSStringCreateWithUTF8CString(js);
+    else
+        ret->script = JSStringCreateWithUTF8CString("");
 
-  if (source_url)
-    {
-      ret->source_url = JSStringCreateWithUTF8CString (source_url);
+    if (source_url) {
+        ret->source_url = JSStringCreateWithUTF8CString(source_url);
     }
-  ret->line_number = line_number;
+    ret->line_number = line_number;
 
-  JSCheckScriptSyntax (ctx, ret->script,
-		       ret->source_url, ret->line_number, &ret->exception);
+    JSCheckScriptSyntax(ctx, ret->script, ret->source_url, ret->line_number,
+                        &ret->exception);
 
-  return ret;
+    return ret;
 }
 
 /**
@@ -241,22 +245,21 @@ seed_make_script (JSContextRef ctx,
  * Return value: The newly created #SeedScript.
  *
  */
-SeedScript *
-seed_script_new_from_file (JSContextRef ctx, gchar * file)
+SeedScript*
+seed_script_new_from_file(JSContextRef ctx, gchar* file)
 {
-  SeedScript *script;
-  GError *e = NULL;
-  gchar *contents = NULL;
+    SeedScript* script;
+    GError* e = NULL;
+    gchar* contents = NULL;
 
-  g_file_get_contents (file, &contents, NULL, &e);
-  script = seed_make_script (ctx, contents, file, 0);
-  if (e)
-    {
-      seed_make_exception_from_gerror (ctx, &script->exception, e);
-      g_error_free (e);
+    seed_importer_get_file_contents(file, &contents, NULL, &e);
+    script = seed_make_script(ctx, contents, file, 0);
+    if (e) {
+        seed_make_exception_from_gerror(ctx, &script->exception, e);
+        g_error_free(e);
     }
 
-  return script;
+    return script;
 }
 
 /**
@@ -271,16 +274,15 @@ seed_script_new_from_file (JSContextRef ctx, gchar * file)
  *
  */
 JSValueRef
-seed_evaluate (JSContextRef ctx, SeedScript * s, JSObjectRef this)
+seed_evaluate(JSContextRef ctx, SeedScript* s, JSObjectRef this)
 {
-  JSValueRef ret;
+    JSValueRef ret;
 
-  s->exception = 0;
-  ret = JSEvaluateScript (ctx,
-			  s->script, this, s->source_url,
-			  s->line_number, &s->exception);
+    s->exception = 0;
+    ret = JSEvaluateScript(ctx, s->script, this, s->source_url, s->line_number,
+                           &s->exception);
 
-  return ret;
+    return ret;
 }
 
 /**
@@ -296,16 +298,17 @@ seed_evaluate (JSContextRef ctx, SeedScript * s, JSObjectRef this)
  *
  */
 JSValueRef
-seed_simple_evaluate (JSContextRef ctx,
-		      const gchar * source, JSValueRef * exception)
+seed_simple_evaluate(JSContextRef ctx,
+                     const gchar* source,
+                     JSValueRef* exception)
 {
-  JSValueRef ret;
-  JSStringRef script = JSStringCreateWithUTF8CString (source);
+    JSValueRef ret;
+    JSStringRef script = JSStringCreateWithUTF8CString(source);
 
-  ret = JSEvaluateScript (ctx, script, NULL, NULL, 0, exception);
+    ret = JSEvaluateScript(ctx, script, NULL, NULL, 0, exception);
 
-  JSStringRelease (script);
-  return ret;
+    JSStringRelease(script);
+    return ret;
 }
 
 /**
@@ -318,9 +321,9 @@ seed_simple_evaluate (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_script_exception (SeedScript * s)
+seed_script_exception(SeedScript* s)
 {
-  return s->exception;
+    return s->exception;
 }
 
 /**
@@ -332,9 +335,9 @@ seed_script_exception (SeedScript * s)
  *
  */
 gsize
-seed_string_get_maximum_size (JSStringRef string)
+seed_string_get_maximum_size(JSStringRef string)
 {
-  return JSStringGetMaximumUTF8CStringSize (string);
+    return JSStringGetMaximumUTF8CStringSize(string);
 }
 
 /**
@@ -347,10 +350,11 @@ seed_string_get_maximum_size (JSStringRef string)
  *
  */
 gsize
-seed_string_to_utf8_buffer (JSStringRef string, gchar * buffer,
-			    size_t buffer_size)
+seed_string_to_utf8_buffer(JSStringRef string,
+                           gchar* buffer,
+                           size_t buffer_size)
 {
-  return JSStringGetUTF8CString (string, buffer, buffer_size);
+    return JSStringGetUTF8CString(string, buffer, buffer_size);
 }
 
 /**
@@ -362,9 +366,9 @@ seed_string_to_utf8_buffer (JSStringRef string, gchar * buffer,
  *
  */
 gboolean
-seed_string_is_equal (JSStringRef a, JSStringRef b)
+seed_string_is_equal(JSStringRef a, JSStringRef b)
 {
-  return JSStringIsEqual (a, b);
+    return JSStringIsEqual(a, b);
 }
 
 /**
@@ -378,9 +382,9 @@ seed_string_is_equal (JSStringRef a, JSStringRef b)
  *
  */
 gboolean
-seed_string_is_equal_utf8 (JSStringRef a, const gchar * b)
+seed_string_is_equal_utf8(JSStringRef a, const gchar* b)
 {
-  return JSStringIsEqualToUTF8CString (a, b);
+    return JSStringIsEqualToUTF8CString(a, b);
 }
 
 /**
@@ -393,9 +397,9 @@ seed_string_is_equal_utf8 (JSStringRef a, const gchar * b)
  *
  */
 JSStringRef
-seed_string_ref (JSStringRef string)
+seed_string_ref(JSStringRef string)
 {
-  return JSStringRetain (string);
+    return JSStringRetain(string);
 }
 
 /**
@@ -406,18 +410,19 @@ seed_string_ref (JSStringRef string)
  *
  */
 void
-seed_string_unref (JSStringRef string)
+seed_string_unref(JSStringRef string)
 {
-  JSStringRelease (string);
+    JSStringRelease(string);
 }
 
 void
-seed_script_destroy (SeedScript * s)
+seed_script_destroy(SeedScript* s)
 {
-  seed_string_unref (s->script);
-  seed_string_unref (s->source_url);
+    seed_string_unref(s->script);
+    if (s->source_url)
+        seed_string_unref(s->source_url);
 
-  g_free (s);
+    g_free(s);
 }
 
 // TODO:FIXME: Do we have an external typedef or anything for JSClassDefinition?
@@ -430,9 +435,9 @@ seed_script_destroy (SeedScript * s)
  *
  */
 JSClassRef
-seed_create_class (JSClassDefinition * def)
+seed_create_class(JSClassDefinition* def)
 {
-  return JSClassCreate (def);
+    return JSClassCreate(def);
 }
 
 /* TODO:FIXME: GtkDoc is choking on JSObjectCallAsConstructorCallback, and
@@ -449,11 +454,11 @@ seed_create_class (JSClassDefinition * def)
  *
  */
 JSObjectRef
-seed_make_constructor (JSContextRef ctx,
-		       JSClassRef class,
-		       JSObjectCallAsConstructorCallback constructor)
+seed_make_constructor(JSContextRef ctx,
+                      JSClassRef class,
+                      JSObjectCallAsConstructorCallback constructor)
 {
-  return JSObjectMakeConstructor (ctx, class, constructor);
+    return JSObjectMakeConstructor(ctx, class, constructor);
 }
 
 /**
@@ -466,9 +471,9 @@ seed_make_constructor (JSContextRef ctx,
  *
  */
 gpointer
-seed_object_get_private (JSObjectRef object)
+seed_object_get_private(JSObjectRef object)
 {
-  return (gpointer) JSObjectGetPrivate (object);
+    return (gpointer) JSObjectGetPrivate(object);
 }
 
 /**
@@ -480,9 +485,9 @@ seed_object_get_private (JSObjectRef object)
  *
  */
 void
-seed_object_set_private (JSObjectRef object, gpointer value)
+seed_object_set_private(JSObjectRef object, gpointer value)
 {
-  JSObjectSetPrivate (object, value);
+    JSObjectSetPrivate(object, value);
 }
 
 /**
@@ -496,9 +501,9 @@ seed_object_set_private (JSObjectRef object, gpointer value)
  *
  */
 gboolean
-seed_value_is_null (JSContextRef ctx, JSValueRef value)
+seed_value_is_null(JSContextRef ctx, JSValueRef value)
 {
-  return JSValueIsNull (ctx, value);
+    return JSValueIsNull(ctx, value);
 }
 
 /**
@@ -512,9 +517,9 @@ seed_value_is_null (JSContextRef ctx, JSValueRef value)
  *
  */
 gboolean
-seed_value_is_undefined (JSContextRef ctx, JSValueRef value)
+seed_value_is_undefined(JSContextRef ctx, JSValueRef value)
 {
-  return JSValueIsUndefined (ctx, value);
+    return JSValueIsUndefined(ctx, value);
 }
 
 /**
@@ -528,9 +533,9 @@ seed_value_is_undefined (JSContextRef ctx, JSValueRef value)
  *
  */
 gboolean
-seed_value_is_object (JSContextRef ctx, JSValueRef value)
+seed_value_is_object(JSContextRef ctx, JSValueRef value)
 {
-  return !seed_value_is_null (ctx, value) && JSValueIsObject (ctx, value);
+    return !seed_value_is_null(ctx, value) && JSValueIsObject(ctx, value);
 }
 
 /**
@@ -545,11 +550,12 @@ seed_value_is_object (JSContextRef ctx, JSValueRef value)
  *
  */
 gboolean
-seed_value_is_object_of_class (JSContextRef ctx, JSValueRef value,
-			       JSClassRef klass)
+seed_value_is_object_of_class(JSContextRef ctx,
+                              JSValueRef value,
+                              JSClassRef klass)
 {
-  return !seed_value_is_null (ctx, value)
-    && JSValueIsObjectOfClass (ctx, value, klass);
+    return !seed_value_is_null(ctx, value)
+           && JSValueIsObjectOfClass(ctx, value, klass);
 }
 
 /**
@@ -564,9 +570,9 @@ seed_value_is_object_of_class (JSContextRef ctx, JSValueRef value,
  *
  */
 gboolean
-seed_value_is_function (JSContextRef ctx, JSObjectRef value)
+seed_value_is_function(JSContextRef ctx, JSObjectRef value)
 {
-  return seed_value_is_object (ctx, value) && JSObjectIsFunction (ctx, value);
+    return seed_value_is_object(ctx, value) && JSObjectIsFunction(ctx, value);
 }
 
 /**
@@ -580,9 +586,9 @@ seed_value_is_function (JSContextRef ctx, JSObjectRef value)
  *
  */
 gboolean
-seed_value_is_string (JSContextRef ctx, JSValueRef value)
+seed_value_is_string(JSContextRef ctx, JSValueRef value)
 {
-  return JSValueIsString (ctx, value);
+    return JSValueIsString(ctx, value);
 }
 
 /**
@@ -596,9 +602,9 @@ seed_value_is_string (JSContextRef ctx, JSValueRef value)
  *
  */
 gboolean
-seed_value_is_number (JSContextRef ctx, JSValueRef value)
+seed_value_is_number(JSContextRef ctx, JSValueRef value)
 {
-  return JSValueIsNumber (ctx, value);
+    return JSValueIsNumber(ctx, value);
 }
 
 /**
@@ -610,12 +616,12 @@ seed_value_is_number (JSContextRef ctx, JSValueRef value)
  *
  */
 void
-seed_engine_set_search_path (SeedEngine * eng, const gchar * path)
+seed_engine_set_search_path(SeedEngine* eng, const gchar* path)
 {
-  /* this should be null from seed_init unless there's already a path set. */
+    /* this should be null from seed_init unless there's already a path set. */
 
-  g_strfreev (eng->search_path);
-  eng->search_path = g_strsplit (path, ":", -1);
+    g_strfreev(eng->search_path);
+    eng->search_path = g_strsplit(path, ":", -1);
 }
 
 /**
@@ -628,10 +634,10 @@ seed_engine_set_search_path (SeedEngine * eng, const gchar * path)
  * Return value: A null-terminated array of strings containing the paths.
  *
  */
-gchar **
-seed_engine_get_search_path (SeedEngine * eng)
+gchar**
+seed_engine_get_search_path(SeedEngine* eng)
 {
-  return eng->search_path;
+    return eng->search_path;
 }
 
 /**
@@ -647,13 +653,13 @@ seed_engine_get_search_path (SeedEngine * eng)
  *
  */
 void
-seed_signal_connect_full (JSContextRef ctx,
-			  GObject * object,
-			  const gchar * signal,
-			  JSObjectRef function, JSObjectRef user_data)
+seed_signal_connect_full(JSContextRef ctx,
+                         GObject* object,
+                         const gchar* signal,
+                         JSObjectRef function,
+                         JSObjectRef user_data)
 {
-  seed_gobject_signal_connect (ctx, signal, object, function,
-			       NULL, user_data);
+    seed_gobject_signal_connect(ctx, signal, object, function, NULL, user_data);
 }
 
 /**
@@ -669,14 +675,15 @@ seed_signal_connect_full (JSContextRef ctx,
  *
  */
 void
-seed_signal_connect (JSContextRef ctx,
-		     GObject * object,
-		     const gchar * signal, const gchar * script)
+seed_signal_connect(JSContextRef ctx,
+                    GObject* object,
+                    const gchar* signal,
+                    const gchar* script)
 {
-  JSValueRef func;
+    JSValueRef func;
 
-  func = seed_simple_evaluate (ctx, script, NULL);
-  seed_signal_connect_full (ctx, object, signal, (JSObjectRef) func, NULL);
+    func = seed_simple_evaluate(ctx, script, NULL);
+    seed_signal_connect_full(ctx, object, signal, (JSObjectRef) func, NULL);
 }
 
 /**
@@ -686,12 +693,11 @@ seed_signal_connect (JSContextRef ctx,
  * Return value: The global object for @ctx.
  */
 JSObjectRef
-seed_context_get_global_object (JSGlobalContextRef ctx)
+seed_context_get_global_object(JSGlobalContextRef ctx)
 {
-  return JSContextGetGlobalObject (ctx);
+    return JSContextGetGlobalObject(ctx);
 }
 
-
 /**
  * seed_make_array:
  * @ctx: A valid #SeedContext
@@ -707,11 +713,12 @@ seed_context_get_global_object (JSGlobalContextRef ctx)
  */
 
 JSObjectRef
-seed_make_array (JSContextRef ctx,
-		 const JSValueRef elements[],
-		 gsize num_elements, JSValueRef * exception)
+seed_make_array(JSContextRef ctx,
+                const JSValueRef elements[],
+                gsize num_elements,
+                JSValueRef* exception)
 {
-  return JSObjectMakeArray (ctx, num_elements, elements, exception);
+    return JSObjectMakeArray(ctx, num_elements, elements, exception);
 }
 
 /**
@@ -726,9 +733,9 @@ seed_make_array (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_make_null (JSContextRef ctx)
+seed_make_null(JSContextRef ctx)
 {
-  return JSValueMakeNull (ctx);
+    return JSValueMakeNull(ctx);
 }
 
 /**
@@ -742,9 +749,9 @@ seed_make_null (JSContextRef ctx)
  * Return value: A #SeedValue of the 'undefined' type.
  */
 JSValueRef
-seed_make_undefined (JSContextRef ctx)
+seed_make_undefined(JSContextRef ctx)
 {
-  return JSValueMakeUndefined (ctx);
+    return JSValueMakeUndefined(ctx);
 }
 
 /**
@@ -755,9 +762,9 @@ seed_make_undefined (JSContextRef ctx)
  * Return value: The type of @value
  */
 JSType
-seed_value_get_type (JSContextRef ctx, JSValueRef value)
+seed_value_get_type(JSContextRef ctx, JSValueRef value)
 {
-  return JSValueGetType (ctx, value);
+    return JSValueGetType(ctx, value);
 }
 
 /**
@@ -765,34 +772,33 @@ seed_value_get_type (JSContextRef ctx, JSValueRef value)
  * @ctx: A valid #SeedContext
  * @object: An object from which to copy property names.
  *
- * Return value: A %NULL terminated array containing the property names of @object
- */
-gchar **
-seed_object_copy_property_names (JSContextRef ctx, JSObjectRef object)
-{
-  JSPropertyNameArrayRef names;
-  JSStringRef name;
-  guint i, length;
-  gsize max_length;
-  gchar *c_name;
-  gchar **ret;
-
-  names = JSObjectCopyPropertyNames (ctx, object);
-  length = JSPropertyNameArrayGetCount (names);
-  ret = (gchar **) g_malloc ((length + 1) * sizeof (gchar *));
-  for (i = 0; i < length; i++)
-    {
-      name = JSPropertyNameArrayGetNameAtIndex (names, i);
-      max_length = JSStringGetMaximumUTF8CStringSize (name);
-      c_name = (gchar *) g_malloc (max_length * sizeof (gchar));
-      JSStringGetUTF8CString (name, c_name, max_length);
-      ret[i] = c_name;
-
+ * Return value: A %NULL terminated array containing the property names of
+ * @object
+ */
+gchar**
+seed_object_copy_property_names(JSContextRef ctx, JSObjectRef object)
+{
+    JSPropertyNameArrayRef names;
+    JSStringRef name;
+    guint i, length;
+    gsize max_length;
+    gchar* c_name;
+    gchar** ret;
+
+    names = JSObjectCopyPropertyNames(ctx, object);
+    length = JSPropertyNameArrayGetCount(names);
+    ret = (gchar**) g_malloc((length + 1) * sizeof(gchar*));
+    for (i = 0; i < length; i++) {
+        name = JSPropertyNameArrayGetNameAtIndex(names, i);
+        max_length = JSStringGetMaximumUTF8CStringSize(name);
+        c_name = (gchar*) g_malloc(max_length * sizeof(gchar));
+        JSStringGetUTF8CString(name, c_name, max_length);
+        ret[i] = c_name;
     }
-  ret[length] = NULL;
-  JSPropertyNameArrayRelease (names);
+    ret[length] = NULL;
+    JSPropertyNameArrayRelease(names);
 
-  return ret;
+    return ret;
 }
 
 /**
@@ -803,15 +809,15 @@ seed_object_copy_property_names (JSContextRef ctx, JSObjectRef object)
  * Return value: The prototype of @obj.
  */
 JSObjectRef
-seed_object_get_prototype (JSContextRef ctx, JSObjectRef obj)
+seed_object_get_prototype(JSContextRef ctx, JSObjectRef obj)
 {
-  return (JSObjectRef) JSObjectGetPrototype (ctx, obj);
+    return (JSObjectRef) JSObjectGetPrototype(ctx, obj);
 }
 
 gboolean
-seed_object_is_of_class (JSContextRef ctx, JSObjectRef obj, JSClassRef class)
+seed_object_is_of_class(JSContextRef ctx, JSObjectRef obj, JSClassRef class)
 {
-  return JSValueIsObjectOfClass (ctx, obj, class);
+    return JSValueIsObjectOfClass(ctx, obj, class);
 }
 
 /**
@@ -826,18 +832,18 @@ seed_object_is_of_class (JSContextRef ctx, JSObjectRef obj, JSClassRef class)
  * Return value: A #SeedObject representing the function
  */
 JSObjectRef
-seed_make_function (JSContextRef ctx, gpointer func, gchar * name)
+seed_make_function(JSContextRef ctx, gpointer func, gchar* name)
 {
-  JSObjectRef oref;
-  JSStringRef jsname = NULL;
-  if (name)
-    jsname = JSStringCreateWithUTF8CString (name);
-  oref = JSObjectMakeFunctionWithCallback (ctx, NULL, func);
+    JSObjectRef oref;
+    JSStringRef jsname = NULL;
+    if (name)
+        jsname = JSStringCreateWithUTF8CString(name);
+    oref = JSObjectMakeFunctionWithCallback(ctx, NULL, func);
 
-  if (jsname)
-    JSStringRelease (jsname);
+    if (jsname)
+        JSStringRelease(jsname);
 
-  return oref;
+    return oref;
 }
 
 /**
@@ -846,7 +852,8 @@ seed_make_function (JSContextRef ctx, gpointer func, gchar * name)
  * @format: Format string to use.
  * @exception: Location to store an exception.
  * @values: The values to convert.
- * @Varargs: A %NULL-terminated list of locations to store the results of conversion.
+ * @Varargs: A %NULL-terminated list of locations to store the results of
+ * conversion.
  *
  * A convenience API for converting multiple values at once, the format string
  * is composed of single characters specifying types, for example:
@@ -864,66 +871,57 @@ seed_make_function (JSContextRef ctx, gpointer func, gchar * name)
  * Return value: Whether conversion was successful.
  */
 gboolean
-seed_value_to_format (JSContextRef ctx,
-		      const gchar * format,
-		      JSValueRef * values, JSValueRef * exception, ...)
-{
-  va_list argp;
-  const gchar *c;
-  guint i = 0;
-
-  c = format;
-
-  va_start (argp, exception);
-
-  for (c = format; *c; c++)
-    {
-      JSValueRef val = values[i];
-      gpointer p = va_arg (argp, gpointer);
-
-      if (!val || !p)
-	{
-	  va_end (argp);
-	  return FALSE;
-	}
-      switch (*c)
-	{
-	case 'i':
-	  {
-	    *((gint *) p) = seed_value_to_int (ctx, val, exception);
-	    break;
-	  }
-	case 'u':
-	  {
-	    *((guint *) p) = seed_value_to_uint (ctx, val, exception);
-	    break;
-	  }
-	case 's':
-	  {
-	    *((gchar **) p) = seed_value_to_string (ctx, val, exception);
-	    break;
-	  }
-	case 'f':
-	  {
-	    *((gdouble *) p) = seed_value_to_int (ctx, val, exception);
-	    break;
-	  }
-	case 'o':
-	  {
-	    *((GObject **) p) = seed_value_to_object (ctx, val, exception);
-	    break;
-	  }
-	case 'c':
-	  {
-	    *((gchar *) c) = seed_value_to_char (ctx, val, exception);
-	    break;
-	  }
-	}
-      i++;
+seed_value_to_format(JSContextRef ctx,
+                     const gchar* format,
+                     JSValueRef* values,
+                     JSValueRef* exception,
+                     ...)
+{
+    va_list argp;
+    const gchar* c;
+    guint i = 0;
+
+    va_start(argp, exception);
+
+    for (c = format; *c; c++) {
+        JSValueRef val = values[i];
+        gpointer p = va_arg(argp, gpointer);
+
+        if (!val || !p) {
+            va_end(argp);
+            return FALSE;
+        }
+        switch (*c) {
+            case 'i': {
+                *((gint*) p) = seed_value_to_int(ctx, val, exception);
+                break;
+            }
+            case 'u': {
+                *((guint*) p) = seed_value_to_uint(ctx, val, exception);
+                break;
+            }
+            case 's': {
+                *((gchar**) p) = seed_value_to_string(ctx, val, exception);
+                break;
+            }
+            case 'f': {
+                *((gdouble*) p) = seed_value_to_int(ctx, val, exception);
+                break;
+            }
+            case 'o': {
+                *((GObject**) p) = seed_value_to_object(ctx, val, exception);
+                break;
+            }
+            case 'c': {
+                *((gchar*) c) = seed_value_to_char(ctx, val, exception);
+                break;
+            }
+        }
+        i++;
     }
 
-  va_end (argp);
-  return TRUE;
+    va_end(argp);
+    return TRUE;
 }
 
 /*************************** CALLBACK DOCUMENTATION **************************/
@@ -935,7 +933,8 @@ seed_value_to_format (JSContextRef ctx,
  * @this_object: The #SeedObject representing the "this" object in the caller
  * @argument_count: The number of arguments passed into the callback
  * @arguments: An array of #SeedValues; the value of the arguments passed in
- * @exception: A reference to a #SeedException; use seed_make_exception() in order
+ * @exception: A reference to a #SeedException; use seed_make_exception() in
+ * order
  *             to throw a JavaScript exception from the callback.
  *
  * All native C function callbacks should use the prototype of
diff --git a/libseed/seed-builtins.c b/libseed/seed-builtins.c
index b5b14fc..709d070 100644
--- a/libseed/seed-builtins.c
+++ b/libseed/seed-builtins.c
@@ -22,536 +22,627 @@
 #include <sys/mman.h>
 #include <stdio.h>
 #include <signal.h>
+#include <gio/gio.h>
 
 JSValueRef seed_print_ref;
 JSValueRef seed_printerr_ref;
+JSValueRef seed_log_error_ref;
 
 static JSValueRef
-seed_include (JSContextRef ctx,
-	      JSObjectRef function,
-	      JSObjectRef this_object,
-	      size_t argumentCount,
-	      const JSValueRef arguments[], JSValueRef * exception)
+seed_include(JSContextRef ctx,
+             JSObjectRef function,
+             JSObjectRef this_object,
+             size_t argumentCount,
+             const JSValueRef arguments[],
+             JSValueRef* exception)
 {
-  JSStringRef file_contents, file_name;
+    JSStringRef file_contents, file_name;
+
+    GDir* dir;
+    gchar *import_file, *abs_path;
+    gchar *walk, *buffer = NULL;
+    guint i, len;
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Seed.include expected 1 argument, "
+                            "got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
+    }
 
-  GDir *dir;
-  gchar *import_file, *abs_path;
-  gchar *buffer, *walk;
-  guint i, len;
+    import_file = seed_value_to_string(ctx, arguments[0], exception);
 
-  if (argumentCount != 1)
+    /* just try current dir if no path set, or use the absolute path */
+    if (!eng->search_path || g_path_is_absolute(import_file))
+        seed_importer_get_file_contents(import_file, &buffer, 0, NULL);
+    else /* A search path is set and path given is not absolute.  */
     {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Seed.include expected 1 argument, "
-			   "got %zd", argumentCount);
-      return JSValueMakeNull (ctx);
-    }
+        len = g_strv_length(eng->search_path);
+        for (i = 0; i < len; ++i) {
+            dir = g_dir_open(eng->search_path[i], 0, NULL);
 
-  import_file = seed_value_to_string (ctx, arguments[0], exception);
+            if (!dir) /* skip bad path entries */
+                continue;
 
-  /* just try current dir if no path set, or use the absolute path */
-  if (!eng->search_path || g_path_is_absolute (import_file))
-    g_file_get_contents (import_file, &buffer, 0, NULL);
-  else				/* A search path is set and path given is not absolute.  */
-    {
-      len = g_strv_length (eng->search_path);
-      for (i = 0; i < len; ++i)
-	{
-	  dir = g_dir_open (eng->search_path[i], 0, NULL);
-
-	  if (!dir)		/* skip bad path entries */
-	    continue;
-
-	  abs_path =
-	    g_build_filename (eng->search_path[i], import_file, NULL);
-
-	  if (g_file_get_contents (abs_path, &buffer, 0, NULL))
-	    {
-	      g_free (abs_path);
-	      g_dir_close (dir);
-	      break;
-	    }
-
-	  g_dir_close (dir);
-	  g_free (abs_path);
-	}
+            abs_path = g_build_filename(eng->search_path[i], import_file, NULL);
+
+            if (seed_importer_get_file_contents(abs_path, &buffer, 0, NULL)) {
+                g_free(abs_path);
+                g_dir_close(dir);
+                break;
+            }
+
+            g_dir_close(dir);
+            g_free(abs_path);
+        }
     }
 
-  if (!buffer)
-    {
-      seed_make_exception (ctx, exception, "FileNotFound",
-			   "File not found: %s", import_file);
+    if (!buffer) {
+        seed_make_exception(ctx, exception, "FileNotFound",
+                            "File not found: %s", import_file);
 
-      g_free (import_file);
-      g_free (buffer);
-      return JSValueMakeNull (ctx);
+        g_free(import_file);
+        g_free(buffer);
+        return JSValueMakeNull(ctx);
     }
 
-  walk = buffer;
+    walk = buffer;
 
-  if (*walk == '#')
-    {
-      while (*walk != '\n')
-	walk++;
-      walk++;
+    if (*walk == '#') {
+        while (*walk != '\n')
+            walk++;
+        walk++;
     }
 
-  walk = g_strdup (walk);
-  g_free (buffer);
+    walk = g_strdup(walk);
+    g_free(buffer);
 
-  file_contents = JSStringCreateWithUTF8CString (walk);
-  file_name = JSStringCreateWithUTF8CString (import_file);
+    file_contents = JSStringCreateWithUTF8CString(walk);
+    file_name = JSStringCreateWithUTF8CString(import_file);
 
-  JSEvaluateScript (ctx, file_contents, NULL, file_name, 0, exception);
+    JSEvaluateScript(ctx, file_contents, NULL, file_name, 0, exception);
 
-  JSStringRelease (file_contents);
-  JSStringRelease (file_name);
-  g_free (import_file);
-  g_free (walk);
+    JSStringRelease(file_contents);
+    JSStringRelease(file_name);
+    g_free(import_file);
+    g_free(walk);
 
-  return JSValueMakeUndefined (ctx);
+    return JSValueMakeUndefined(ctx);
 }
 
 static JSValueRef
-seed_scoped_include (JSContextRef ctx,
-		     JSObjectRef function,
-		     JSObjectRef this_object,
-		     size_t argumentCount,
-		     const JSValueRef arguments[], JSValueRef * exception)
+seed_scoped_include(JSContextRef ctx,
+                    JSObjectRef function,
+                    JSObjectRef this_object,
+                    size_t argumentCount,
+                    const JSValueRef arguments[],
+                    JSValueRef* exception)
 {
-  JSContextRef nctx;
-  JSObjectRef global;
-  JSStringRef file_contents, file_name;
-  GDir *dir;
-  gchar *import_file, *abs_path;
-  gchar *buffer, *walk;
-  guint i;
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Seed.include expected 1 argument, "
-			   "got %zd", argumentCount);
-      return JSValueMakeNull (ctx);
+    JSContextRef nctx;
+    JSObjectRef global;
+    JSStringRef file_contents, file_name;
+    GDir* dir;
+    gchar *import_file, *abs_path;
+    gchar *walk, *buffer = NULL;
+    guint i;
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Seed.include expected 1 argument, "
+                            "got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
     }
 
-  import_file = seed_value_to_string (ctx, arguments[0], exception);
+    import_file = seed_value_to_string(ctx, arguments[0], exception);
 
-  /* just try current dir if no path set, or use the absolute path */
-  if (!eng->search_path || g_path_is_absolute (import_file))
-    g_file_get_contents (import_file, &buffer, 0, NULL);
-  else				/* A search path is set and path given is not absolute.  */
+    /* just try current dir if no path set, or use the absolute path */
+    if (!eng->search_path || g_path_is_absolute(import_file))
+        seed_importer_get_file_contents(import_file, &buffer, 0, NULL);
+    else /* A search path is set and path given is not absolute.  */
     {
-      for (i = 0; i < g_strv_length (eng->search_path); ++i)
-	{
-	  dir = g_dir_open (eng->search_path[i], 0, NULL);
+        for (i = 0; i < g_strv_length(eng->search_path); ++i) {
+            dir = g_dir_open(eng->search_path[i], 0, NULL);
 
-	  if (!dir)		/* skip bad path entries */
-	    continue;
+            if (!dir) /* skip bad path entries */
+                continue;
 
-	  abs_path =
-	    g_build_filename (eng->search_path[i], import_file, NULL);
+            abs_path = g_build_filename(eng->search_path[i], import_file, NULL);
 
-	  if (g_file_get_contents (abs_path, &buffer, 0, NULL))
-	    {
-	      g_free (abs_path);
-	      break;
-	    }
+            if (seed_importer_get_file_contents(abs_path, &buffer, 0, NULL)) {
+                g_free(abs_path);
+                break;
+            }
 
-	  g_dir_close (dir);
-	  g_free (abs_path);
-	}
+            g_dir_close(dir);
+            g_free(abs_path);
+        }
     }
 
-  if (!buffer)
-    {
-      seed_make_exception (ctx, exception, "FileNotFound",
-			   "File not found: %s", import_file);
+    if (!buffer) {
+        seed_make_exception(ctx, exception, "FileNotFound",
+                            "File not found: %s", import_file);
 
-      g_free (import_file);
-      g_free (buffer);
-      return JSValueMakeNull (ctx);
+        g_free(import_file);
+        g_free(buffer);
+        return JSValueMakeNull(ctx);
     }
 
-  walk = buffer;
+    walk = buffer;
 
-  if (*walk == '#')
-    {
-      while (*walk != '\n')
-	walk++;
-      walk++;
+    if (*walk == '#') {
+        while (*walk != '\n')
+            walk++;
+        walk++;
     }
 
-  walk = g_strdup (walk);
-  g_free (buffer);
+    walk = g_strdup(walk);
+    g_free(buffer);
 
-  file_contents = JSStringCreateWithUTF8CString (walk);
-  file_name = JSStringCreateWithUTF8CString (import_file);
+    file_contents = JSStringCreateWithUTF8CString(walk);
+    file_name = JSStringCreateWithUTF8CString(import_file);
 
+    nctx = JSGlobalContextCreateInGroup(context_group, 0);
+    seed_prepare_global_context(nctx);
 
-  nctx = JSGlobalContextCreateInGroup (context_group, 0);
-  seed_prepare_global_context (nctx);
+    JSEvaluateScript(nctx, file_contents, NULL, file_name, 0, exception);
 
-  JSEvaluateScript (nctx, file_contents, NULL, file_name, 0, exception);
+    global = JSContextGetGlobalObject(nctx);
 
-  global = JSContextGetGlobalObject (nctx);
+    JSGlobalContextRelease((JSGlobalContextRef) nctx);
 
-  JSGlobalContextRelease ((JSGlobalContextRef) nctx);
+    JSStringRelease(file_contents);
+    JSStringRelease(file_name);
+    g_free(import_file);
+    g_free(walk);
 
-  JSStringRelease (file_contents);
-  JSStringRelease (file_name);
-  g_free (import_file);
-  g_free (walk);
-
-  return global;
+    return global;
 }
 
 static JSValueRef
-seed_print (JSContextRef ctx,
-	    JSObjectRef function,
-	    JSObjectRef this_object,
-	    size_t argumentCount,
-	    const JSValueRef arguments[], JSValueRef * exception)
+seed_print(JSContextRef ctx,
+           JSObjectRef function,
+           JSObjectRef this_object,
+           size_t argumentCount,
+           const JSValueRef arguments[],
+           JSValueRef* exception)
 {
-  gchar *buf;
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "print expected 1 argument, got %zd",
-			   argumentCount);
-      return JSValueMakeNull (ctx);
+    gchar* buf;
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "print expected 1 argument, got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
     }
 
-  buf = seed_value_to_string (ctx, arguments[0], exception);
+    buf = seed_value_to_string(ctx, arguments[0], exception);
 
-  g_print ("%s\n", buf);
-  g_free (buf);
+    g_print("%s\n", buf);
+    g_free(buf);
 
-  return JSValueMakeUndefined (ctx);
+    return JSValueMakeUndefined(ctx);
 }
 
 static JSValueRef
-seed_printerr (JSContextRef ctx,
-	       JSObjectRef function,
-	       JSObjectRef this_object,
-	       size_t argumentCount,
-	       const JSValueRef arguments[],
-	       JSValueRef *exception)
+seed_log_error(JSContextRef ctx,
+               JSObjectRef function,
+               JSObjectRef this_object,
+               size_t argumentCount,
+               const JSValueRef arguments[],
+               JSValueRef* exception)
 {
-  gchar *buf;
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "printerr expected 1 argument, got %zd",
-			   argumentCount);
-      return JSValueMakeNull (ctx);
+    gchar* buf1;
+    gchar* buf2 = NULL;
+    if (argumentCount != 1 && argumentCount != 2) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "logError expected 1 or 2 argument, got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
     }
 
-  buf = seed_value_to_string (ctx, arguments[0], exception);
-
-  g_printerr ("%s\n", buf);
-  g_free (buf);
-
-  return JSValueMakeUndefined (ctx);
-}
-
-const gchar *
-seed_g_type_name_to_string (GITypeInfo * type)
-{
-  GITypeTag type_tag = g_type_info_get_tag (type);
-
-  const gchar *type_name;
-  GIBaseInfo *interface;
-
-  if (type_tag == GI_TYPE_TAG_INTERFACE)
-    {
-      interface = g_type_info_get_interface (type);
-
-      type_name = g_base_info_get_name (interface);
-      g_base_info_unref (interface);
-    }
-  else
-    {
-      type_name = g_type_tag_to_string (type_tag);
+    buf1 = seed_value_to_string(ctx, arguments[0], exception);
+    if (argumentCount == 2) {
+        buf2 = seed_value_to_string(ctx, arguments[1], exception);
+        g_print("%s - %s\n", buf1, buf2);
+    } else {
+        g_print("%s\n", buf1);
     }
+    g_free(buf1);
+    g_free(buf2);
 
-  return type_name;
+    return JSValueMakeUndefined(ctx);
 }
 
 static JSValueRef
-seed_introspect (JSContextRef ctx,
-		 JSObjectRef function,
-		 JSObjectRef this_object,
-		 size_t argumentCount,
-		 const JSValueRef arguments[], JSValueRef * exception)
+seed_printerr(JSContextRef ctx,
+              JSObjectRef function,
+              JSObjectRef this_object,
+              size_t argumentCount,
+              const JSValueRef arguments[],
+              JSValueRef* exception)
 {
-  // TODO: LEAKY!
-
-  GICallableInfo *info;
-  JSObjectRef data_obj, args_obj, argument;
-  guint i, nargs;
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Seed.introspect expected 1 argument, "
-			   "got %zd", argumentCount);
-      return JSValueMakeNull (ctx);
+    gchar* buf;
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "printerr expected 1 argument, got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
     }
 
-  if (!JSValueIsObject (ctx, arguments[0]))
-    return JSValueMakeNull (ctx);
-  if (!JSValueIsObjectOfClass (ctx, arguments[0], gobject_method_class))
-    return JSValueMakeNull (ctx);
+    buf = seed_value_to_string(ctx, arguments[0], exception);
 
-  info = (GICallableInfo *) JSObjectGetPrivate ((JSObjectRef) arguments[0]);
-  data_obj = JSObjectMake (ctx, NULL, NULL);
+    g_printerr("%s\n", buf);
+    g_free(buf);
 
-  seed_object_set_property (ctx, data_obj, "name", (JSValueRef)
-			    seed_value_from_string (ctx, g_base_info_get_name
-						    ((GIBaseInfo *) info),
-						    exception));
+    return JSValueMakeUndefined(ctx);
+}
 
-  seed_object_set_property (ctx, data_obj, "return_type",
-			    seed_value_from_string
-			    (ctx, seed_g_type_name_to_string
-			     (g_callable_info_get_return_type (info)),
-			     exception));
+const gchar*
+seed_g_type_name_to_string(GITypeInfo* type)
+{
+    GITypeTag type_tag = g_type_info_get_tag(type);
 
-  args_obj = JSObjectMake (ctx, NULL, NULL);
+    const gchar* type_name;
+    GIBaseInfo* interface;
 
-  seed_object_set_property (ctx, data_obj, "args", args_obj);
+    if (type_tag == GI_TYPE_TAG_INTERFACE) {
+        interface = g_type_info_get_interface(type);
 
-  nargs = g_callable_info_get_n_args (info);
-  for (i = 0; i < nargs; ++i)
-    {
-      argument = JSObjectMake (ctx, NULL, NULL);
-      GIArgInfo* arg_info = g_callable_info_get_arg (info, i);
-      const gchar *arg_type =	seed_g_type_name_to_string (
-			g_arg_info_get_type(arg_info));
-      const gchar *arg_name =	g_base_info_get_name((GIBaseInfo*) arg_info);
-      GIDirection dir = g_arg_info_get_direction (arg_info);
-
-     
-      seed_object_set_property (ctx, argument, "type",
-				seed_value_from_string (ctx,
-							arg_type, exception));
-      seed_object_set_property (ctx, argument, "name",
-				seed_value_from_string (ctx,
-							arg_name, exception));
-
-      seed_object_set_property (ctx, argument, "allow_none",
-			seed_value_from_boolean (ctx,
-				g_arg_info_may_be_null (arg_info) ? 1 : 0, exception));
-
-
-      seed_object_set_property (ctx, argument, "direction",
-				seed_value_from_string (ctx,
-					dir == GI_DIRECTION_OUT ? "out" :
-						(dir == GI_DIRECTION_IN ? "in" : "inout")
-					, exception));
-
-      JSObjectSetPropertyAtIndex (ctx, args_obj, i, argument, NULL);
+        type_name = g_base_info_get_name(interface);
+        g_base_info_unref(interface);
+    } else {
+        type_name = g_type_tag_to_string(type_tag);
     }
 
-  return data_obj;
+    return type_name;
 }
 
 static JSValueRef
-seed_check_syntax (JSContextRef ctx,
-		   JSObjectRef function,
-		   JSObjectRef this_object,
-		   size_t argumentCount,
-		   const JSValueRef arguments[], JSValueRef * exception)
+seed_introspect(JSContextRef ctx,
+                JSObjectRef function,
+                JSObjectRef this_object,
+                size_t argumentCount,
+                const JSValueRef arguments[],
+                JSValueRef* exception)
 {
-  JSStringRef jsstr;
-  if (argumentCount == 1)
-    {
-      jsstr = JSValueToStringCopy (ctx, arguments[0], exception);
-
-      JSCheckScriptSyntax (ctx, jsstr, 0, 0, exception);
-      if (jsstr)
-	JSStringRelease (jsstr);
+    // TODO: LEAKY!
+
+    GICallableInfo* info;
+    JSObjectRef data_obj, args_obj, argument;
+    guint i, nargs;
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Seed.introspect expected 1 argument, "
+                            "got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
     }
-  else
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Seed.check_syntax expected "
-			   "1 argument, got %zd", argumentCount);
+
+    if (!JSValueIsObject(ctx, arguments[0]))
+        return JSValueMakeNull(ctx);
+    if (!JSValueIsObjectOfClass(ctx, arguments[0], gobject_method_class))
+        return JSValueMakeNull(ctx);
+
+    info = (GICallableInfo*) JSObjectGetPrivate((JSObjectRef) arguments[0]);
+    data_obj = JSObjectMake(ctx, NULL, NULL);
+
+    seed_object_set_property(ctx, data_obj, "name",
+                             (JSValueRef) seed_value_from_string(
+                               ctx, g_base_info_get_name((GIBaseInfo*) info),
+                               exception));
+
+    seed_object_set_property(
+      ctx, data_obj, "return_type",
+      seed_value_from_string(ctx, seed_g_type_name_to_string(
+                                    g_callable_info_get_return_type(info)),
+                             exception));
+
+    args_obj = JSObjectMake(ctx, NULL, NULL);
+
+    seed_object_set_property(ctx, data_obj, "args", args_obj);
+
+    nargs = g_callable_info_get_n_args(info);
+    for (i = 0; i < nargs; ++i) {
+        argument = JSObjectMake(ctx, NULL, NULL);
+        GIArgInfo* arg_info = g_callable_info_get_arg(info, i);
+        const gchar* arg_type
+          = seed_g_type_name_to_string(g_arg_info_get_type(arg_info));
+        const gchar* arg_name = g_base_info_get_name((GIBaseInfo*) arg_info);
+        GIDirection dir = g_arg_info_get_direction(arg_info);
+
+        seed_object_set_property(ctx, argument, "type",
+                                 seed_value_from_string(ctx, arg_type,
+                                                        exception));
+        seed_object_set_property(ctx, argument, "name",
+                                 seed_value_from_string(ctx, arg_name,
+                                                        exception));
+
+        seed_object_set_property(
+          ctx, argument, "allow_none",
+          seed_value_from_boolean(ctx, g_arg_info_may_be_null(arg_info) ? 1 : 0,
+                                  exception));
+
+        seed_object_set_property(
+          ctx, argument, "direction",
+          seed_value_from_string(ctx,
+                                 dir == GI_DIRECTION_OUT
+                                   ? "out"
+                                   : (dir == GI_DIRECTION_IN ? "in" : "inout"),
+                                 exception));
+
+        JSObjectSetPropertyAtIndex(ctx, args_obj, i, argument, NULL);
     }
-  return JSValueMakeNull (ctx);
+
+    return data_obj;
 }
 
 static JSValueRef
-seed_spawn (JSContextRef ctx,
-	    JSObjectRef function,
-	    JSObjectRef this_object,
-	    size_t argumentCount,
-	    const JSValueRef arguments[], JSValueRef * exception)
+seed_check_syntax(JSContextRef ctx,
+                  JSObjectRef function,
+                  JSObjectRef this_object,
+                  size_t argumentCount,
+                  const JSValueRef arguments[],
+                  JSValueRef* exception)
 {
-  gchar *line, *stdoutstr, *stderrstr;
-  JSObjectRef ret;
-  GError *error = NULL;
+    JSStringRef jsstr;
+    if (argumentCount == 1) {
+        jsstr = JSValueToStringCopy(ctx, arguments[0], exception);
+
+        JSCheckScriptSyntax(ctx, jsstr, 0, 0, exception);
+        if (jsstr)
+            JSStringRelease(jsstr);
+    } else {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Seed.check_syntax expected "
+                            "1 argument, got %zd",
+                            argumentCount);
+    }
+    return JSValueMakeNull(ctx);
+}
 
-  if (argumentCount != 1)
-    {
-      // I am so lazy
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Seed.spawn expected 1 argument");
-      return JSValueMakeNull (ctx);
+static JSValueRef
+seed_spawn(JSContextRef ctx,
+           JSObjectRef function,
+           JSObjectRef this_object,
+           size_t argumentCount,
+           const JSValueRef arguments[],
+           JSValueRef* exception)
+{
+    gchar *line, *stdoutstr, *stderrstr;
+    JSObjectRef ret;
+    GError* error = NULL;
+
+    if (argumentCount != 1) {
+        // I am so lazy
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Seed.spawn expected 1 argument");
+        return JSValueMakeNull(ctx);
     }
 
-  line = seed_value_to_string (ctx, arguments[0], exception);
-  g_spawn_command_line_sync (line, &stdoutstr, &stderrstr, NULL, &error);
-  if (error)
-    {
-      seed_make_exception_from_gerror (ctx, exception, error);
+    line = seed_value_to_string(ctx, arguments[0], exception);
+    g_spawn_command_line_sync(line, &stdoutstr, &stderrstr, NULL, &error);
+    if (error) {
+        seed_make_exception_from_gerror(ctx, exception, error);
 
-      g_free (line);
-      g_error_free (error);
-      return JSValueMakeNull (ctx);
+        g_free(line);
+        g_error_free(error);
+        return JSValueMakeNull(ctx);
     }
 
-  ret = JSObjectMake (ctx, NULL, NULL);
-  seed_object_set_property (ctx, ret, "stdout",
-			    seed_value_from_string (ctx, stdoutstr,
-						    exception));
-  seed_object_set_property (ctx, ret, "stderr",
-			    seed_value_from_string (ctx, stderrstr,
-						    exception));
+    ret = JSObjectMake(ctx, NULL, NULL);
+    seed_object_set_property(ctx, ret, "stdout",
+                             seed_value_from_string(ctx, stdoutstr, exception));
+    seed_object_set_property(ctx, ret, "stderr",
+                             seed_value_from_string(ctx, stderrstr, exception));
 
-  g_free (line);
-  g_free (stdoutstr);
-  g_free (stderrstr);
+    g_free(line);
+    g_free(stdoutstr);
+    g_free(stderrstr);
 
-  return ret;
+    return ret;
 }
 
 static JSValueRef
-seed_quit (JSContextRef ctx,
-	   JSObjectRef function,
-	   JSObjectRef this_object,
-	   size_t argumentCount,
-	   const JSValueRef arguments[], JSValueRef * exception)
+seed_quit(JSContextRef ctx,
+          JSObjectRef function,
+          JSObjectRef this_object,
+          size_t argumentCount,
+          const JSValueRef arguments[],
+          JSValueRef* exception)
 {
-  if (argumentCount == 1)
-    {
-      exit (seed_value_to_int (ctx, arguments[0], NULL));
-    }
-  else if (argumentCount > 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Seed.quit expected " "1 argument, got %zd",
-			   argumentCount);
+    if (argumentCount == 1) {
+        exit(seed_value_to_int(ctx, arguments[0], NULL));
+    } else if (argumentCount > 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Seed.quit expected "
+                            "1 argument, got %zd",
+                            argumentCount);
     }
 
-  exit (EXIT_SUCCESS);
+    exit(EXIT_SUCCESS);
 }
 
 static JSValueRef
-seed_breakpoint (JSContextRef ctx,
-		 JSObjectRef function,
-		 JSObjectRef this_object,
-		 size_t argumentCount,
-		 const JSValueRef arguments[], JSValueRef * exception)
+seed_breakpoint(JSContextRef ctx,
+                JSObjectRef function,
+                JSObjectRef this_object,
+                size_t argumentCount,
+                const JSValueRef arguments[],
+                JSValueRef* exception)
 {
-  G_BREAKPOINT ();
-  return JSValueMakeUndefined (ctx);
+    G_BREAKPOINT();
+    return JSValueMakeUndefined(ctx);
 }
 
-
 static JSValueRef
-seed_argv_get_property (JSContextRef ctx,
-			JSObjectRef object,
-			JSStringRef property_name, JSValueRef * exception)
+seed_argv_get_property(JSContextRef ctx,
+                       JSObjectRef object,
+                       JSStringRef property_name,
+                       JSValueRef* exception)
 {
-  SeedArgvPrivates *priv;
-  gchar *cproperty_name;
-  gsize length;
-  guint index;
-
-  priv = JSObjectGetPrivate (object);
-  if (!priv->argc)
-    return JSValueMakeUndefined (ctx);
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  if (!g_strcmp0 (cproperty_name, "length"))
-    {
-      return seed_value_from_int (ctx, priv->argc, exception);
+    SeedArgvPrivates* priv;
+    gchar* cproperty_name;
+    gsize length;
+    gint index;
+
+    priv = JSObjectGetPrivate(object);
+    if (!priv->argc)
+        return JSValueMakeUndefined(ctx);
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    if (!g_strcmp0(cproperty_name, "length")) {
+        return seed_value_from_int(ctx, priv->argc, exception);
+    }
+    index = atoi(cproperty_name);
+    if (index >= 0 && index < priv->argc) {
+        return seed_value_from_string(ctx, priv->argv[index], exception);
+    } else {
+        seed_make_exception(ctx, exception, "ArgumentError", "ArgumentCount "
+                                                             "%d, got %d",
+                            priv->argc, index);
+        return JSValueMakeNull(ctx);
     }
-  index = atoi (cproperty_name);
-  return seed_value_from_string (ctx, priv->argv[index], exception);
 }
 
 JSClassDefinition seed_argv_def = {
-  0,				/* Version, always 0 */
-  kJSClassAttributeNoAutomaticPrototype,	/* JSClassAttributes */
-  "argv_array",			/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,
-  NULL,
-  NULL,
-  NULL,				/* Has Property */
-  seed_argv_get_property,	/* Get Property */
-  NULL,
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0,                                     /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype, /* JSClassAttributes */
+    "argv_array",                          /* Class Name */
+    NULL,                                  /* Parent Class */
+    NULL,                                  /* Static Values */
+    NULL,
+    NULL,
+    NULL,
+    NULL,                   /* Has Property */
+    seed_argv_get_property, /* Get Property */
+    NULL,
+    NULL, /* Delete Property */
+    NULL, /* Get Property Names */
+    NULL, /* Call As Function */
+    NULL, /* Call As Constructor */
+    NULL, /* Has Instance */
+    NULL  /* Convert To Type */
 };
 
 JSClassRef seed_argv_class;
 
-void
-seed_init_builtins (SeedEngine * local_eng, gint * argc, gchar *** argv)
+static JSValueRef
+seed_ARGV_get_property(JSContextRef ctx,
+                       JSObjectRef object,
+                       JSStringRef property_name,
+                       JSValueRef* exception)
 {
-  SeedArgvPrivates *priv;
-  JSObjectRef arrayObj;
-  JSObjectRef obj =
-    (JSObjectRef) seed_object_get_property (local_eng->context,
-					    local_eng->global,
-					    "Seed");
-
-  seed_create_function (local_eng->context, "include", &seed_include, obj);
-  seed_create_function (local_eng->context, "scoped_include",
-			&seed_scoped_include, obj);
-
-  seed_print_ref =
-    JSObjectMakeFunctionWithCallback (local_eng->context, NULL, &seed_print);
-  seed_object_set_property (local_eng->context, obj, "print", seed_print_ref);
-  seed_object_set_property (local_eng->context, local_eng->global, "print",
-			    seed_print_ref);
-  JSValueProtect (local_eng->context, seed_print_ref);
-
-  seed_printerr_ref =
-    JSObjectMakeFunctionWithCallback (local_eng->context, NULL, &seed_printerr);
-  seed_object_set_property (local_eng->context, obj, "printerr", seed_printerr_ref);
-  seed_object_set_property (local_eng->context, local_eng->global, "printerr",
-			    seed_printerr_ref);
-  JSValueProtect (local_eng->context, seed_printerr_ref);
-
-  seed_create_function (local_eng->context,
-			"check_syntax", &seed_check_syntax, obj);
-  seed_create_function (local_eng->context,
-			"introspect", &seed_introspect, obj);
-  seed_create_function (local_eng->context, "spawn", &seed_spawn, obj);
-  seed_create_function (local_eng->context, "quit", &seed_quit, obj);
-  seed_create_function (local_eng->context, "breakpoint",
-			&seed_breakpoint, obj);
-
-  priv = g_new0 (SeedArgvPrivates, 1);
-  priv->argv = argv ? *argv : 0;
-  priv->argc = argc ? *argc : 0;
-
-  seed_argv_class = JSClassCreate (&seed_argv_def);
-  arrayObj = JSObjectMake (local_eng->context, seed_argv_class, priv);
-
-  seed_object_set_property (local_eng->context, obj, "argv", arrayObj);
+    SeedArgvPrivates* priv;
+    gchar* cproperty_name;
+    gsize length;
+    gint index;
+
+    priv = JSObjectGetPrivate(object);
+    if (!priv->argc)
+        return JSValueMakeUndefined(ctx);
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    if (!g_strcmp0(cproperty_name, "length")) {
+        return seed_value_from_int(ctx, priv->argc - 2, exception);
+    }
+    index = atoi(cproperty_name);
+    if (index >= 0 && index < priv->argc - 2) {
+        return seed_value_from_string(ctx, priv->argv[index + 2], exception);
+    } else {
+        seed_make_exception(ctx, exception, "ArgumentError", "ArgumentCount "
+                                                             "%d, got %d",
+                            priv->argc - 2, index);
+        return JSValueMakeNull(ctx);
+    }
+}
+
+JSClassDefinition seed_ARGV_def = {
+    0,                                     /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype, /* JSClassAttributes */
+    "argv_array",                          /* Class Name */
+    NULL,                                  /* Parent Class */
+    NULL,                                  /* Static Values */
+    NULL,
+    NULL,
+    NULL,
+    NULL,                   /* Has Property */
+    seed_ARGV_get_property, /* Get Property */
+    NULL,
+    NULL, /* Delete Property */
+    NULL, /* Get Property Names */
+    NULL, /* Call As Function */
+    NULL, /* Call As Constructor */
+    NULL, /* Has Instance */
+    NULL  /* Convert To Type */
+};
 
+JSClassRef seed_ARGV_class;
+
+void
+seed_init_builtins(SeedEngine* local_eng, gint* argc, gchar*** argv)
+{
+    SeedArgvPrivates* priv;
+    JSObjectRef argvArrayObj;
+    JSObjectRef ARGVArrayObj;
+    JSObjectRef obj
+      = (JSObjectRef) seed_object_get_property(local_eng->context,
+                                               local_eng->global, "Seed");
+
+    seed_create_function(local_eng->context, "include", &seed_include, obj);
+    seed_create_function(local_eng->context, "scoped_include",
+                         &seed_scoped_include, obj);
+
+    seed_print_ref
+      = JSObjectMakeFunctionWithCallback(local_eng->context, NULL, &seed_print);
+    seed_object_set_property(local_eng->context, obj, "print", seed_print_ref);
+    seed_object_set_property(local_eng->context, local_eng->global, "print",
+                             seed_print_ref);
+    seed_object_set_property(local_eng->context, local_eng->global, "log",
+                             seed_print_ref);
+    JSValueProtect(local_eng->context, seed_print_ref);
+
+    seed_printerr_ref = JSObjectMakeFunctionWithCallback(local_eng->context,
+                                                         NULL, &seed_printerr);
+    seed_object_set_property(local_eng->context, obj, "printerr",
+                             seed_printerr_ref);
+    seed_object_set_property(local_eng->context, local_eng->global, "printerr",
+                             seed_printerr_ref);
+    JSValueProtect(local_eng->context, seed_printerr_ref);
+
+    seed_log_error_ref
+      = JSObjectMakeFunctionWithCallback(local_eng->context, NULL,
+                                         &seed_log_error);
+    seed_object_set_property(local_eng->context, local_eng->global, "logError",
+                             seed_log_error_ref);
+    JSValueProtect(local_eng->context, seed_log_error_ref);
+
+    seed_create_function(local_eng->context, "check_syntax", &seed_check_syntax,
+                         obj);
+    seed_create_function(local_eng->context, "introspect", &seed_introspect,
+                         obj);
+    seed_create_function(local_eng->context, "spawn", &seed_spawn, obj);
+    seed_create_function(local_eng->context, "quit", &seed_quit, obj);
+    seed_create_function(local_eng->context, "breakpoint", &seed_breakpoint,
+                         obj);
+
+    priv = g_new0(SeedArgvPrivates, 1);
+    priv->argv = argv ? *argv : 0;
+    priv->argc = argc ? *argc : 0;
+
+    seed_argv_class = JSClassCreate(&seed_argv_def);
+    argvArrayObj = JSObjectMake(local_eng->context, seed_argv_class, priv);
+
+    seed_object_set_property(local_eng->context, obj, "argv", argvArrayObj);
+
+    seed_ARGV_class = JSClassCreate(&seed_ARGV_def);
+    ARGVArrayObj = JSObjectMake(local_eng->context, seed_ARGV_class, priv);
+
+    seed_object_set_property(local_eng->context, local_eng->global, "ARGV",
+                             ARGVArrayObj);
 }
diff --git a/libseed/seed-builtins.h b/libseed/seed-builtins.h
index 762ecc9..4386de4 100644
--- a/libseed/seed-builtins.h
+++ b/libseed/seed-builtins.h
@@ -25,14 +25,13 @@
 extern JSValueRef seed_print_ref;
 extern JSValueRef seed_printerr_ref;
 
-void seed_init_builtins (SeedEngine * local_eng, gint * argc, gchar *** argv);
+void seed_init_builtins(SeedEngine* local_eng, gint* argc, gchar*** argv);
 
 extern JSClassRef seed_argv_class;
 typedef struct _SeedArgvPrivates
 {
-  gchar **argv;
-  gint argc;
+    gchar** argv;
+    gint argc;
 } SeedArgvPrivates;
 
-
 #endif
diff --git a/libseed/seed-closure.c b/libseed/seed-closure.c
index 62241c8..dc88258 100644
--- a/libseed/seed-closure.c
+++ b/libseed/seed-closure.c
@@ -24,457 +24,439 @@
 JSClassRef seed_native_callback_class;
 
 static void
-seed_closure_finalize (JSObjectRef object)
+seed_closure_finalize(JSObjectRef object)
 {
-  SeedNativeClosure *privates =
-    (SeedNativeClosure *) JSObjectGetPrivate (object);
+    SeedNativeClosure* privates
+      = (SeedNativeClosure*) JSObjectGetPrivate(object);
 
-  SEED_NOTE (FINALIZATION, "Finalizing closure object %p with "
-	     "GIBaseInfo: %s \n", object,
-	     g_base_info_get_name ((GIBaseInfo *) privates->info));
+    SEED_NOTE(FINALIZATION, "Finalizing closure object %p with "
+                            "GIBaseInfo: %s \n",
+              object, g_base_info_get_name((GIBaseInfo*) privates->info));
 
-  g_free (privates->cif->arg_types);
-  g_free (privates->cif);
-  g_callable_info_free_closure (privates->info, privates->closure);
-  g_base_info_unref ((GIBaseInfo *) privates->info);
-
-  JSValueUnprotect (eng->context, object);
+    g_free(privates->cif->arg_types);
+    g_free(privates->cif);
+    g_callable_info_free_closure(privates->info, privates->closure);
+    g_base_info_unref((GIBaseInfo*) privates->info);
 }
 
 static void
-seed_handle_closure (ffi_cif * cif, void *result, void **args, gpointer userdata)
+seed_handle_closure(ffi_cif* cif, void* result, void** args, gpointer userdata)
 {
-  SeedNativeClosure *privates = userdata;
-  gint num_args, i;
-  JSValueRef *jsargs;
-  JSValueRef return_value, exception = 0;
-  GITypeTag return_tag;
-  GIArgInfo *arg_info;
-  GITypeInfo *return_type;
-  GITypeInfo *arg_type;
-  GITypeTag tag;
-  GArgument rarg, return_arg;
-  JSContextRef ctx =  JSGlobalContextCreateInGroup (
-      context_group, 0);
-  GArgument *arg = &rarg;
-  gchar *mes;
-
-  seed_prepare_global_context (ctx);
-
-  SEED_NOTE (INVOCATION, "Invoking closure of type: %s \n",
-	     g_base_info_get_name ((GIBaseInfo *) privates->info));
-
-  num_args = g_callable_info_get_n_args (privates->info);
-  return_type = g_callable_info_get_return_type (privates->info);
-  return_tag = g_type_info_get_tag (return_type);
-  jsargs = (JSValueRef *) g_newa (JSValueRef, num_args);
-
-  for (i = 0; i < num_args; i++)
-    {
-
-      arg_info = g_callable_info_get_arg (privates->info, i);
-      arg_type = g_arg_info_get_type (arg_info);
-      tag = g_type_info_get_tag (arg_type);
-
-      switch (tag)
-	{
+    SeedNativeClosure* privates = userdata;
+    gint num_args, i;
+    JSValueRef* jsargs;
+    JSValueRef return_value, exception = 0;
+    GITypeTag return_tag;
+    GIArgInfo* arg_info;
+    GITypeInfo* return_type;
+    GITypeInfo* arg_type;
+    GITypeTag tag;
+    GArgument rarg, return_arg;
+    JSContextRef ctx = JSGlobalContextCreateInGroup(context_group, 0);
+    GArgument* arg = &rarg;
+    gchar* mes;
+
+    seed_prepare_global_context(ctx);
+
+    SEED_NOTE(INVOCATION, "Invoking closure of type: %s \n",
+              g_base_info_get_name((GIBaseInfo*) privates->info));
+
+    num_args = g_callable_info_get_n_args(privates->info);
+    return_type = g_callable_info_get_return_type(privates->info);
+    return_tag = g_type_info_get_tag(return_type);
+    jsargs = (JSValueRef*) g_newa(JSValueRef, num_args);
+
+    for (i = 0; i < num_args; i++) {
+
+        arg_info = g_callable_info_get_arg(privates->info, i);
+        arg_type = g_arg_info_get_type(arg_info);
+        tag = g_type_info_get_tag(arg_type);
+
+        switch (tag) {
 #if GOBJECT_INTROSPECTION_VERSION < 0x000900
-	case GI_TYPE_TAG_LONG:
-	  arg->v_long = *(glong *) args[i];
-	  break;
-	case GI_TYPE_TAG_ULONG:
-	  arg->v_ulong = *(gulong *) args[i];
-	  break;
-	case GI_TYPE_TAG_INT:
-	  arg->v_int = *(gint *) args[i];
-	  break;
-	case GI_TYPE_TAG_SSIZE:
-	  arg->v_ssize = *(gssize *) args[i];
-	  break;
-	case GI_TYPE_TAG_SIZE:
-	  arg->v_size = *(gsize *) args[i];
-	  break;
-	case GI_TYPE_TAG_UINT:
-	  arg->v_uint = *(guint *) args[i];
-	  break;
+            case GI_TYPE_TAG_LONG:
+                arg->v_long = *(glong*) args[i];
+                break;
+            case GI_TYPE_TAG_ULONG:
+                arg->v_ulong = *(gulong*) args[i];
+                break;
+            case GI_TYPE_TAG_INT:
+                arg->v_int = *(gint*) args[i];
+                break;
+            case GI_TYPE_TAG_SSIZE:
+                arg->v_ssize = *(gssize*) args[i];
+                break;
+            case GI_TYPE_TAG_SIZE:
+                arg->v_size = *(gsize*) args[i];
+                break;
+            case GI_TYPE_TAG_UINT:
+                arg->v_uint = *(guint*) args[i];
+                break;
 #endif
-	case GI_TYPE_TAG_BOOLEAN:
-	  arg->v_boolean = *(gboolean *) args[i];
-	  break;
-	case GI_TYPE_TAG_INT8:
-	  arg->v_int8 = *(gint8 *) args[i];
-	  break;
-	case GI_TYPE_TAG_UINT8:
-	  arg->v_uint8 = *(guint8 *) args[i];
-	  break;
-	case GI_TYPE_TAG_INT16:
-	  arg->v_int16 = *(gint16 *) args[i];
-	  break;
-	case GI_TYPE_TAG_UINT16:
-	  arg->v_uint16 = *(guint16 *) args[i];
-	  break;
-	case GI_TYPE_TAG_INT32:
-	  arg->v_int32 = *(gint32 *) args[i];
-	  break;
-	case GI_TYPE_TAG_UINT32:
-	  arg->v_uint32 = *(guint32 *) args[i];
-	  break;
-	case GI_TYPE_TAG_INT64:
-	  arg->v_int64 = *(gint64 *) args[i];
-	  break;
-	case GI_TYPE_TAG_UINT64:
-	  arg->v_uint64 = *(guint64 *) args[i];
-	  break;
-	case GI_TYPE_TAG_FLOAT:
-	  arg->v_float = *(gfloat *) args[i];
-	  break;
-	case GI_TYPE_TAG_DOUBLE:
-	  arg->v_double = *(gdouble *) args[i];
-	  break;
-	case GI_TYPE_TAG_UTF8:
-	  arg->v_string = *(gchar **) args[i];
-	  break;
-	case GI_TYPE_TAG_INTERFACE:
-	  {
-	    GIBaseInfo *interface;
-	    GIInfoType interface_type;
-
-	    interface = g_type_info_get_interface (arg_type);
-	    interface_type = g_base_info_get_type (interface);
-
-	    if (interface_type == GI_INFO_TYPE_OBJECT ||
-		interface_type == GI_INFO_TYPE_INTERFACE)
-	      {
-		arg->v_pointer = *(gpointer *) args[i];
-		g_base_info_unref (interface);
-		break;
-	      }
-
-	    else if (interface_type == GI_INFO_TYPE_ENUM ||
-		     interface_type == GI_INFO_TYPE_FLAGS)
-	      {
-		arg->v_double = *(double *) args[i];
-		g_base_info_unref (interface);
-		break;
-	      }
-	    else if (interface_type == GI_INFO_TYPE_STRUCT)
-	      {
-		arg->v_pointer = *(gpointer *) args[i];
-		g_base_info_unref (interface);
-		break;
-	      }
-
-	    g_base_info_unref (interface);
-	  }
-	case GI_TYPE_TAG_GLIST:
-	case GI_TYPE_TAG_GSLIST:
-	  arg->v_pointer = *(gpointer *) args[i];
-	  break;
-	default:
-	  arg->v_pointer = 0;
-	}
-      jsargs[i] = seed_value_from_gi_argument (ctx, arg, arg_type, 0);
-      seed_gi_release_arg (g_arg_info_get_ownership_transfer (arg_info),
-			      arg_type, arg);
-      g_base_info_unref ((GIBaseInfo *) arg_info);
-      g_base_info_unref ((GIBaseInfo *) arg_type);
+            case GI_TYPE_TAG_BOOLEAN:
+                arg->v_boolean = *(gboolean*) args[i];
+                break;
+            case GI_TYPE_TAG_INT8:
+                arg->v_int8 = *(gint8*) args[i];
+                break;
+            case GI_TYPE_TAG_UINT8:
+                arg->v_uint8 = *(guint8*) args[i];
+                break;
+            case GI_TYPE_TAG_INT16:
+                arg->v_int16 = *(gint16*) args[i];
+                break;
+            case GI_TYPE_TAG_UINT16:
+                arg->v_uint16 = *(guint16*) args[i];
+                break;
+            case GI_TYPE_TAG_INT32:
+                arg->v_int32 = *(gint32*) args[i];
+                break;
+            case GI_TYPE_TAG_UINT32:
+                arg->v_uint32 = *(guint32*) args[i];
+                break;
+            case GI_TYPE_TAG_INT64:
+                arg->v_int64 = *(gint64*) args[i];
+                break;
+            case GI_TYPE_TAG_UINT64:
+                arg->v_uint64 = *(guint64*) args[i];
+                break;
+            case GI_TYPE_TAG_FLOAT:
+                arg->v_float = *(gfloat*) args[i];
+                break;
+            case GI_TYPE_TAG_DOUBLE:
+                arg->v_double = *(gdouble*) args[i];
+                break;
+            case GI_TYPE_TAG_UTF8:
+                arg->v_string = *(gchar**) args[i];
+                break;
+            case GI_TYPE_TAG_INTERFACE: {
+                GIBaseInfo* interface;
+                GIInfoType interface_type;
+
+                interface = g_type_info_get_interface(arg_type);
+                interface_type = g_base_info_get_type(interface);
+
+                if (interface_type == GI_INFO_TYPE_OBJECT
+                    || interface_type == GI_INFO_TYPE_INTERFACE) {
+                    arg->v_pointer = *(gpointer*) args[i];
+                    g_base_info_unref(interface);
+                    break;
+                }
+
+                else if (interface_type == GI_INFO_TYPE_ENUM
+                         || interface_type == GI_INFO_TYPE_FLAGS) {
+                    arg->v_double = *(double*) args[i];
+                    g_base_info_unref(interface);
+                    break;
+                } else if (interface_type == GI_INFO_TYPE_STRUCT) {
+                    arg->v_pointer = *(gpointer*) args[i];
+                    g_base_info_unref(interface);
+                    break;
+                }
+
+                g_base_info_unref(interface);
+            }
+            case GI_TYPE_TAG_GLIST:
+            case GI_TYPE_TAG_GSLIST:
+            case GI_TYPE_TAG_GHASH:
+                arg->v_pointer = *(gpointer*) args[i];
+                break;
+            default:
+                arg->v_pointer = 0;
+        }
+        jsargs[i] = seed_value_from_gi_argument(ctx, arg, arg_type, 0);
+        seed_gi_release_arg(g_arg_info_get_ownership_transfer(arg_info),
+                            arg_type, arg);
+        g_base_info_unref((GIBaseInfo*) arg_info);
+        g_base_info_unref((GIBaseInfo*) arg_type);
     }
 
-  return_value = (JSValueRef)
-    JSObjectCallAsFunction (ctx,
-			    (JSObjectRef) privates->function, 0,
-			    num_args, jsargs, &exception);
-
-  if (exception)
-    {
-      mes = seed_exception_to_string (ctx, exception);
-      g_warning ("Exception in closure marshal. %s \n", mes);
-      g_free (mes);
-      exception = 0;
+    return_value
+      = (JSValueRef) JSObjectCallAsFunction(ctx,
+                                            (JSObjectRef) privates->function, 0,
+                                            num_args, jsargs, &exception);
+
+    if (exception) {
+        mes = seed_exception_to_string(ctx, exception);
+        g_warning("Exception in closure marshal. %s \n", mes);
+        g_free(mes);
+        exception = 0;
     }
 
-  seed_value_to_gi_argument (ctx, (JSValueRef) return_value, return_type,
-			 &return_arg, 0);
-  switch (return_tag)
-    {
+    seed_value_to_gi_argument(ctx, (JSValueRef) return_value, return_type,
+                              GI_TRANSFER_NOTHING, &return_arg, 0);
+
+    switch (return_tag) {
 #if GOBJECT_INTROSPECTION_VERSION < 0x000900
-    case GI_TYPE_TAG_LONG:
-      *(glong *) result = return_arg.v_long;
-      break;
-    case GI_TYPE_TAG_ULONG:
-      *(gulong *) result = return_arg.v_ulong;
-      break;
-    case GI_TYPE_TAG_INT:
-      *(gint *) result = return_arg.v_int;
-      break;
-    case GI_TYPE_TAG_SSIZE:
-      *(gssize *) result = return_arg.v_ssize;
-      break;
-    case GI_TYPE_TAG_SIZE:
-      *(gsize *) result = return_arg.v_size;
-      break;
-    case GI_TYPE_TAG_UINT:
-      *(guint *) result = return_arg.v_uint;
-      break;
+        case GI_TYPE_TAG_LONG:
+            *(glong*) result = return_arg.v_long;
+            break;
+        case GI_TYPE_TAG_ULONG:
+            *(gulong*) result = return_arg.v_ulong;
+            break;
+        case GI_TYPE_TAG_INT:
+            *(gint*) result = return_arg.v_int;
+            break;
+        case GI_TYPE_TAG_SSIZE:
+            *(gssize*) result = return_arg.v_ssize;
+            break;
+        case GI_TYPE_TAG_SIZE:
+            *(gsize*) result = return_arg.v_size;
+            break;
+        case GI_TYPE_TAG_UINT:
+            *(guint*) result = return_arg.v_uint;
+            break;
 #endif
-    case GI_TYPE_TAG_BOOLEAN:
-      *(gboolean *) result = return_arg.v_boolean;
-      break;
-    case GI_TYPE_TAG_INT8:
-      *(gint8 *) result = return_arg.v_int8;
-      break;
-    case GI_TYPE_TAG_UINT8:
-      *(guint8 *) result = return_arg.v_uint8;
-      break;
-    case GI_TYPE_TAG_INT16:
-      *(gint16 *) result = return_arg.v_int16;
-      break;
-    case GI_TYPE_TAG_UINT16:
-      *(guint16 *) result = return_arg.v_uint16;
-      break;
-    case GI_TYPE_TAG_INT32:
-      *(gint32 *) result = return_arg.v_int32;
-      break;
-    case GI_TYPE_TAG_UINT32:
-      *(guint32 *) result = return_arg.v_uint32;
-      break;
-    case GI_TYPE_TAG_INT64:
-      *(gint64 *) result = return_arg.v_int64;
-      break;
-    case GI_TYPE_TAG_UINT64:
-      *(guint64 *) result = return_arg.v_uint64;
-      break;
-    case GI_TYPE_TAG_FLOAT:
-      *(gfloat *) result = return_arg.v_float;
-      break;
-    case GI_TYPE_TAG_DOUBLE:
-      *(gdouble *) result = return_arg.v_double;
-      break;
-    case GI_TYPE_TAG_UTF8:
-      *(gchar **) result = return_arg.v_string;
-      break;
-    case GI_TYPE_TAG_INTERFACE:
-      {
-	GIBaseInfo *interface;
-	GIInfoType interface_type;
-
-	interface = g_type_info_get_interface (return_type);
-	interface_type = g_base_info_get_type (interface);
-
-	if (interface_type == GI_INFO_TYPE_OBJECT ||
-	    interface_type == GI_INFO_TYPE_INTERFACE)
-	  {
-	    *(gpointer *) result = return_arg.v_pointer;
-	    break;
-	  }
-
-	else if (interface_type == GI_INFO_TYPE_ENUM ||
-		 interface_type == GI_INFO_TYPE_FLAGS)
-	  {
-	    *(double *) result = return_arg.v_double;
-	    break;
-	  }
-	else if (interface_type == GI_INFO_TYPE_STRUCT)
-	  {
-	    *(gpointer *) result = return_arg.v_pointer;
-	    break;
-	  }
-      }
-    case GI_TYPE_TAG_GLIST:
-    case GI_TYPE_TAG_GSLIST:
-      *(gpointer *) result = return_arg.v_pointer;
-      break;
-    default:
-      *(gpointer *) result = 0;
+        case GI_TYPE_TAG_BOOLEAN:
+            *(gboolean*) result = return_arg.v_boolean;
+            break;
+        case GI_TYPE_TAG_INT8:
+            *(gint8*) result = return_arg.v_int8;
+            break;
+        case GI_TYPE_TAG_UINT8:
+            *(guint8*) result = return_arg.v_uint8;
+            break;
+        case GI_TYPE_TAG_INT16:
+            *(gint16*) result = return_arg.v_int16;
+            break;
+        case GI_TYPE_TAG_UINT16:
+            *(guint16*) result = return_arg.v_uint16;
+            break;
+        case GI_TYPE_TAG_INT32:
+            *(gint32*) result = return_arg.v_int32;
+            break;
+        case GI_TYPE_TAG_UINT32:
+            *(guint32*) result = return_arg.v_uint32;
+            break;
+        case GI_TYPE_TAG_INT64:
+            *(gint64*) result = return_arg.v_int64;
+            break;
+        case GI_TYPE_TAG_UINT64:
+            *(guint64*) result = return_arg.v_uint64;
+            break;
+        case GI_TYPE_TAG_FLOAT:
+            *(gfloat*) result = return_arg.v_float;
+            break;
+        case GI_TYPE_TAG_DOUBLE:
+            *(gdouble*) result = return_arg.v_double;
+            break;
+        case GI_TYPE_TAG_UTF8:
+            *(gchar**) result = return_arg.v_string;
+            break;
+        case GI_TYPE_TAG_INTERFACE: {
+            GIBaseInfo* interface;
+            GIInfoType interface_type;
+
+            interface = g_type_info_get_interface(return_type);
+            interface_type = g_base_info_get_type(interface);
+
+            if (interface_type == GI_INFO_TYPE_OBJECT
+                || interface_type == GI_INFO_TYPE_INTERFACE) {
+                *(gpointer*) result = return_arg.v_pointer;
+                break;
+            }
+
+            else if (interface_type == GI_INFO_TYPE_ENUM
+                     || interface_type == GI_INFO_TYPE_FLAGS) {
+                *(double*) result = return_arg.v_double;
+                break;
+            } else if (interface_type == GI_INFO_TYPE_STRUCT) {
+                *(gpointer*) result = return_arg.v_pointer;
+                break;
+            }
+        }
+        case GI_TYPE_TAG_GLIST:
+        case GI_TYPE_TAG_GSLIST:
+        case GI_TYPE_TAG_GHASH:
+            *(gpointer*) result = return_arg.v_pointer;
+            break;
+        default:
+            *(gpointer*) result = 0;
     }
-  g_base_info_unref ((GIBaseInfo *) return_type);
-  
-  JSGarbageCollect(ctx);
+    g_base_info_unref((GIBaseInfo*) return_type);
+
+    JSGarbageCollect(ctx);
 
-  JSGlobalContextRelease ((JSGlobalContextRef) ctx);
+    JSGlobalContextRelease((JSGlobalContextRef) ctx);
 }
 
-SeedNativeClosure *
-seed_make_native_closure (JSContextRef ctx,
-			  GICallableInfo * info,
-			  JSValueRef function)
+SeedNativeClosure*
+seed_make_native_closure(JSContextRef ctx,
+                         GICallableInfo* info,
+                         JSValueRef function)
 {
-  ffi_cif *cif;
-  ffi_closure *closure;
-  GITypeInfo *return_type;
-  SeedNativeClosure *privates;
-  JSObjectRef cached;
-
-  cached =
-    (JSObjectRef) seed_object_get_property (ctx, (JSObjectRef) function,
-					    "__seed_native_closure");
-  if (cached
-      && JSValueIsObjectOfClass (ctx, cached, seed_native_callback_class))
-    {
-      return (SeedNativeClosure *) JSObjectGetPrivate (cached);
+    ffi_cif* cif;
+    ffi_closure* closure;
+    GITypeInfo* return_type;
+    SeedNativeClosure* privates;
+    JSObjectRef cached;
+
+    cached = (JSObjectRef) seed_object_get_property(ctx, (JSObjectRef) function,
+                                                    "__seed_native_closure");
+    if (cached
+        && JSValueIsObjectOfClass(ctx, cached, seed_native_callback_class)) {
+        return (SeedNativeClosure*) JSObjectGetPrivate(cached);
     }
 
-  return_type = g_callable_info_get_return_type (info);
-  cif = g_new0 (ffi_cif, 1);
+    return_type = g_callable_info_get_return_type(info);
+    cif = g_new0(ffi_cif, 1);
 
-  privates = g_new0 (SeedNativeClosure, 1);
-  privates->ctx = ctx;
-  privates->info = (GICallableInfo *) g_base_info_ref ((GIBaseInfo *) info);
-  privates->function = function;
-  privates->cif = cif;
+    privates = g_new0(SeedNativeClosure, 1);
+    privates->ctx = ctx;
+    privates->info = (GICallableInfo*) g_base_info_ref((GIBaseInfo*) info);
+    privates->function = function;
+    privates->cif = cif;
 
-  closure =
-    g_callable_info_prepare_closure (info, cif, seed_handle_closure,
-				     privates);
-  privates->closure = closure;
+    closure = g_callable_info_prepare_closure(info, cif, seed_handle_closure,
+                                              privates);
+    privates->closure = closure;
 
-  JSValueProtect (ctx, function);
+    JSValueProtect(ctx, function);
 
-  seed_object_set_property (ctx, (JSObjectRef) function,
-			    "__seed_native_closure",
-			    (JSValueRef) JSObjectMake (ctx,
-						       seed_native_callback_class,
-						       privates));
+    seed_object_set_property(
+      ctx, (JSObjectRef) function, "__seed_native_closure",
+      (JSValueRef) JSObjectMake(ctx, seed_native_callback_class, privates));
 
-  g_base_info_unref ((GIBaseInfo *) return_type);
+    g_base_info_unref((GIBaseInfo*) return_type);
 
-  return privates;
+    return privates;
 }
 
 static void
-closure_invalidated (gpointer data, GClosure * c)
+closure_invalidated(gpointer data, GClosure* c)
 {
-  SeedClosure *closure = (SeedClosure *) c;
+    SeedClosure* closure = (SeedClosure*) c;
 
-  SEED_NOTE (FINALIZATION, "Finalizing closure.");
-  if (closure->user_data
-      && !JSValueIsUndefined (eng->context, closure->user_data))
-    JSValueUnprotect (eng->context, closure->user_data);
-  if (!JSValueIsUndefined (eng->context, closure->function))
-    JSValueUnprotect (eng->context, closure->function);
-
-  g_free (closure->description);
+    SEED_NOTE(FINALIZATION, "Finalizing closure.");
+    if (closure->user_data
+        && !JSValueIsUndefined(eng->context, closure->user_data))
+        JSValueUnprotect(eng->context, closure->user_data);
+    if (!JSValueIsUndefined(eng->context, closure->function))
+        JSValueUnprotect(eng->context, closure->function);
 
+    g_free(closure->description);
 }
 
 JSObjectRef
-seed_closure_get_callable (GClosure * c)
+seed_closure_get_callable(GClosure* c)
 {
-  return ((SeedClosure *) c)->function;
+    return ((SeedClosure*) c)->function;
 }
 
 JSValueRef
-seed_closure_invoke (GClosure * closure, JSValueRef * args, guint argc,
-		     JSValueRef * exception)
+seed_closure_invoke(GClosure* closure,
+                    JSValueRef* args,
+                    guint argc,
+                    JSValueRef* exception)
 {
-  JSContextRef ctx = JSGlobalContextCreateInGroup (context_group, 0);
-  JSValueRef ret;
+    JSContextRef ctx = JSGlobalContextCreateInGroup(context_group, 0);
+    JSValueRef ret;
 
-  seed_prepare_global_context (ctx);
+    seed_prepare_global_context(ctx);
 
-  ret =
-    seed_closure_invoke_with_context (ctx, closure, args, argc, exception);
+    ret = seed_closure_invoke_with_context(ctx, closure, args, argc, exception);
 
-  JSGlobalContextRelease ((JSGlobalContextRef) ctx);
+    JSGlobalContextRelease((JSGlobalContextRef) ctx);
 
-  return ret;
+    return ret;
 }
 
 JSValueRef
-seed_closure_invoke_with_context (JSContextRef ctx, GClosure * closure,
-				  JSValueRef * args, guint argc,
-				  JSValueRef * exception)
+seed_closure_invoke_with_context(JSContextRef ctx,
+                                 GClosure* closure,
+                                 JSValueRef* args,
+                                 guint argc,
+                                 JSValueRef* exception)
 {
-  JSValueRef *real_args = g_newa (JSValueRef, argc + 1);
-  guint i;
-
-  for (i = 0; i < argc; i++)
-    real_args[i] = args[i];
-  real_args[argc] =
-    ((SeedClosure *) closure)->user_data ? ((SeedClosure *) closure)->
-    user_data : JSValueMakeNull (ctx);
-
-  return
-    JSObjectCallAsFunction (ctx, ((SeedClosure *) closure)->function, NULL,
-			    argc + 1, real_args, exception);
+    JSValueRef* real_args = g_newa(JSValueRef, argc + 1);
+    guint i;
+
+    for (i = 0; i < argc; i++)
+        real_args[i] = args[i];
+    real_args[argc] = ((SeedClosure*) closure)->user_data
+                        ? ((SeedClosure*) closure)->user_data
+                        : JSValueMakeNull(ctx);
+
+    return JSObjectCallAsFunction(ctx, ((SeedClosure*) closure)->function, NULL,
+                                  argc + 1, real_args, exception);
 }
 
-GClosure *
-seed_closure_new_for_signal (JSContextRef ctx, JSObjectRef function,
-			     JSObjectRef user_data, const gchar * description,
-			     guint signal_id)
+GClosure*
+seed_closure_new_for_signal(JSContextRef ctx,
+                            JSObjectRef function,
+                            JSObjectRef user_data,
+                            const gchar* description,
+                            guint signal_id)
 {
-  GClosure *closure;
-
-  closure = g_closure_new_simple (sizeof (SeedClosure), 0);
-  g_closure_add_finalize_notifier (closure, 0, closure_invalidated);
-  g_closure_set_meta_marshal (closure, GUINT_TO_POINTER (signal_id),
-                              seed_signal_marshal_func);
-
-  JSValueProtect (ctx, function);
-  ((SeedClosure *) closure)->function = function;
-  if (user_data && !JSValueIsNull (ctx, user_data))
-    {
-      ((SeedClosure *) closure)->user_data = user_data;
-      JSValueProtect (ctx, user_data);
+    GClosure* closure;
+
+    closure = g_closure_new_simple(sizeof(SeedClosure), 0);
+    g_closure_add_finalize_notifier(closure, 0, closure_invalidated);
+    g_closure_set_meta_marshal(closure, GUINT_TO_POINTER(signal_id),
+                               seed_signal_marshal_func);
+
+    JSValueProtect(ctx, function);
+    ((SeedClosure*) closure)->function = function;
+    if (user_data && !JSValueIsNull(ctx, user_data)) {
+        ((SeedClosure*) closure)->user_data = user_data;
+        JSValueProtect(ctx, user_data);
     }
 
-  if (description)
-    ((SeedClosure *) closure)->description = g_strdup (description);
+    if (description)
+        ((SeedClosure*) closure)->description = g_strdup(description);
 
-  return closure;
+    return closure;
 }
 
-GClosure *
-seed_closure_new (JSContextRef ctx, JSObjectRef function,
-		  JSObjectRef user_data, const gchar * description)
+GClosure*
+seed_closure_new(JSContextRef ctx,
+                 JSObjectRef function,
+                 JSObjectRef user_data,
+                 const gchar* description)
 {
-  return seed_closure_new_for_signal (ctx, function, user_data, description,
-                                      0);
+    return seed_closure_new_for_signal(ctx, function, user_data, description,
+                                       0);
 }
 
 void
-seed_closure_warn_exception (GClosure * c,
-			     JSContextRef ctx, JSValueRef exception)
+seed_closure_warn_exception(GClosure* c, JSContextRef ctx, JSValueRef exception)
 {
-  JSObjectRef callable = seed_closure_get_callable (c);
-  gchar *name = seed_value_to_string (ctx,
-				      seed_object_get_property (ctx, callable,
-								"name"),
-				      NULL);
-  gchar *mes = seed_exception_to_string (ctx, exception);
-
-  g_warning ("Exception in closure (%p) for %s (handler %s). %s", c,
-	     ((SeedClosure *) c)->description,
-	     *name == '\0' ? "[anonymous]" : name, mes);
-
-  g_free (name);
-  g_free (mes);
+    JSObjectRef callable = seed_closure_get_callable(c);
+    gchar* name
+      = seed_value_to_string(ctx,
+                             seed_object_get_property(ctx, callable, "name"),
+                             NULL);
+    gchar* mes = seed_exception_to_string(ctx, exception);
+
+    g_warning("Exception in closure (%p) for %s (handler %s). %s", c,
+              ((SeedClosure*) c)->description,
+              *name == '\0' ? "[anonymous]" : name, mes);
+
+    g_free(name);
+    g_free(mes);
 }
 
 JSClassDefinition seed_native_callback_def = {
-  0,				/* Version, always 0 */
-  0,
-  "seed_native_callback",	/* Class Name */
-  0,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  seed_closure_finalize,	/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0,                            /* Version, always 0 */
+    0,    "seed_native_callback", /* Class Name */
+    0,                            /* Parent Class */
+    NULL,                         /* Static Values */
+    NULL,                         /* Static Functions */
+    NULL, seed_closure_finalize,  /* Finalize */
+    NULL,                         /* Has Property */
+    NULL,                         /* Get Property */
+    NULL,                         /* Set Property */
+    NULL,                         /* Delete Property */
+    NULL,                         /* Get Property Names */
+    NULL,                         /* Call As Function */
+    NULL,                         /* Call As Constructor */
+    NULL,                         /* Has Instance */
+    NULL                          /* Convert To Type */
 };
 
 void
-seed_closures_init (void)
+seed_closures_init(void)
 {
-  seed_native_callback_class = JSClassCreate (&seed_native_callback_def);
-  JSClassRetain (seed_native_callback_class);
+    seed_native_callback_class = JSClassCreate(&seed_native_callback_def);
+    JSClassRetain(seed_native_callback_class);
 }
diff --git a/libseed/seed-closure.h b/libseed/seed-closure.h
index 49246f1..03590a1 100644
--- a/libseed/seed-closure.h
+++ b/libseed/seed-closure.h
@@ -24,58 +24,57 @@
 
 typedef struct _SeedClosure
 {
-  GClosure closure;
+    GClosure closure;
 
-  JSObjectRef function;
-  JSValueRef user_data;
+    JSObjectRef function;
+    JSValueRef user_data;
 
-  GType return_type;
-  gchar *description;
+    GType return_type;
+    gchar* description;
 } SeedClosure;
 
 typedef struct _SeedNativeClosure
 {
-  JSContextRef ctx;
-  GICallableInfo *info;
-  JSValueRef function;
+    JSContextRef ctx;
+    GICallableInfo* info;
+    JSValueRef function;
 
-  ffi_closure *closure;
-  ffi_cif *cif;
+    ffi_closure* closure;
+    ffi_cif* cif;
 } SeedNativeClosure;
 
 extern JSClassRef seed_native_callback_class;
 
-SeedNativeClosure *seed_make_native_closure (JSContextRef ctx,
-					     GICallableInfo * info,
-					     JSValueRef function);
-GClosure *seed_closure_new (JSContextRef ctx,
-			    JSObjectRef function,
-			    JSObjectRef user_data, const gchar * description);
-
-
-GClosure *seed_closure_new_for_signal (JSContextRef ctx,
-				       JSObjectRef function,
-				       JSObjectRef user_data,
-				       const gchar *description,
-				       guint signal_id);
-
-
-JSObjectRef seed_closure_get_callable (GClosure * c);
-
-JSValueRef
-seed_closure_invoke (GClosure * closure, JSValueRef * args, guint argc,
-		     JSValueRef * exception);
-JSValueRef seed_closure_invoke_with_context (JSContextRef ctx,
-					     GClosure * closure,
-					     JSValueRef * args, guint argc,
-					     JSValueRef * exception);
-
-void
-seed_closure_warn_exception (GClosure * c,
-			     JSContextRef ctx, JSValueRef exception);
-
-
-
-void seed_closures_init ();
+SeedNativeClosure* seed_make_native_closure(JSContextRef ctx,
+                                            GICallableInfo* info,
+                                            JSValueRef function);
+GClosure* seed_closure_new(JSContextRef ctx,
+                           JSObjectRef function,
+                           JSObjectRef user_data,
+                           const gchar* description);
+
+GClosure* seed_closure_new_for_signal(JSContextRef ctx,
+                                      JSObjectRef function,
+                                      JSObjectRef user_data,
+                                      const gchar* description,
+                                      guint signal_id);
+
+JSObjectRef seed_closure_get_callable(GClosure* c);
+
+JSValueRef seed_closure_invoke(GClosure* closure,
+                               JSValueRef* args,
+                               guint argc,
+                               JSValueRef* exception);
+JSValueRef seed_closure_invoke_with_context(JSContextRef ctx,
+                                            GClosure* closure,
+                                            JSValueRef* args,
+                                            guint argc,
+                                            JSValueRef* exception);
+
+void seed_closure_warn_exception(GClosure* c,
+                                 JSContextRef ctx,
+                                 JSValueRef exception);
+
+void seed_closures_init();
 
 #endif
diff --git a/libseed/seed-debug.h b/libseed/seed-debug.h
index 32bd87d..11a099f 100644
--- a/libseed/seed-debug.h
+++ b/libseed/seed-debug.h
@@ -24,39 +24,43 @@
 
 #include <glib.h>
 
-typedef enum
-{
-  SEED_DEBUG_ALL = 1 << 0,
-  SEED_DEBUG_MISC = 1 << 1,
-  SEED_DEBUG_FINALIZATION = 1 << 2,
-  SEED_DEBUG_INITIALIZATION = 1 << 3,
-  SEED_DEBUG_CONSTRUCTION = 1 << 4,
-  SEED_DEBUG_INVOCATION = 1 << 5,
-  SEED_DEBUG_SIGNAL = 1 << 6,
-  SEED_DEBUG_STRUCTS = 1 << 7,
-  SEED_DEBUG_GTYPE = 1 << 8,
-  SEED_DEBUG_IMPORTER = 1 << 9,
-  SEED_DEBUG_MODULE = 1 << 10
+typedef enum {
+    SEED_DEBUG_ALL = 1 << 0,
+    SEED_DEBUG_MISC = 1 << 1,
+    SEED_DEBUG_FINALIZATION = 1 << 2,
+    SEED_DEBUG_INITIALIZATION = 1 << 3,
+    SEED_DEBUG_CONSTRUCTION = 1 << 4,
+    SEED_DEBUG_INVOCATION = 1 << 5,
+    SEED_DEBUG_SIGNAL = 1 << 6,
+    SEED_DEBUG_STRUCTS = 1 << 7,
+    SEED_DEBUG_GTYPE = 1 << 8,
+    SEED_DEBUG_IMPORTER = 1 << 9,
+    SEED_DEBUG_MODULE = 1 << 10
 } SeedDebugFlag;
 
 #ifdef SEED_ENABLE_DEBUG
 
-#define SEED_NOTE(type,...)  G_STMT_START {                 \
-    if ((seed_debug_flags & SEED_DEBUG_##type) ||           \
-        seed_debug_flags & SEED_DEBUG_ALL)                  \
-    {                                                       \
-        gchar * _fmt = g_strdup_printf (__VA_ARGS__);       \
-        g_message ("[" #type "] " G_STRLOC ": %s",_fmt);    \
-        g_free (_fmt);                                      \
-    }                                                       \
-} G_STMT_END
+#define SEED_NOTE(type, ...)                                                   \
+    G_STMT_START                                                               \
+    {                                                                          \
+        if ((seed_debug_flags & SEED_DEBUG_##type)                             \
+            || seed_debug_flags & SEED_DEBUG_ALL) {                            \
+            gchar* _fmt = g_strdup_printf(__VA_ARGS__);                        \
+            g_message("[" #type "] " G_STRLOC ": %s", _fmt);                   \
+            g_free(_fmt);                                                      \
+        }                                                                      \
+    }                                                                          \
+    G_STMT_END
 
-#define SEED_MARK()      SEED_NOTE(MISC, "== mark ==")
-#define SEED_DBG(x) { a }
+#define SEED_MARK() SEED_NOTE(MISC, "== mark ==")
+#define SEED_DBG(x)                                                            \
+    {                                                                          \
+        a                                                                      \
+    }
 
 #else /* !SEED_ENABLE_DEBUG */
 
-#define SEED_NOTE(type,...)
+#define SEED_NOTE(type, ...)
 #define SEED_MARK()
 #define SEED_DBG(x)
 
diff --git a/libseed/seed-engine.c b/libseed/seed-engine.c
index 3870fb0..3c524f5 100644
--- a/libseed/seed-engine.c
+++ b/libseed/seed-engine.c
@@ -25,12 +25,15 @@
 #include <stdarg.h>
 #include <string.h>
 #include <pthread.h>
+#include "seed-signals.h"
 
 #include "config.h"
 
 JSObjectRef function_proto;
 
 JSObjectRef seed_obj_ref;
+JSObjectRef ARGV_obj_ref;
+JSObjectRef window_obj_ref;
 
 GQuark qname;
 GQuark qprototype;
@@ -43,50 +46,50 @@ JSContextGroupRef context_group;
 
 JSStringRef defaults_script;
 
-gchar *glib_message = 0;
+gchar* glib_message = 0;
 
-GIBaseInfo *base_info_info = 0;
+GIBaseInfo* base_info_info = 0;
 
 GQuark js_ref_quark;
 
-guint seed_debug_flags = 0;	/* global seed debug flag */
+guint seed_debug_flags = 0;              /* global seed debug flag */
 gboolean seed_arg_print_version = FALSE; // Flag to print version and quit
 
 pthread_key_t seed_next_gobject_wrapper_key;
 
 #ifdef SEED_ENABLE_DEBUG
-static const GDebugKey seed_debug_keys[] = {
-  {"misc", SEED_DEBUG_MISC},
-  {"finalization", SEED_DEBUG_FINALIZATION},
-  {"initialization", SEED_DEBUG_INITIALIZATION},
-  {"signal", SEED_DEBUG_SIGNAL},
-  {"invocation", SEED_DEBUG_INVOCATION},
-  {"structs", SEED_DEBUG_STRUCTS},
-  {"construction", SEED_DEBUG_CONSTRUCTION},
-  {"gtype", SEED_DEBUG_GTYPE},
-  {"importer", SEED_DEBUG_IMPORTER},
-  {"module", SEED_DEBUG_MODULE}
-};
+static const GDebugKey seed_debug_keys[]
+  = { { "misc", SEED_DEBUG_MISC },
+      { "finalization", SEED_DEBUG_FINALIZATION },
+      { "initialization", SEED_DEBUG_INITIALIZATION },
+      { "signal", SEED_DEBUG_SIGNAL },
+      { "invocation", SEED_DEBUG_INVOCATION },
+      { "structs", SEED_DEBUG_STRUCTS },
+      { "construction", SEED_DEBUG_CONSTRUCTION },
+      { "gtype", SEED_DEBUG_GTYPE },
+      { "importer", SEED_DEBUG_IMPORTER },
+      { "module", SEED_DEBUG_MODULE } };
 #endif /* SEED_ENABLE_DEBUG */
 
 static bool
-seed_gobject_has_instance (JSContextRef ctx, JSObjectRef constructor,
-			  JSValueRef possible_instance, JSValueRef* exception)
+seed_gobject_has_instance(JSContextRef ctx,
+                          JSObjectRef constructor,
+                          JSValueRef possible_instance,
+                          JSValueRef* exception)
 {
-  GType constructor_type, value_type;
-  if (JSValueIsNull (ctx, possible_instance) ||
-      !JSValueIsObject (ctx, possible_instance) ||
-      !JSValueIsObjectOfClass (ctx, possible_instance, gobject_class))
-    return FALSE;
+    GType constructor_type, value_type;
+    if (JSValueIsNull(ctx, possible_instance)
+        || !JSValueIsObject(ctx, possible_instance)
+        || !JSValueIsObjectOfClass(ctx, possible_instance, gobject_class))
+        return FALSE;
 
-  constructor_type = (GType) JSObjectGetPrivate (constructor);
-  value_type = G_OBJECT_TYPE ((GObject *)
-			      JSObjectGetPrivate ((JSObjectRef) possible_instance));
+    constructor_type = (GType) JSObjectGetPrivate(constructor);
+    value_type = G_OBJECT_TYPE(
+      (GObject*) JSObjectGetPrivate((JSObjectRef) possible_instance));
 
-  return g_type_is_a (value_type, constructor_type);
+    return g_type_is_a(value_type, constructor_type);
 }
 
-
 /**
  * seed_prepare_global_context:
  * @ctx: A #SeedContext on which to add the default set of global objects.
@@ -96,1418 +99,1503 @@ seed_gobject_has_instance (JSContextRef ctx, JSObjectRef constructor,
  *
  */
 void
-seed_prepare_global_context (JSContextRef ctx)
+seed_prepare_global_context(JSContextRef ctx)
 {
-  JSObjectRef global = JSContextGetGlobalObject (ctx);
-  JSStringRef check_sprintf =  JSStringCreateWithUTF8CString ("sprintf");
-
-  seed_object_set_property (ctx, global, "imports", importer);
-  seed_object_set_property (ctx, global, "GType", seed_gtype_constructor);
-  seed_object_set_property (ctx, global, "Seed", seed_obj_ref);
-  seed_object_set_property (ctx, global, "print", seed_print_ref);
-  seed_object_set_property (ctx, global, "printerr", seed_printerr_ref);
-
-  /* No need to re-import Seed.js if not needed. */
-  if (!JSObjectHasProperty( ctx, seed_obj_ref,  check_sprintf)) {
-    JSEvaluateScript (ctx, defaults_script, NULL, NULL, 0, NULL);
-  }
-  JSStringRelease (check_sprintf);
+    JSObjectRef global = JSContextGetGlobalObject(ctx);
+    JSStringRef check_sprintf = JSStringCreateWithUTF8CString("sprintf");
+
+    seed_object_set_property(ctx, global, "imports", importer);
+    seed_object_set_property(ctx, global, "GType", seed_gtype_constructor);
+    seed_object_set_property(ctx, global, "Seed", seed_obj_ref);
+    seed_object_set_property(ctx, global, "ARGV", ARGV_obj_ref);
+    seed_object_set_property(ctx, global, "window", window_obj_ref);
+    seed_object_set_property(ctx, global, "print", seed_print_ref);
+    seed_object_set_property(ctx, global, "printerr", seed_printerr_ref);
+
+    /* No need to re-import Seed.js if not needed. */
+    if (!JSObjectHasProperty(ctx, seed_obj_ref, check_sprintf)) {
+        JSEvaluateScript(ctx, defaults_script, NULL, NULL, 0, NULL);
+    }
+    JSStringRelease(check_sprintf);
 }
 
 static JSObjectRef
-seed_struct_constructor_invoked (JSContextRef ctx,
-				 JSObjectRef constructor,
-				 size_t argumentCount,
-				 const JSValueRef arguments[],
-				 JSValueRef * exception)
+seed_struct_constructor_invoked(JSContextRef ctx,
+                                JSObjectRef constructor,
+                                size_t argumentCount,
+                                const JSValueRef arguments[],
+                                JSValueRef* exception)
 {
-  GIBaseInfo *info = JSObjectGetPrivate (constructor);
-  JSValueRef ret;
-  JSObjectRef parameters = 0;
-
-  if (argumentCount == 1)
-    {
-      if (!JSValueIsObject (ctx, arguments[0]))
-	{
-
-	  // new GObject.GValue()  can accept anything as a argument...
-          GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *) info);
-          if (!g_type_is_a (gtype, G_TYPE_VALUE)) {
-            seed_make_exception (ctx, exception, "ArgumentError",
-                                 "Constructor expects object as argument");
-            return (JSObjectRef) JSValueMakeNull (ctx);
-          }
-	}
-      parameters = (JSObjectRef) arguments[0];
+    GIBaseInfo* info = JSObjectGetPrivate(constructor);
+    JSValueRef ret;
+    JSObjectRef parameters = 0;
+
+    if (argumentCount == 1) {
+        if (!JSValueIsObject(ctx, arguments[0])) {
+
+            // new GObject.GValue()  can accept anything as a argument...
+            GType gtype
+              = g_registered_type_info_get_g_type((GIRegisteredTypeInfo*) info);
+            if (!g_type_is_a(gtype, G_TYPE_VALUE)) {
+                seed_make_exception(ctx, exception, "ArgumentError",
+                                    "Constructor expects object as argument");
+                return (JSObjectRef) JSValueMakeNull(ctx);
+            }
+        }
+        parameters = (JSObjectRef) arguments[0];
     }
-  ret = seed_construct_struct_type_with_parameters (ctx, info,
-						    parameters, exception);
+    ret = seed_construct_struct_type_with_parameters(ctx, info, parameters,
+                                                     exception);
 
-  return (JSObjectRef) ret;
+    return (JSObjectRef) ret;
 }
 
 static JSObjectRef
-seed_gobject_constructor_invoked (JSContextRef ctx,
-				  JSObjectRef constructor,
-				  size_t argumentCount,
-				  const JSValueRef arguments[],
-				  JSValueRef * exception)
+seed_gobject_constructor_invoked(JSContextRef ctx,
+                                 JSObjectRef constructor,
+                                 size_t argumentCount,
+                                 const JSValueRef arguments[],
+                                 JSValueRef* exception)
 {
-  GType type;
-  GParameter *params;
-  GObjectClass *oclass;
-  GObject *gobject;
-  GParamSpec *param_spec;
-  gchar *prop_name;
-  gint i, nparams = 0, length, ri;
-  JSObjectRef ret;
-  JSPropertyNameArrayRef jsprops = 0;
-  JSStringRef jsprop_name;
-  JSValueRef jsprop_value;
-
-  type = (GType) JSObjectGetPrivate (constructor);
-  if (!type)
-    return 0;
-
-  oclass = g_type_class_ref (type);
-
-  // Check for an exception in class init (which may have just been called
-  // by g_type_class_ref, if this is the first construction of this class).
-  // Bubble up the exception, and clear it from the class's qdata so that
-  // this doesn't happen on subsequent construction.
-  GQuark class_init_exception_q =
-	g_quark_from_static_string("type-class-init-exception");
-  JSValueRef class_init_exception =
-	(JSValueRef)g_type_get_qdata(type, class_init_exception_q);
-  if(class_init_exception)
-    {
-      *exception = class_init_exception;
-      g_type_set_qdata(type, class_init_exception_q, NULL);
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    GType type;
+    GParameter* params;
+    GObjectClass* oclass;
+    GObject* gobject;
+    GParamSpec* param_spec;
+    gchar* prop_name;
+    gint i, nparams = 0, length, ri;
+    JSObjectRef ret;
+    JSPropertyNameArrayRef jsprops = 0;
+    JSStringRef jsprop_name;
+    JSValueRef jsprop_value;
+
+    type = (GType) JSObjectGetPrivate(constructor);
+    if (!type)
+        return 0;
+
+    oclass = g_type_class_ref(type);
+
+    // Check for an exception in class init (which may have just been called
+    // by g_type_class_ref, if this is the first construction of this class).
+    // Bubble up the exception, and clear it from the class's qdata so that
+    // this doesn't happen on subsequent construction.
+    GQuark class_init_exception_q
+      = g_quark_from_static_string("type-class-init-exception");
+    JSValueRef class_init_exception
+      = (JSValueRef) g_type_get_qdata(type, class_init_exception_q);
+    if (class_init_exception) {
+        *exception = class_init_exception;
+        g_type_set_qdata(type, class_init_exception_q, NULL);
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
 
-  if (argumentCount > 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Constructor expects"
-			   " 1 argument, got %zd", argumentCount);
+    if (argumentCount > 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Constructor expects"
+                            " 1 argument, got %zd",
+                            argumentCount);
 
-      return (JSObjectRef) JSValueMakeNull (ctx);
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
 
-  if (argumentCount == 1)
-    {
-      if (!JSValueIsObject (ctx, arguments[0]))
-	{
-	  seed_make_exception (ctx, exception, "ArgumentError",
-			       "Constructor expects object as argument");
-	  g_type_class_unref (oclass);
-	  return (JSObjectRef) JSValueMakeNull (ctx);
-	}
-
-      jsprops = JSObjectCopyPropertyNames (ctx, (JSObjectRef) arguments[0]);
-      nparams = JSPropertyNameArrayGetCount (jsprops);
-    }
-  ri = i = 0;
-
-  params = g_new0 (GParameter, nparams + 1);
-  SEED_NOTE (INITIALIZATION, "Constructing object of type %s",
-	     g_type_name (type));
-
-
-  pthread_setspecific (seed_next_gobject_wrapper_key, 
-		       seed_make_wrapper_for_type (ctx, type));
-
-  while (i < nparams)
-    {
-      GType type;
-      jsprop_name = JSPropertyNameArrayGetNameAtIndex (jsprops, i);
-
-      length = JSStringGetMaximumUTF8CStringSize (jsprop_name);
-      prop_name = g_alloca (length * sizeof (gchar));
-      JSStringGetUTF8CString (jsprop_name, prop_name, length);
-
-      param_spec = g_object_class_find_property (oclass, prop_name);
-
-      jsprop_value = JSObjectGetProperty (ctx,
-					  (JSObjectRef) arguments[0],
-					  jsprop_name, NULL);
-
-      if (param_spec == NULL)
-	{
-	  JSObjectSetProperty (ctx, pthread_getspecific(seed_next_gobject_wrapper_key), jsprop_name,
-			       jsprop_value, 0, NULL);
-	  ++i;
-	  continue;
-	}
-      // TODO: exception handling
-
-      if (g_type_is_a (param_spec->value_type, G_TYPE_ENUM))
-	type = G_TYPE_INT;
-      else
-	type = param_spec->value_type;
-
-      seed_value_to_gvalue (ctx, jsprop_value,
-			    type, &params[ri].value, exception);
-
-      if (*exception)
-	{
-	  g_free (params);
-	  JSPropertyNameArrayRelease (jsprops);
-	  pthread_setspecific(seed_next_gobject_wrapper_key, NULL);
-	  return 0;
-	}
-      params[ri].name = prop_name;
-
-      ++i;
-      ++ri;
+    if (argumentCount == 1) {
+        if (!JSValueIsObject(ctx, arguments[0])) {
+            seed_make_exception(ctx, exception, "ArgumentError",
+                                "Constructor expects object as argument");
+            g_type_class_unref(oclass);
+            return (JSObjectRef) JSValueMakeNull(ctx);
+        }
+
+        jsprops = JSObjectCopyPropertyNames(ctx, (JSObjectRef) arguments[0]);
+        nparams = JSPropertyNameArrayGetCount(jsprops);
     }
+    ri = i = 0;
+
+    params = g_new0(GParameter, nparams + 1);
+    SEED_NOTE(INITIALIZATION, "Constructing object of type %s",
+              g_type_name(type));
+
+    pthread_setspecific(seed_next_gobject_wrapper_key,
+                        seed_make_wrapper_for_type(ctx, type));
 
-  if (jsprops)
-    JSPropertyNameArrayRelease (jsprops);
+    while (i < nparams) {
+        GType type;
+        jsprop_name = JSPropertyNameArrayGetNameAtIndex(jsprops, i);
+
+        length = JSStringGetMaximumUTF8CStringSize(jsprop_name);
+        prop_name = g_alloca(length * sizeof(gchar));
+        JSStringGetUTF8CString(jsprop_name, prop_name, length);
+
+        param_spec = g_object_class_find_property(oclass, prop_name);
+
+        jsprop_value = JSObjectGetProperty(ctx, (JSObjectRef) arguments[0],
+                                           jsprop_name, NULL);
+
+        if (param_spec == NULL) {
+            JSObjectSetProperty(ctx, pthread_getspecific(
+                                       seed_next_gobject_wrapper_key),
+                                jsprop_name, jsprop_value, 0, NULL);
+            ++i;
+            continue;
+        }
+        // TODO: exception handling
+
+        if (g_type_is_a(param_spec->value_type, G_TYPE_ENUM))
+            type = G_TYPE_INT;
+        else
+            type = param_spec->value_type;
+
+        seed_value_to_gvalue(ctx, jsprop_value, type, &params[ri].value,
+                             exception);
+
+        if (*exception) {
+            g_free(params);
+            JSPropertyNameArrayRelease(jsprops);
+            pthread_setspecific(seed_next_gobject_wrapper_key, NULL);
+            return 0;
+        }
+        params[ri].name = prop_name;
+
+        ++i;
+        ++ri;
+    }
 
-     SEED_NOTE (INITIALIZATION, "G_TYPE_IS_INSTANTIATABLE  = %d  G_TYPE_IS_ABSTRACT = %d",
-	    G_TYPE_IS_INSTANTIATABLE(type) , G_TYPE_IS_ABSTRACT(type));
+    if (jsprops)
+        JSPropertyNameArrayRelease(jsprops);
 
+    SEED_NOTE(INITIALIZATION,
+              "G_TYPE_IS_INSTANTIATABLE  = %d  G_TYPE_IS_ABSTRACT = %d",
+              G_TYPE_IS_INSTANTIATABLE(type), G_TYPE_IS_ABSTRACT(type));
 
-    
-    if (! G_TYPE_IS_INSTANTIATABLE(type) ||  G_TYPE_IS_ABSTRACT(type) ) {        
-        seed_make_exception (ctx, exception, "ArgumentError",
-			   "Type can not be created - not INSTANTIATABLE");
+    if (!G_TYPE_IS_INSTANTIATABLE(type) || G_TYPE_IS_ABSTRACT(type)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Type can not be created - not INSTANTIATABLE");
 
-        return (JSObjectRef) JSValueMakeNull (ctx);
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
-         
-    
-    gobject = g_object_newv (type, ri, params);
 
+    gobject = g_object_newv(type, ri, params);
 
-  if (G_IS_INITIALLY_UNOWNED (gobject) && !g_object_is_floating (gobject))
-    g_object_ref (gobject);
-  else if (g_object_is_floating (gobject))
-    g_object_ref_sink (gobject);
+    if (G_IS_INITIALLY_UNOWNED(gobject) && !g_object_is_floating(gobject))
+        g_object_ref(gobject);
+    else if (g_object_is_floating(gobject))
+        g_object_ref_sink(gobject);
 
-  if (!gobject)
-    ret = (JSObjectRef) JSValueMakeNull (ctx);
-  else
-    ret = (JSObjectRef) seed_value_from_object (ctx, gobject, exception);
+    if (!gobject)
+        ret = (JSObjectRef) JSValueMakeNull(ctx);
+    else
+        ret = (JSObjectRef) seed_value_from_object(ctx, gobject, exception);
 
-  for (i = 0; i < ri; i++)
-    {
-      g_value_unset (&params[i].value);
+    for (i = 0; i < ri; i++) {
+        g_value_unset(&params[i].value);
     }
 
-  g_object_unref (gobject);
+    g_object_unref(gobject);
 
-  g_type_class_unref (oclass);
+    g_type_class_unref(oclass);
 
-  g_free (params);
+    g_free(params);
 
-  return ret;
+    return ret;
 }
 
 static JSValueRef
-seed_gobject_property_type (JSContextRef ctx,
-			    JSObjectRef function,
-			    JSObjectRef this_object,
-			    size_t argumentCount,
-			    const JSValueRef arguments[],
-			    JSValueRef * exception)
+seed_gobject_property_type(JSContextRef ctx,
+                           JSObjectRef function,
+                           JSObjectRef this_object,
+                           size_t argumentCount,
+                           const JSValueRef arguments[],
+                           JSValueRef* exception)
 {
-  GParamSpec *spec;
-  gchar *name;
-  GObject *this;
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "__property_type expects 1 argument"
-			   "got %zd", argumentCount);
-      return JSValueMakeNull (ctx);
+    GParamSpec* spec;
+    gchar* name;
+    GObject* this;
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "__property_type expects 1 argument"
+                            "got %zd",
+                            argumentCount);
+        return JSValueMakeNull(ctx);
     }
 
-  this = seed_value_to_object (ctx, this_object, exception);
-  name = seed_value_to_string (ctx, arguments[0], exception);
+    this = seed_value_to_object(ctx, this_object, exception);
+    name = seed_value_to_string(ctx, arguments[0], exception);
 
-  spec = g_object_class_find_property (G_OBJECT_GET_CLASS (this), name);
-  g_free (name);
+    spec = g_object_class_find_property(G_OBJECT_GET_CLASS(this), name);
+    g_free(name);
 
-  return seed_value_from_long (ctx, spec->value_type, exception);
+    return seed_value_from_long(ctx, spec->value_type, exception);
 }
 
 static JSValueRef
-seed_gobject_ref_count (JSContextRef ctx,
-			JSObjectRef function,
-			JSObjectRef this_object,
-			size_t argumentCount,
-			const JSValueRef arguments[], JSValueRef * exception)
+seed_gobject_ref_count(JSContextRef ctx,
+                       JSObjectRef function,
+                       JSObjectRef this_object,
+                       size_t argumentCount,
+                       const JSValueRef arguments[],
+                       JSValueRef* exception)
 {
-  GObject *this;
+    GObject* this;
 
-  this = seed_value_to_object (ctx, (JSValueRef) this_object, exception);
+    this = seed_value_to_object(ctx, (JSValueRef) this_object, exception);
 
-  return seed_value_from_int (ctx, this->ref_count, exception);
+    return seed_value_from_int(ctx, this->ref_count, exception);
 }
 
 static void
-seed_gobject_method_finalize (JSObjectRef method)
+seed_gobject_method_finalize(JSObjectRef method)
 {
-  GIBaseInfo *info = (GIBaseInfo *) JSObjectGetPrivate (method);
-  if (info)
-    g_base_info_unref (info);
+    GIBaseInfo* info = (GIBaseInfo*) JSObjectGetPrivate(method);
+    if (info)
+        g_base_info_unref(info);
 }
 
-typedef void (*InitMethodCallback) (gint * argc, gchar *** argv);
+typedef void (*InitMethodCallback)(gint* argc, gchar*** argv);
 
 static gboolean
-seed_gobject_init_build_argv (JSContextRef ctx,
-			      JSObjectRef array,
-			      SeedArgvPrivates * priv, JSValueRef * exception)
+seed_gobject_init_build_argv(JSContextRef ctx,
+                             JSObjectRef array,
+                             SeedArgvPrivates* priv,
+                             JSValueRef* exception)
 {
-  guint i, length;
-  JSValueRef jsl;
+    guint i, length;
+    JSValueRef jsl;
 
-  jsl = seed_object_get_property (ctx, array, "length");
-  if (JSValueIsNull (ctx, jsl) || JSValueIsUndefined (ctx, jsl))
-    return FALSE;
+    jsl = seed_object_get_property(ctx, array, "length");
+    if (JSValueIsNull(ctx, jsl) || JSValueIsUndefined(ctx, jsl))
+        return FALSE;
 
-  length = seed_value_to_uint (ctx, jsl, exception);
-  priv->argv = g_new (gchar *, length);
-  priv->argc = length;
-
-  for (i = 0; i < length; i++)
-    {
-      priv->argv[i] = seed_value_to_string (ctx,
-					    JSObjectGetPropertyAtIndex (ctx,
-									array,
-									i,
-									exception),
-					    exception);
-    }
-  return TRUE;
+    length = seed_value_to_uint(ctx, jsl, exception);
+    priv->argv = g_new(gchar*, length);
+    priv->argc = length;
 
+    for (i = 0; i < length; i++) {
+        priv->argv[i] = seed_value_to_string(
+          ctx, JSObjectGetPropertyAtIndex(ctx, array, i, exception), exception);
+    }
+    return TRUE;
 }
 
 static JSValueRef
-seed_gobject_init_method_invoked (JSContextRef ctx,
-				  JSObjectRef function,
-				  JSObjectRef this_object,
-				  size_t argumentCount,
-				  const JSValueRef arguments[],
-				  JSValueRef * exception)
+seed_gobject_init_method_invoked(JSContextRef ctx,
+                                 JSObjectRef function,
+                                 JSObjectRef this_object,
+                                 size_t argumentCount,
+                                 const JSValueRef arguments[],
+                                 JSValueRef* exception)
 {
-  GIBaseInfo *info;
-  GTypelib *typelib;
-  InitMethodCallback c;
-  SeedArgvPrivates *priv = NULL;
-  gboolean allocated = FALSE;
-
-  if (argumentCount != 1 && argumentCount != 2)
-    {
-      seed_make_exception (ctx, exception,
-			   "ArgumentError",
-			   "init method expects 1 argument, got %zd",
-			   argumentCount);
-      return JSValueMakeUndefined (ctx);
+    GIBaseInfo* info;
+    GTypelib* typelib;
+    InitMethodCallback c;
+    SeedArgvPrivates* priv = NULL;
+    gboolean allocated = FALSE;
+
+    if (argumentCount != 1 && argumentCount != 2) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "init method expects 1 argument, got %zd",
+                            argumentCount);
+        return JSValueMakeUndefined(ctx);
     }
 
-  if (argumentCount == 1)
-    {
-      if (JSValueIsNull (ctx, arguments[0])
-	  || !JSValueIsObject (ctx, arguments[0]))
-
-	{
-	  seed_make_exception (ctx, exception,
-			       "ArgumentError",
-			       "init method expects an array object as argument");
-	  return JSValueMakeUndefined (ctx);
-	}
-      if (JSValueIsObjectOfClass (ctx, arguments[0], seed_argv_class))
-	{
-	  priv = JSObjectGetPrivate ((JSObjectRef) arguments[0]);
-	}
-      else
-	{
-	  priv = g_newa (SeedArgvPrivates, 1);
-	  if (!seed_gobject_init_build_argv (ctx,
-					     (JSObjectRef) arguments[0],
-					     priv, exception))
-	    {
-	      seed_make_exception (ctx, exception, "ArgumentError",
-				   "Init method expects an array as argument");
-	      return JSValueMakeUndefined (ctx);
-
-	    }
-	  allocated = TRUE;
-	}
+    if (argumentCount == 1) {
+        if (!JSValueIsNull(ctx, arguments[0])
+            && !JSValueIsObject(ctx, arguments[0]))
+
+        {
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "init method expects an array object as argument");
+            return JSValueMakeUndefined(ctx);
+        }
+        if (JSValueIsNull(ctx, arguments[0])) {
+            priv = NULL;
+        } else if (JSValueIsObjectOfClass(ctx, arguments[0], seed_argv_class)) {
+            priv = JSObjectGetPrivate((JSObjectRef) arguments[0]);
+        } else {
+            priv = g_newa(SeedArgvPrivates, 1);
+            if (!seed_gobject_init_build_argv(ctx, (JSObjectRef) arguments[0],
+                                              priv, exception)) {
+                seed_make_exception(ctx, exception, "ArgumentError",
+                                    "Init method expects an array as argument");
+                return JSValueMakeUndefined(ctx);
+            }
+            allocated = TRUE;
+        }
     }
 
-  info = JSObjectGetPrivate (function);
-  typelib = g_base_info_get_typelib (info);
-  g_typelib_symbol (typelib,
-		    g_function_info_get_symbol ((GIFunctionInfo *) info),
-		    (gpointer *) & c);
-  // Backwards compatibility
-  if (!priv)
-    {
-      c (NULL, NULL);
-      return JSValueMakeUndefined (ctx);
+    info = JSObjectGetPrivate(function);
+    typelib = g_base_info_get_typelib(info);
+    g_typelib_symbol(typelib,
+                     g_function_info_get_symbol((GIFunctionInfo*) info),
+                     (gpointer*) &c);
+    // Backwards compatibility
+    if (!priv) {
+        c(NULL, NULL);
+        return JSValueMakeUndefined(ctx);
     }
 
-  c (&priv->argc, &priv->argv);
+    c(&priv->argc, &priv->argv);
+
+    if (allocated)
+        g_free(priv->argv);
+
+    return JSValueMakeUndefined(ctx);
+}
+
+// Pre-process the arguments list to find which arguments needs to be skipped.
+gint*
+_process_skipped_arguments(const JSValueRef arguments[],
+                           GIBaseInfo* info,
+                           gint* out_skipped_args)
+{
+    int n_args = g_callable_info_get_n_args((GICallableInfo*) info);
+    int skipped_args = 0;
+    ;
+    int i;
+
+    gint* skip = g_new0(gint, n_args + 1);
+
+    GITypeInfo* type_info = NULL;
+    GIArgInfo* arg_info = NULL;
+
+    for (i = 0; (i < (n_args)); i++) {
+        arg_info = g_callable_info_get_arg((GICallableInfo*) info, i);
+        type_info = g_arg_info_get_type(arg_info);
+        GIDirection dir = g_arg_info_get_direction(arg_info);
+
+        GITypeTag type_tag = g_type_info_get_tag(type_info);
+        gint array_len_pos = g_type_info_get_array_length(type_info);
+
+        if (dir == GI_DIRECTION_IN)
+            if (type_tag == GI_TYPE_TAG_ARRAY
+                && g_type_info_get_array_type(type_info) == GI_ARRAY_TYPE_C
+                && array_len_pos >= 0) {
+                skip[array_len_pos] = 1;
+                skipped_args++;
+            }
 
-  if (allocated)
-    g_free (priv->argv);
+        g_base_info_unref((GIBaseInfo*) type_info);
+        g_base_info_unref((GIBaseInfo*) arg_info);
+        type_info = NULL;
+        arg_info = NULL;
+    }
 
-  return JSValueMakeUndefined (ctx);
+    *out_skipped_args = skipped_args;
+    return skip;
+}
+
+void
+_add_jsvalue_in_array(JSContextRef ctx,
+                      JSObjectRef dest,
+                      gint pos,
+                      JSValueRef obj)
+{
+    gchar* int_str = g_strdup_printf("%d", pos);
+    seed_object_set_property(ctx, (JSObjectRef) dest, int_str, obj);
+    g_free(int_str);
 }
 
 static JSValueRef
-seed_gobject_method_invoked (JSContextRef ctx,
-			     JSObjectRef function,
-			     JSObjectRef this_object,
-			     size_t argumentCount,
-			     const JSValueRef arguments[],
-			     JSValueRef * exception)
+seed_gobject_method_invoked(JSContextRef ctx,
+                            JSObjectRef function,
+                            JSObjectRef this_object,
+                            size_t argumentCount,
+                            const JSValueRef arguments[],
+                            JSValueRef* exception)
 {
-  GIBaseInfo *info;
-  GObject *object = NULL;
-  gboolean instance_method = TRUE;
-  gboolean is_caller_allocates = FALSE;
-  gboolean *caller_allocated;
-  GIBaseInfo *iface_info = NULL;
-  GArgument retval;
-  GArgument *in_args;
-  GArgument *out_args;
-  GArgument *out_values;
-  gint *out_pos;
-  gint first_out = -1;
-  guint use_return_as_out = 0;
-  guint n_args, n_in_args, n_out_args, i; 
-  guint in_args_pos, out_args_pos;
-  GIArgInfo *arg_info   = NULL;
-  GITypeInfo *type_info = NULL;
-  GITypeTag tag;
-  GIDirection dir;
-  JSValueRef retval_ref;
-  GError *error = 0;
-  gint length_arg_pos = 0;
-  guint64 array_len = 0;
-
-  info = JSObjectGetPrivate (function);
-  
-  // We just want to check if there IS an object, not actually throw an
-  // exception if we don't get it.
-  if (!this_object || !
-      ((object = seed_value_to_object (ctx, this_object, 0)) ||
-       (object = seed_pointer_get_pointer (ctx, this_object))))
-    instance_method = FALSE;
-
-  n_args = g_callable_info_get_n_args ((GICallableInfo *) info);
-
-  out_pos = g_new0 (gint, n_args + 1);
-  in_args = g_new0 (GArgument, n_args + 1);
-  out_args = g_new0 (GArgument, n_args + 1);
-  out_values = g_new0 (GArgument, n_args + 1);
-  n_in_args = n_out_args = 0;
-  caller_allocated = g_new0 (gboolean, n_args + 1);
-  
-  // start buy pushing the object onto the call stack.
-  
-  if (instance_method)
-    in_args[n_in_args++].v_pointer = object;
-
-    
-  // now loop through all the other args.  
-  for (i = 0; (i < (n_args)); i++)
-    {
-      out_pos[i] 	= -1;
-      arg_info 		= g_callable_info_get_arg ((GICallableInfo *) info, i);
-      dir 		= g_arg_info_get_direction (arg_info);
-      type_info       	= g_arg_info_get_type (arg_info);
-      is_caller_allocates = FALSE;
-      
+    GIBaseInfo* info;
+    GObject* object = NULL;
+    gboolean instance_method = TRUE;
+    gboolean is_caller_allocates = FALSE;
+    gboolean* caller_allocated;
+    GIBaseInfo* iface_info = NULL;
+    GArgument retval;
+    GArgument* in_args;
+    GArgument* out_args;
+    GArgument* out_values;
+    gint* skipped_args = NULL;
+    gint* out_pos;
+    gint first_out = -1;
+    guint use_return_as_out = 0;
+    guint n_args, n_in_args, n_out_args, i, j;
+    guint in_args_pos, out_args_pos;
+    GIArgInfo* arg_info = NULL;
+    GITypeInfo* type_info = NULL;
+    GITypeTag tag;
+    GIDirection dir;
+    GITransfer transfer;
+    JSValueRef retval_ref;
+    GError* error = 0;
+    gint length_arg_pos = 0;
+    guint64 array_len = 0;
+    gint array_return_value_count = 0;
+    gboolean return_only_one_out = false;
+
+    info = JSObjectGetPrivate(function);
+
+    // We just want to check if there IS an object, not actually throw an
+    // exception if we don't get it.
+    if (!this_object
+        || !((object = seed_value_to_object(ctx, this_object, 0))
+             || (object = seed_pointer_get_pointer(ctx, this_object))))
+        instance_method = FALSE;
+
+    n_args = g_callable_info_get_n_args((GICallableInfo*) info);
+
+    out_pos = g_new0(gint, n_args + 1);
+    in_args = g_new0(GArgument, n_args + 1);
+    out_args = g_new0(GArgument, n_args + 1);
+    out_values = g_new0(GArgument, n_args + 1);
+    n_in_args = n_out_args = 0;
+    caller_allocated = g_new0(gboolean, n_args + 1);
+
+    // start by pushing the object onto the call stack.
+    if (instance_method)
+        in_args[n_in_args++].v_pointer = object;
+
+    int out_skipped_args = 0;
+    skipped_args
+      = _process_skipped_arguments(arguments, info, &out_skipped_args);
+
+    SEED_NOTE(INVOCATION, "Calling seed_object_method_invoked for function %s",
+              g_base_info_get_name(info));
+
+    // now loop through all the other args.
+    for (i = 0, j = 0; (i < (n_args)); i++) {
+        if (skipped_args[i]) {
+            SEED_NOTE(INVOCATION, "Skipping parameter %d", i);
+            n_in_args++;
+            j++;
+            continue;
+        }
+
+        out_pos[i] = -1;
+        arg_info = g_callable_info_get_arg((GICallableInfo*) info, i);
+        dir = g_arg_info_get_direction(arg_info);
+        type_info = g_arg_info_get_type(arg_info);
+        transfer = g_arg_info_get_ownership_transfer(arg_info);
+        is_caller_allocates = FALSE;
+
 #if GOBJECT_INTROSPECTION_VERSION > 0x000613
-      is_caller_allocates =  (dir == GI_DIRECTION_OUT) && g_arg_info_is_caller_allocates (arg_info);
-      
-      /* caller allocates only applies to structures but GI has
-      * no way to denote that yet, so we only use caller allocates
-      * if we see  a structure
-      */
-      if (is_caller_allocates) 
-        {
-          GITypeTag type_tag = g_type_info_get_tag (type_info);
+        is_caller_allocates = (dir == GI_DIRECTION_OUT)
+                              && g_arg_info_is_caller_allocates(arg_info);
 
-          is_caller_allocates = FALSE;
+        /* caller allocates only applies to structures but GI has
+        * no way to denote that yet, so we only use caller allocates
+        * if we see  a structure
+        */
+        if (is_caller_allocates) {
+            GITypeTag type_tag = g_type_info_get_tag(type_info);
 
+            is_caller_allocates = FALSE;
 
-          if (type_tag  == GI_TYPE_TAG_INTERFACE) 
-            {
-              GIInfoType info_type;
+            if (type_tag == GI_TYPE_TAG_INTERFACE) {
+                GIInfoType info_type;
 
-              iface_info = g_type_info_get_interface (type_info);
-              g_assert (info != NULL);
-              info_type = g_base_info_get_type (iface_info);
+                iface_info = g_type_info_get_interface(type_info);
+                g_assert(info != NULL);
+                info_type = g_base_info_get_type(iface_info);
 
-              if (info_type == GI_INFO_TYPE_STRUCT)
-		is_caller_allocates = TRUE;
+                if (info_type == GI_INFO_TYPE_STRUCT)
+                    is_caller_allocates = TRUE;
             }
-         }	
+        }
 #endif
 
+        SEED_NOTE(INVOCATION,
+                  "Converting arg: %s (%d) of function %s, exception is %p",
+                  g_base_info_get_name((GIBaseInfo*) arg_info), i,
+                  g_base_info_get_name(info), exception);
 
-      SEED_NOTE (INVOCATION,
-                "Converting arg: %s (%d) of function %s, exception is %p",  
-                 g_base_info_get_name ((GIBaseInfo *)arg_info),  i,
-                 g_base_info_get_name (info), exception);
+        if (i + 1 > argumentCount + out_skipped_args) {
 
+            if (dir == GI_DIRECTION_OUT) {
+                GArgument* out_value = &out_values[n_out_args];
+                out_values[n_out_args].v_pointer = NULL;
+                out_args[n_out_args].v_pointer = out_value;
 
+                out_pos[i] = n_out_args;
 
-      if (i + 1 > argumentCount)
-        {
-
-          if (dir == GI_DIRECTION_OUT)
-            {
-              GArgument *out_value = &out_values[n_out_args];
-              out_values[n_out_args].v_pointer = NULL;
-              out_args[n_out_args].v_pointer = out_value;
-	      
-	      out_pos[ i ] = n_out_args;
-	      
-              if (is_caller_allocates) 
-                {
-                  gsize size = g_struct_info_get_size ( (GIStructInfo *) iface_info) ;
-                  out_args[n_out_args].v_pointer = g_malloc0 (size);		  
-                  out_values[n_out_args].v_pointer = out_args[n_out_args].v_pointer;
-		  caller_allocated[i] = TRUE;
-
+                if (is_caller_allocates) {
+                    gsize size
+                      = g_struct_info_get_size((GIStructInfo*) iface_info);
+                    out_args[n_out_args].v_pointer = g_malloc0(size);
+                    out_values[n_out_args].v_pointer
+                      = out_args[n_out_args].v_pointer;
+                    caller_allocated[i] = TRUE;
                 }
-              n_out_args++;
-            } 
-          else
-              in_args[n_in_args++].v_pointer = 0;   
-
-	}
-      else if (dir == GI_DIRECTION_IN || dir == GI_DIRECTION_INOUT)
-	{
-
-	  if (  !g_arg_info_may_be_null (arg_info) ) 
-            {
-  	      gboolean is_null = ( !arguments[i] || JSValueIsNull (ctx, arguments[i]) );
-
-              if (!is_null && (g_type_info_get_tag (type_info) == GI_TYPE_TAG_INTERFACE)) 
-                {
-                  /* see if the pointer is null for struct/unions. */
-		  GIBaseInfo *interface = g_type_info_get_interface (type_info);
-		  GIInfoType interface_type = g_base_info_get_type (interface);
-                  
-		  gboolean arg_is_object = JSValueIsObject (ctx, arguments[i]);
-
-		  gboolean is_gvalue = (interface_type == GI_INFO_TYPE_STRUCT) &&
-			!g_strcmp0(g_base_info_get_name((GIBaseInfo *)interface), "Value") &&
-			!g_strcmp0(g_base_info_get_namespace((GIBaseInfo *)interface), "GObject");
-              
-                                
-		  gboolean is_struct_or_union = (
-			interface_type == GI_INFO_TYPE_STRUCT ||
-			interface_type == GI_INFO_TYPE_UNION
-		  );
-
-	          /* this test ignores non-objects being sent where interfaces are expected 
-	             hopefully our type manipluation code will pick that up.
-	             The only exception to this is GObject.GValues which are arrays.
-	             */
-                  if (!is_gvalue && is_struct_or_union && arg_is_object &&
-                        (seed_pointer_get_pointer (ctx, arguments[i]) == 0)) {
-                      is_null = TRUE;
-                  }
-                  g_base_info_unref (interface);
+                n_out_args++;
+            } else
+                in_args[n_in_args++].v_pointer = 0;
+
+        } else if (dir == GI_DIRECTION_IN || dir == GI_DIRECTION_INOUT) {
+
+            if (!g_arg_info_may_be_null(arg_info)) {
+                gboolean is_null
+                  = (!arguments[i - j] || JSValueIsNull(ctx, arguments[i - j]));
+
+                if (!is_null && (g_type_info_get_tag(type_info)
+                                 == GI_TYPE_TAG_INTERFACE)) {
+                    /* see if the pointer is null for struct/unions. */
+                    GIBaseInfo* interface = g_type_info_get_interface(
+                      type_info);
+                    GIInfoType interface_type = g_base_info_get_type(interface);
+
+                    gboolean arg_is_object
+                      = JSValueIsObject(ctx, arguments[i - j]);
+
+                    gboolean is_gvalue
+                      = (interface_type == GI_INFO_TYPE_STRUCT)
+                        && !g_strcmp0(g_base_info_get_name(
+                                        (GIBaseInfo*) interface),
+                                      "Value")
+                        && !g_strcmp0(g_base_info_get_namespace(
+                                        (GIBaseInfo*) interface),
+                                      "GObject");
+
+                    gboolean is_struct_or_union
+                      = (interface_type == GI_INFO_TYPE_STRUCT
+                         || interface_type == GI_INFO_TYPE_UNION);
+
+                    /* this test ignores non-objects being sent where interfaces
+                       are expected
+                       hopefully our type manipluation code will pick that up.
+                       The only exception to this is GObject.GValues which are
+                       arrays.
+                       */
+                    if (!is_gvalue && is_struct_or_union && arg_is_object
+                        && (seed_pointer_get_pointer(ctx, arguments[i - j])
+                            == 0)) {
+                        is_null = TRUE;
+                    }
+                    g_base_info_unref(interface);
                 }
 
-              if (is_null) 
-                {
-                  GIBaseInfo *ctr = g_base_info_get_container((GIBaseInfo *) info);
-                  // note - ctr does not need unref'ing (see ginfo.c source for why)
-
-                  // RE-INSTATE THIS CODE LATER.. - when gtk etc. has be release with fixes
-		  //seed_make_exception (ctx, exception,
-		  //   "ArgumentError",
-                  g_warning(      "ArgumentError - probably due to incorrect gir file (which may be fixed upstream)"
-				   " argument %d must not be null for"
-				   " function: %s%s%s \n",
-				   i + 1,
-				   ctr ? g_base_info_get_name ((GIBaseInfo *) ctr) : "",
-				   ctr ? "." : "",
-				   g_base_info_get_name ((GIBaseInfo *)
-							 info));
-                  //goto arg_error;
+                if (is_null) {
+                    GIBaseInfo* ctr
+                      = g_base_info_get_container((GIBaseInfo*) info);
+                    // note - ctr does not need unref'ing (see ginfo.c source
+                    // for why)
+
+                    // RE-INSTATE THIS CODE LATER.. - when gtk etc. has be
+                    // release with fixes
+                    // seed_make_exception (ctx, exception,
+                    //   "ArgumentError",
+                    g_warning("ArgumentError - probably due to incorrect gir "
+                              "file (which may be fixed upstream)"
+                              " argument %d must not be null for"
+                              " function: %s%s%s \n",
+                              i + 1,
+                              ctr ? g_base_info_get_name((GIBaseInfo*) ctr)
+                                  : "",
+                              ctr ? "." : "",
+                              g_base_info_get_name((GIBaseInfo*) info));
+                    // goto arg_error;
                 }
             }
 
-          if (!seed_value_to_gi_argument (ctx, arguments[i], type_info,
-					  &in_args[n_in_args++], exception))
-	    {
-	      seed_make_exception (ctx, exception,
-				   "ArgumentError",
-				   "Unable to make argument %d for"
-				   " function: %s. \n",
-				   i + 1,
-				   g_base_info_get_name ((GIBaseInfo *)
-							 info));
-
-
-	      retval_ref = JSValueMakeNull (ctx);
-	      goto invoke_return;
-		 
-	    }
-	  if (dir == GI_DIRECTION_INOUT)
-	    {
-	      GArgument *out_value = &out_values[n_out_args];
-	      out_args[n_out_args++].v_pointer = out_value;
-              out_pos[ i ] = n_out_args;
-	    }
-
-	}
-      else if (dir == GI_DIRECTION_OUT)
-	{
-	  GArgument *out_value = &out_values[n_out_args];
-	  out_values[n_out_args].v_pointer = NULL;
-	  out_args[n_out_args].v_pointer = out_value;
-          out_pos[ i ] = n_out_args;
-	  if (is_caller_allocates) 
-	    {
-	      gsize size = g_struct_info_get_size ( (GIStructInfo *) iface_info) ;
-	      out_args[n_out_args].v_pointer = g_malloc0 (size);
- 	      out_values[n_out_args].v_pointer = out_args[n_out_args].v_pointer;
-	      caller_allocated[i] = TRUE;
-
-	    }
-	  n_out_args++;
-	  first_out = first_out > -1 ? first_out : i;
-
-	}
-
-      g_base_info_unref ((GIBaseInfo *) type_info);
-      g_base_info_unref ((GIBaseInfo *) arg_info);
-      if (iface_info) g_base_info_unref (iface_info); 
-      iface_info = NULL;
-      type_info = NULL;
-      arg_info = NULL;
+            guint out_length = 0;
+            if (!seed_value_to_gi_argument_with_out_length(
+                  ctx, arguments[i - j], type_info, transfer,
+                  &in_args[n_in_args++], &out_length, exception)) {
+                seed_make_exception(ctx, exception, "ArgumentError",
+                                    "Unable to make argument %d for"
+                                    " function: %s. \n",
+                                    i + 1,
+                                    g_base_info_get_name((GIBaseInfo*) info));
+
+                retval_ref = JSValueMakeNull(ctx);
+                goto invoke_return;
+            }
+
+            // check if what we did we did on an array,
+            // if yes, fill the g_type_info_get_array_length() position with the
+            // size of the array and mark it as already skipped.
+            GITypeTag type_tag = g_type_info_get_tag(type_info);
+            gint array_len_pos = g_type_info_get_array_length(type_info);
+            if (type_tag == GI_TYPE_TAG_ARRAY
+                && g_type_info_get_array_type(type_info) == GI_ARRAY_TYPE_C
+                && array_len_pos >= 0) {
+                skipped_args[array_len_pos] = TRUE;
+                in_args[array_len_pos + 1].v_uint64 = out_length;
+            }
+
+            if (dir == GI_DIRECTION_INOUT) {
+                GArgument* out_value = &out_values[n_out_args];
+                out_args[n_out_args++].v_pointer = out_value;
+                out_pos[i] = n_out_args;
+            }
+
+        } else if (dir == GI_DIRECTION_OUT) {
+            GArgument* out_value = &out_values[n_out_args];
+            out_values[n_out_args].v_pointer = NULL;
+            out_args[n_out_args].v_pointer = out_value;
+            out_pos[i] = n_out_args;
+            if (is_caller_allocates) {
+                gsize size = g_struct_info_get_size((GIStructInfo*) iface_info);
+                out_args[n_out_args].v_pointer = g_malloc0(size);
+                out_values[n_out_args].v_pointer
+                  = out_args[n_out_args].v_pointer;
+                caller_allocated[i] = TRUE;
+            }
+            n_out_args++;
+            first_out = first_out > -1 ? first_out : i;
+        }
+
+        g_base_info_unref((GIBaseInfo*) type_info);
+        g_base_info_unref((GIBaseInfo*) arg_info);
+        if (iface_info)
+            g_base_info_unref(iface_info);
+        iface_info = NULL;
+        type_info = NULL;
+        arg_info = NULL;
     }
-    
-    
-  // --- Finished building the args, now call the method / function.
-  
-    
-  SEED_NOTE (INVOCATION, "Invoking method: %s with %d 'in' arguments"
-	     " and %d 'out' arguments",
-	     g_base_info_get_name (info), n_in_args, n_out_args);
-  if (!g_function_info_invoke ((GIFunctionInfo *) info,
-			      in_args,
-			      n_in_args,
-			      out_args, n_out_args, &retval, &error))
-    {
- 
-      // failed...
-      seed_make_exception_from_gerror (ctx, exception, error);
-      g_error_free (error);
-      retval_ref = JSValueMakeNull (ctx);
-      goto invoke_return;
-      
+
+    // --- Finished building the args, now call the method / function.
+
+    SEED_NOTE(INVOCATION, "Invoking method: %s with %d 'in' arguments"
+                          " and %d 'out' arguments",
+              g_base_info_get_name(info), n_in_args, n_out_args);
+    if (!g_function_info_invoke((GIFunctionInfo*) info, in_args, n_in_args,
+                                out_args, n_out_args, &retval, &error)) {
+
+        // failed...
+        seed_make_exception_from_gerror(ctx, exception, error);
+        g_error_free(error);
+        retval_ref = JSValueMakeNull(ctx);
+        goto invoke_return;
     }
-    
-    // -- returned OK..  
-    
-    type_info = g_callable_info_get_return_type ((GICallableInfo *) info);
-    tag = g_type_info_get_tag (type_info);
+
+    // -- returned OK..
+
+    type_info = g_callable_info_get_return_type((GICallableInfo*) info);
+    tag = g_type_info_get_tag(type_info);
 
     // might need to add g_type_info_is_pointer (type_info) check here..
-    
-    if (tag == GI_TYPE_TAG_VOID) 
-      {
-	// if we have no out args - returns undefined
-	// otherwise we return an object, and put the return values into that
-	// along with supporting the old object.value way
-	if (n_out_args < 1) 
-	    retval_ref = JSValueMakeUndefined (ctx);
-	else 
-	  {
-	   retval_ref = JSObjectMake (ctx, NULL, NULL);      
-	   use_return_as_out = 1;
-	  }
-      }
-    else
-      {
-	
-	// not a void return.
-	
-	GIBaseInfo *interface;
-	gboolean sunk = FALSE;
-
-	// for most returns we just pump it though our type convert calls.
-	// however gobjects are different, if they are not owned by anybody,
-	// then we add a ref so that it can not be destroyed during this process.
-	// this ref is removed after we have converted it to a JSObject.
-	
-	if (tag == GI_TYPE_TAG_INTERFACE)
-	  {
-	    GIInfoType interface_type;
-
-	    interface = g_type_info_get_interface (type_info);
-	    interface_type = g_base_info_get_type (interface);
-	    g_base_info_unref (interface);
-
-	    if (interface_type == GI_INFO_TYPE_OBJECT ||
-		interface_type == GI_INFO_TYPE_INTERFACE)
-	      {
-		if (G_IS_OBJECT (retval.v_pointer))
-		  {
-		    sunk =
-		      G_IS_INITIALLY_UNOWNED (G_OBJECT (retval.v_pointer));
-		    if (sunk)
-		      g_object_ref_sink (G_OBJECT (retval.v_pointer));
-		  }
-	      }
-
-	  }
-	  
-	length_arg_pos = g_type_info_get_array_length(type_info);
-	SEED_NOTE (INVOCATION, "length_arg_pos=%d\n", length_arg_pos);
-	if (length_arg_pos < 0)
-	  {
-	    array_len = 0;
-	  }
-	else
-	  {
-	    array_len =  (&out_values[  out_pos[length_arg_pos] ])->v_uint32;
-	  }
-	SEED_NOTE (INVOCATION, "array_len=%d\n", array_len);
-	retval_ref =
-	  seed_value_from_gi_argument_full (ctx, &retval, type_info, exception,
-					    array_len, tag);
-
-	if (sunk)
-	  g_object_unref (G_OBJECT (retval.v_pointer));
-	else
-	  seed_gi_release_arg (g_callable_info_get_caller_owns
-			       ((GICallableInfo *) info),
-			       type_info, &retval);
-      }
-    if (type_info)  g_base_info_unref ((GIBaseInfo *) type_info);
-    type_info = NULL;
-      
-      
-  // finished with return.. now go thorugh the args and handle any out/inout etc..  
-      
-  in_args_pos = out_args_pos = 0;
-  for (i = 0; (i < n_args); i++)
-    {
-      JSValueRef jsout_val;
-      arg_info = g_callable_info_get_arg ((GICallableInfo *) info, i);
-      dir = g_arg_info_get_direction (arg_info);
-      type_info = g_arg_info_get_type (arg_info);
-      // since we succesfully called, we can presume that 
-      
-      if (dir == GI_DIRECTION_IN || dir == GI_DIRECTION_INOUT)
-	{
-	  seed_gi_release_in_arg (g_arg_info_get_ownership_transfer
-				  (arg_info), type_info,
-				  &in_args[in_args_pos +
-					   (instance_method ? 1 : 0)]);
-	  in_args_pos++;
-
-	  g_base_info_unref ((GIBaseInfo *) type_info);
-	  g_base_info_unref ((GIBaseInfo *) arg_info);
-	  type_info = NULL;
-	  arg_info = NULL;
-      
-	  continue;
-	}
-      
-      // we are now only dealing with OUT arguments.
-      
-      // if the type_info is an array with a length position, we
-      // need to send that as well, so it can be used to build the seed value.
-      {
-	length_arg_pos = g_type_info_get_array_length(type_info);
-	array_len = 0;
-	if (length_arg_pos > -1) {
-             GIArgInfo *array_arg_info;
-            GITypeInfo *array_type_info;
-            GArgument *array_len_arg;
-            
-            g_assert (out_pos[length_arg_pos] > -1);
-            
-            
-            array_arg_info = g_callable_info_get_arg ((GICallableInfo *) info, length_arg_pos);
-            array_type_info = g_arg_info_get_type (array_arg_info);
-            
-            array_len_arg = &out_values[  out_pos[length_arg_pos] ] ;
-            
+
+    // We force a return array in the following situation:
+    // There's more than one n_out_args OR
+    // There's one out_arg AND tag != GI_TYPE_TAG_VOID
+    // AND, of course, if it's not an INTERFACE.
+    gboolean force_return_array = false;
+    force_return_array = (tag != GI_TYPE_TAG_INTERFACE);
+
+    if (force_return_array) {
+        if (n_out_args + !!(tag != GI_TYPE_TAG_VOID) > 1) {
+            retval_ref = JSObjectMakeArray(ctx, NULL, NULL, NULL);
+            use_return_as_out = 1;
+        }
+    }
+
+    if (tag == GI_TYPE_TAG_VOID) {
+        // * if we have no out args - returns undefined
+        // * if we have *one* out_arg but no return type,
+        //   do nothing here and return the OUT as return later.
+        // * otherwise we return an object, and put the return values into that
+        //   along with supporting the old object.value way
+        if (n_out_args < 1)
+            retval_ref = JSValueMakeUndefined(ctx);
+        else if (n_out_args == 1) {
+            return_only_one_out = true;
+            use_return_as_out = 1;
+        } else {
+            retval_ref = JSObjectMake(ctx, NULL, NULL);
+            use_return_as_out = 1;
+        }
+    } else {
+
+        // not a void return.
+
+        GIBaseInfo* interface;
+        gboolean sunk = FALSE;
+
+        // for most returns we just pump it though our type convert calls.
+        // however gobjects are different, if they are not owned by anybody,
+        // then we add a ref so that it can not be destroyed during this
+        // process.
+        // this ref is removed after we have converted it to a JSObject.
+
+        if (tag == GI_TYPE_TAG_INTERFACE) {
+            GIInfoType interface_type;
+
+            interface = g_type_info_get_interface(type_info);
+            interface_type = g_base_info_get_type(interface);
+            g_base_info_unref(interface);
+
+            if (interface_type == GI_INFO_TYPE_OBJECT
+                || interface_type == GI_INFO_TYPE_INTERFACE) {
+                if (G_IS_OBJECT(retval.v_pointer)) {
+                    sunk = G_IS_INITIALLY_UNOWNED(G_OBJECT(retval.v_pointer));
+                    if (sunk)
+                        g_object_ref_sink(G_OBJECT(retval.v_pointer));
+                }
+            }
+        }
+
+        length_arg_pos = g_type_info_get_array_length(type_info);
+        SEED_NOTE(INVOCATION, "length_arg_pos=%d\n", length_arg_pos);
+        if (length_arg_pos < 0) {
             array_len = 0;
-            switch(   g_type_info_get_tag (array_type_info) )
-            {
-              // not sure if the non-unsigned  versions are need as length should not be -ve..
-              case GI_TYPE_TAG_INT8: array_len = (guint64) array_len_arg->v_int8; break;
-              case GI_TYPE_TAG_UINT8:array_len = (guint64) array_len_arg->v_uint8; break;
-              case GI_TYPE_TAG_INT16:  array_len =(guint64) array_len_arg->v_int16; break;
-              case GI_TYPE_TAG_UINT16: array_len =(guint64) array_len_arg->v_uint16; break;
-              case GI_TYPE_TAG_INT32:  array_len =(guint64) array_len_arg->v_int32; break;
-              case GI_TYPE_TAG_UINT32: array_len =(guint64) array_len_arg->v_uint32; break;
-              case GI_TYPE_TAG_INT64: array_len = (guint64) array_len_arg->v_int64; break;
-              case GI_TYPE_TAG_UINT64: array_len = (guint64) array_len_arg->v_uint64; break;
-              default: g_assert(1==0); break;
-              
-           } 
-            
-            // this may work, but the above should be more accurate..
-            //array_len =  (&out_values[  out_pos[length_arg_pos] ])->v_uint32;
-                                     
-            SEED_NOTE (INVOCATION, "Getting length from OUTPOS=%d,  ORIGPOS=%d :  result = %d",
-                 out_pos[length_arg_pos],  length_arg_pos, array_len);
-            // free stuff.
-            
-            g_base_info_unref ((GIBaseInfo *) array_type_info);
-	    g_base_info_unref ((GIBaseInfo *) array_arg_info);
-      
-	}
-	
-	
-	jsout_val = seed_value_from_gi_argument_full (ctx, &out_values[out_args_pos],
-						 type_info, exception, array_len, g_type_info_get_tag (type_info) );
-  
-      }
-     /* caller allocates only applies to structures but GI has
-      * no way to denote that yet, so we only use caller allocates
-      * if we see  a structure
-      */
-     
-      if (caller_allocated[i]) {
-	
-	// this is the old python code..
-	// if we are going to do this, the caching the iface_info at the top would be a better idea.
-	
-	//if (g_registered_type_info_get_g_type ( (GIRegisteredTypeInfo *) iface_info) == G_TYPE_VALUE)
-	//     g_value_unset ( (GValue *) state->args[i]);
-        
-	
-	// clear the caller allocated flag so it's not free'd at the end.. 
-	caller_allocated[i] = FALSE;
-      }
- 
-
-      // old ? depreciated ? way to handle out args -> set 'value' on object that was send through.
-      out_args_pos++;
-       
-      if ( (i < argumentCount) && 
-          !JSValueIsNull (ctx, arguments[i]) &&
-          JSValueIsObject (ctx, arguments[i]))
-        {
-          seed_object_set_property (ctx, (JSObjectRef) arguments[i],
-                                   "value", jsout_val);
+        } else {
+            array_len = (&out_values[out_pos[length_arg_pos]])->v_uint32;
         }
+        SEED_NOTE(INVOCATION, "array_len=%" G_GUINT64_FORMAT "\n", array_len);
+
+        JSValueRef jsout_val
+          = seed_value_from_gi_argument_full(ctx, &retval, type_info, exception,
+                                             array_len, tag);
+
+        if (use_return_as_out && force_return_array) {
+            _add_jsvalue_in_array(ctx, (JSObjectRef) retval_ref,
+                                  array_return_value_count++, jsout_val);
+        } else
+            retval_ref = jsout_val;
+
+        if (sunk)
+            g_object_unref(G_OBJECT(retval.v_pointer));
+        else
+            seed_gi_release_arg(g_callable_info_get_caller_owns(
+                                  (GICallableInfo*) info),
+                                type_info, &retval);
+    }
+    if (type_info)
+        g_base_info_unref((GIBaseInfo*) type_info);
+    type_info = NULL;
 
+    // finished with return.. now go thorugh the args and handle any out/inout
+    // etc..
+
+    in_args_pos = out_args_pos = 0;
+    for (i = 0; (i < n_args); i++) {
+        JSValueRef jsout_val;
+        arg_info = g_callable_info_get_arg((GICallableInfo*) info, i);
+        dir = g_arg_info_get_direction(arg_info);
+        type_info = g_arg_info_get_type(arg_info);
+        // since we succesfully called, we can presume that
+
+        if (dir == GI_DIRECTION_IN || dir == GI_DIRECTION_INOUT) {
+            seed_gi_release_in_arg(
+              g_arg_info_get_ownership_transfer(arg_info), type_info,
+              &in_args[in_args_pos + (instance_method ? 1 : 0)]);
+            in_args_pos++;
+
+            g_base_info_unref((GIBaseInfo*) type_info);
+            g_base_info_unref((GIBaseInfo*) arg_info);
+            type_info = NULL;
+            arg_info = NULL;
+
+            continue;
+        }
 
-      // if we add it to the return argument and/or the first out arguement
+        // we are now only dealing with OUT arguments.
 
-      if (use_return_as_out) 
+        // if the type_info is an array with a length position, we
+        // need to send that as well, so it can be used to build the seed value.
         {
-           seed_object_set_property (ctx, (JSObjectRef) retval_ref,
-                 g_base_info_get_name((GIBaseInfo*) arg_info) , jsout_val);
+            length_arg_pos = g_type_info_get_array_length(type_info);
+            array_len = 0;
+            if (length_arg_pos > -1) {
+                GIArgInfo* array_arg_info;
+                GITypeInfo* array_type_info;
+                GArgument* array_len_arg;
+
+                g_assert(out_pos[length_arg_pos] > -1);
+
+                array_arg_info = g_callable_info_get_arg((GICallableInfo*) info,
+                                                         length_arg_pos);
+                array_type_info = g_arg_info_get_type(array_arg_info);
+
+                array_len_arg = &out_values[out_pos[length_arg_pos]];
+
+                array_len = 0;
+                switch (g_type_info_get_tag(array_type_info)) {
+                    // not sure if the non-unsigned  versions are need as length
+                    // should not be -ve..
+                    case GI_TYPE_TAG_INT8:
+                        array_len = (guint64) array_len_arg->v_int8;
+                        break;
+                    case GI_TYPE_TAG_UINT8:
+                        array_len = (guint64) array_len_arg->v_uint8;
+                        break;
+                    case GI_TYPE_TAG_INT16:
+                        array_len = (guint64) array_len_arg->v_int16;
+                        break;
+                    case GI_TYPE_TAG_UINT16:
+                        array_len = (guint64) array_len_arg->v_uint16;
+                        break;
+                    case GI_TYPE_TAG_INT32:
+                        array_len = (guint64) array_len_arg->v_int32;
+                        break;
+                    case GI_TYPE_TAG_UINT32:
+                        array_len = (guint64) array_len_arg->v_uint32;
+                        break;
+                    case GI_TYPE_TAG_INT64:
+                        array_len = (guint64) array_len_arg->v_int64;
+                        break;
+                    case GI_TYPE_TAG_UINT64:
+                        array_len = (guint64) array_len_arg->v_uint64;
+                        break;
+                    default:
+                        g_assert(1 == 0);
+                        break;
+                }
+
+                // this may work, but the above should be more accurate..
+                // array_len =  (&out_values[  out_pos[length_arg_pos]
+                // ])->v_uint32;
+
+                SEED_NOTE(INVOCATION,
+                          "Getting length from OUTPOS=%d,  ORIGPOS=%d :  "
+                          "result = %" G_GUINT64_FORMAT,
+                          out_pos[length_arg_pos], length_arg_pos, array_len);
+                // free stuff.
+
+                g_base_info_unref((GIBaseInfo*) array_type_info);
+                g_base_info_unref((GIBaseInfo*) array_arg_info);
+            }
+
+            jsout_val = seed_value_from_gi_argument_full(
+              ctx, &out_values[out_args_pos], type_info, exception, array_len,
+              g_type_info_get_tag(type_info));
         }
-       
+        /* caller allocates only applies to structures but GI has
+         * no way to denote that yet, so we only use caller allocates
+         * if we see  a structure
+         */
 
-      if ( (first_out > -1) &&  
-          !JSValueIsNull (ctx, arguments[first_out]) &&
-          JSValueIsObject (ctx, arguments[first_out]) )
-       
-        {
-          seed_object_set_property (ctx, (JSObjectRef) arguments[first_out],
-                 g_base_info_get_name((GIBaseInfo*) arg_info) , jsout_val);
+        if (caller_allocated[i]) {
+
+            // this is the old python code..
+            // if we are going to do this, the caching the iface_info at the top
+            // would be a better idea.
+
+            // if (g_registered_type_info_get_g_type ( (GIRegisteredTypeInfo *)
+            // iface_info) == G_TYPE_VALUE)
+            //     g_value_unset ( (GValue *) state->args[i]);
+
+            // clear the caller allocated flag so it's not free'd at the end..
+            caller_allocated[i] = FALSE;
+        }
+
+        // old ? depreciated ? way to handle out args -> set 'value' on object
+        // that was send through.
+        out_args_pos++;
+
+        if ((i < argumentCount) && !JSValueIsNull(ctx, arguments[i])
+            && JSValueIsObject(ctx, arguments[i])) {
+            seed_object_set_property(ctx, (JSObjectRef) arguments[i], "value",
+                                     jsout_val);
         }
 
+        // if we add it to the return argument and/or the first out arguement
+
+        if (use_return_as_out) {
+            if (return_only_one_out) {
+                retval_ref = jsout_val;
+            } else if (force_return_array) {
+                _add_jsvalue_in_array(ctx, (JSObjectRef) retval_ref,
+                                      array_return_value_count++, jsout_val);
+            } else {
+                seed_object_set_property(ctx, (JSObjectRef) retval_ref,
+                                         g_base_info_get_name(
+                                           (GIBaseInfo*) arg_info),
+                                         jsout_val);
+            }
+        }
+
+        if ((first_out > -1) && !JSValueIsNull(ctx, arguments[first_out])
+            && JSValueIsObject(ctx, arguments[first_out]))
+
+        {
+            seed_object_set_property(ctx, (JSObjectRef) arguments[first_out],
+                                     g_base_info_get_name(
+                                       (GIBaseInfo*) arg_info),
+                                     jsout_val);
+        }
 
-      g_base_info_unref ((GIBaseInfo *) arg_info);
-      g_base_info_unref ((GIBaseInfo *) type_info);
-      type_info = NULL;
-      arg_info = NULL;
-      
+        g_base_info_unref((GIBaseInfo*) arg_info);
+        g_base_info_unref((GIBaseInfo*) type_info);
+        type_info = NULL;
+        arg_info = NULL;
     }
 
 invoke_return:
-
-// clean up everything..
-  for (i = 0; (i < (n_args)); i++)
-      if (caller_allocated[i])
-	  g_free(out_args[out_pos[i]].v_pointer);
- 
-  g_free(caller_allocated);
-  
-  if (type_info)  g_base_info_unref ((GIBaseInfo *) type_info);
-  if (arg_info)   g_base_info_unref ((GIBaseInfo *) arg_info);
-  if (iface_info) g_base_info_unref (iface_info); 
-    
-  g_free (in_args);
-  g_free (out_args);
-  g_free (out_pos);
-  g_free (out_values);
-  return retval_ref;
-
-  
-  
-  
+    SEED_NOTE(INVOCATION, "END seed_object_method_invoked for function %s",
+              g_base_info_get_name(info));
+
+    // clean up everything..
+    for (i = 0; (i < (n_args)); i++)
+        if (caller_allocated[i])
+            g_free(out_args[out_pos[i]].v_pointer);
+
+    g_free(caller_allocated);
+
+    if (type_info)
+        g_base_info_unref((GIBaseInfo*) type_info);
+    if (arg_info)
+        g_base_info_unref((GIBaseInfo*) arg_info);
+    if (iface_info)
+        g_base_info_unref(iface_info);
+
+    g_free(in_args);
+    g_free(out_args);
+    g_free(out_pos);
+    g_free(out_values);
+    return retval_ref;
 }
 
 static JSObjectRef
-seed_gobject_named_constructor_invoked (JSContextRef ctx,
-					JSObjectRef constructor,
-					size_t argumentCount,
-					const JSValueRef arguments[],
-					JSValueRef * exception)
+seed_gobject_named_constructor_invoked(JSContextRef ctx,
+                                       JSObjectRef constructor,
+                                       size_t argumentCount,
+                                       const JSValueRef arguments[],
+                                       JSValueRef* exception)
 {
-  return (JSObjectRef) seed_gobject_method_invoked (ctx, constructor,
-						    NULL, argumentCount,
-						    arguments, exception);
+    return (JSObjectRef) seed_gobject_method_invoked(ctx, constructor, NULL,
+                                                     argumentCount, arguments,
+                                                     exception);
 }
 
 void
-seed_gobject_define_property_from_function_info (JSContextRef ctx,
-						 GIFunctionInfo * info,
-						 JSObjectRef object,
-						 gboolean instance)
+seed_gobject_define_property_from_function_info(JSContextRef ctx,
+                                                GIFunctionInfo* info,
+                                                JSObjectRef object,
+                                                gboolean instance)
 {
-  GIFunctionInfoFlags flags;
-  JSObjectRef method_ref;
-  const gchar *name;
+    GIFunctionInfoFlags flags;
+    JSObjectRef method_ref;
+    const gchar* name;
 
-  //if (g_base_info_is_deprecated ((GIBaseInfo *) info))
-  //g_printf("Not defining deprecated symbol: %s \n",
-  //g_base_info_get_name((GIBaseInfo *)info));
+    // if (g_base_info_is_deprecated ((GIBaseInfo *) info))
+    // g_printf("Not defining deprecated symbol: %s \n",
+    // g_base_info_get_name((GIBaseInfo *)info));
 
-  flags = g_function_info_get_flags (info);
+    flags = g_function_info_get_flags(info);
 
-  if (instance && (flags & GI_FUNCTION_IS_CONSTRUCTOR))
-    {
-      return;
+    if (instance && (flags & GI_FUNCTION_IS_CONSTRUCTOR)) {
+        return;
     }
 
-  method_ref = JSObjectMake (ctx, gobject_method_class,
-			     g_base_info_ref ((GIBaseInfo *) info));
-
-  JSObjectSetPrototype (ctx, method_ref, function_proto);
+    method_ref = JSObjectMake(ctx, gobject_method_class,
+                              g_base_info_ref((GIBaseInfo*) info));
 
-  name = g_base_info_get_name ((GIBaseInfo *) info);
-  if (!g_strcmp0 (name, "new"))
-    name = "c_new";
-  seed_object_set_property (ctx, object, name, method_ref);
-  
-  seed_object_set_property (ctx, method_ref, "info",
-			    seed_make_struct (ctx,
-					      g_base_info_ref ((GIBaseInfo *)
-							       info),
-					      base_info_info));
+    JSObjectSetPrototype(ctx, method_ref, function_proto);
 
+    name = g_base_info_get_name((GIBaseInfo*) info);
+    if (!g_strcmp0(name, "new")) {
+        // To be compatible with gjs, we need to have new as function, too.
+        seed_object_set_property(ctx, object, name, method_ref);
+        name = "c_new";
+    }
+    seed_object_set_property(ctx, object, name, method_ref);
+    /*
+      //  Disabled as this crashes in a recursive loop now
+    seed_object_set_property (ctx, method_ref, "info",
+                              seed_make_struct (ctx,
+                                                g_base_info_ref ((GIBaseInfo *)
+                                                                 info),
+                                                base_info_info));
+    */
 }
 
 static void
-seed_gobject_add_methods_for_interfaces (JSContextRef ctx,
-					 GIObjectInfo * oinfo,
-					 JSObjectRef object)
+seed_gobject_add_methods_for_interfaces(JSContextRef ctx,
+                                        GIObjectInfo* oinfo,
+                                        JSObjectRef object)
 {
-  GIInterfaceInfo *interface;
-  GIFunctionInfo *function;
-  gint n_interfaces, i, n_functions, k;
-
-  n_interfaces = g_object_info_get_n_interfaces (oinfo);
-
-  for (i = 0; i < n_interfaces; i++)
-    {
-      interface = g_object_info_get_interface (oinfo, i);
-
-      n_functions = g_interface_info_get_n_methods (interface);
-      for (k = 0; k < n_functions; k++)
-	{
-	  function = g_interface_info_get_method (interface, k);
-	  seed_gobject_define_property_from_function_info
-	    (ctx, function, object, TRUE);
-	}
-      // g_base_info_unref((GIBaseInfo*)interface);
+    GIInterfaceInfo* interface;
+    GIFunctionInfo* function;
+    gint n_interfaces, i, n_functions, k;
+
+    n_interfaces = g_object_info_get_n_interfaces(oinfo);
+
+    for (i = 0; i < n_interfaces; i++) {
+        interface = g_object_info_get_interface(oinfo, i);
+
+        n_functions = g_interface_info_get_n_methods(interface);
+        for (k = 0; k < n_functions; k++) {
+            function = g_interface_info_get_method(interface, k);
+            seed_gobject_define_property_from_function_info(ctx, function,
+                                                            object, TRUE);
+        }
+        g_base_info_unref((GIBaseInfo*) interface);
     }
 }
 
 static void
-seed_gobject_add_methods_for_type (JSContextRef ctx,
-				   GIObjectInfo * oinfo, JSObjectRef object)
+seed_gobject_add_methods_for_type(JSContextRef ctx,
+                                  GIObjectInfo* oinfo,
+                                  JSObjectRef object)
 {
-  gint n_methods;
-  gint i;
-  GIFunctionInfo *info;
-
-  n_methods = g_object_info_get_n_methods (oinfo);
-
-  for (i = 0; i < n_methods; i++)
-    {
-      info = g_object_info_get_method (oinfo, i);
-      seed_gobject_define_property_from_function_info (ctx,
-						       info, object, TRUE);
-      g_base_info_unref ((GIBaseInfo *) info);
+    gint n_methods;
+    gint i;
+    GIFunctionInfo* info;
+
+    n_methods = g_object_info_get_n_methods(oinfo);
+
+    for (i = 0; i < n_methods; i++) {
+        info = g_object_info_get_method(oinfo, i);
+        seed_gobject_define_property_from_function_info(ctx, info, object,
+                                                        TRUE);
+        g_base_info_unref((GIBaseInfo*) info);
     }
 }
 
 JSClassRef
-seed_gobject_get_class_for_gtype (JSContextRef ctx, GType type)
+seed_gobject_get_class_for_gtype(JSContextRef ctx, GType type)
 {
-  JSClassDefinition def;
-  GType parent;
-  JSClassRef ref;
-  JSClassRef parent_class = 0;
-  GIBaseInfo *info;
-  JSObjectRef prototype_obj;
-  JSObjectRef parent_prototype;
-
-  if ((ref = g_type_get_qdata (type, qname)) != NULL)
-    {
-      return ref;
+    JSClassDefinition def;
+    GType parent;
+    JSClassRef ref;
+    JSClassRef parent_class = 0;
+    GIBaseInfo* info;
+    JSObjectRef prototype_obj;
+    JSObjectRef parent_prototype;
+
+    if ((ref = g_type_get_qdata(type, qname)) != NULL) {
+        return ref;
     }
 
-  info = g_irepository_find_by_gtype (g_irepository_get_default (), type);
+    info = g_irepository_find_by_gtype(g_irepository_get_default(), type);
 
-  memset (&def, 0, sizeof (JSClassDefinition));
+    memset(&def, 0, sizeof(JSClassDefinition));
 
-  def.className = g_type_name (type);
-  if ((parent = g_type_parent (type)))
-    parent_class = seed_gobject_get_class_for_gtype (ctx, parent);
-  def.parentClass = parent_class;
-  def.attributes = kJSClassAttributeNoAutomaticPrototype;
+    def.className = g_type_name(type);
+    if ((parent = g_type_parent(type)))
+        parent_class = seed_gobject_get_class_for_gtype(ctx, parent);
+    def.parentClass = parent_class;
+    def.attributes = kJSClassAttributeNoAutomaticPrototype;
 
-  prototype_obj = JSObjectMake (ctx, 0, 0);
-  if (parent)
-    {
-      parent_prototype = seed_gobject_get_prototype_for_gtype (parent);
-      if (parent_prototype)
-	JSObjectSetPrototype (ctx, prototype_obj, parent_prototype);
+    prototype_obj = JSObjectMake(ctx, 0, 0);
+    if (parent) {
+        parent_prototype = seed_gobject_get_prototype_for_gtype(parent);
+        if (parent_prototype)
+            JSObjectSetPrototype(ctx, prototype_obj, parent_prototype);
     }
 
-  ref = JSClassCreate (&def);
-  JSClassRetain (ref);
-
-  JSValueProtect (ctx, prototype_obj);
-
-  g_type_set_qdata (type, qname, ref);
-  g_type_set_qdata (type, qprototype, prototype_obj);
-
-  if (info && (g_base_info_get_type (info) == GI_INFO_TYPE_OBJECT))
-    {
-      seed_gobject_add_methods_for_interfaces (ctx, (GIObjectInfo *) info,
-					       prototype_obj);
-      seed_gobject_add_methods_for_type (ctx,
-					 (GIObjectInfo *) info,
-					 prototype_obj);
-      g_base_info_unref (info);
-    }
-  else
-    {
-      GType *interfaces;
-      GIFunctionInfo *function;
-      GIBaseInfo *interface;
-      gint n_functions, k;
-      guint i, n;
-
-      interfaces = g_type_interfaces (type, &n);
-      for (i = 0; i < n; i++)
-	{
-	  interface = g_irepository_find_by_gtype (0, interfaces[i]);
-	  if (!interface)
-	    break;
-	  n_functions =
-	    g_interface_info_get_n_methods ((GIInterfaceInfo *) interface);
-	  for (k = 0; k < n_functions; k++)
-	    {
-	      function =
-		g_interface_info_get_method ((GIInterfaceInfo
-					      *) interface, k);
-	      seed_gobject_define_property_from_function_info
-		(ctx, function, prototype_obj, TRUE);
-	    }
-	}
+    ref = JSClassCreate(&def);
+    JSClassRetain(ref);
+
+    JSValueProtect(ctx, prototype_obj);
+
+    g_type_set_qdata(type, qname, ref);
+    g_type_set_qdata(type, qprototype, prototype_obj);
+
+    if (info && (g_base_info_get_type(info) == GI_INFO_TYPE_OBJECT)) {
+        seed_gobject_add_methods_for_interfaces(ctx, (GIObjectInfo*) info,
+                                                prototype_obj);
+        seed_gobject_add_methods_for_type(ctx, (GIObjectInfo*) info,
+                                          prototype_obj);
+        g_base_info_unref(info);
+    } else {
+        GType* interfaces;
+        GIFunctionInfo* function;
+        GIBaseInfo* interface;
+        gint n_functions, k;
+        guint i, n;
+
+        interfaces = g_type_interfaces(type, &n);
+        for (i = 0; i < n; i++) {
+            interface = g_irepository_find_by_gtype(0, interfaces[i]);
+            if (!interface)
+                break;
+            n_functions
+              = g_interface_info_get_n_methods((GIInterfaceInfo*) interface);
+            for (k = 0; k < n_functions; k++) {
+                function
+                  = g_interface_info_get_method((GIInterfaceInfo*) interface,
+                                                k);
+                seed_gobject_define_property_from_function_info(ctx, function,
+                                                                prototype_obj,
+                                                                TRUE);
+            }
+        }
     }
 
-  return ref;
+    return ref;
 }
 
 JSObjectRef
-seed_gobject_get_prototype_for_gtype (GType type)
+seed_gobject_get_prototype_for_gtype(GType type)
 {
-  JSObjectRef prototype = 0;
-  while (type && !prototype)
-    {
-      prototype = g_type_get_qdata (type, qprototype);
-      type = g_type_parent (type);
+    JSObjectRef prototype = 0;
+    while (type && !prototype) {
+        prototype = g_type_get_qdata(type, qprototype);
+        type = g_type_parent(type);
     }
 
-  return prototype;
+    return prototype;
 }
 
 static void
-seed_gobject_finalize (JSObjectRef object)
+seed_gobject_finalize(JSObjectRef object)
 {
-  GObject *gobject;
-
-  gobject = (GObject *) JSObjectGetPrivate ((JSObjectRef) object);
-  if (!gobject)
-    {
-      SEED_NOTE (FINALIZATION,
-		 "Attempting to finalize already destroyed object.");
-      return;
+    GObject* gobject;
+    JSObjectRef js_ref;
+
+    gobject = (GObject*) JSObjectGetPrivate((JSObjectRef) object);
+    if (!gobject) {
+        SEED_NOTE(FINALIZATION,
+                  "Attempting to finalize already destroyed object.");
+        return;
     }
 
-  SEED_NOTE (FINALIZATION, "%s at %p (%d refs)",
-	     g_type_name (G_OBJECT_TYPE (gobject)), gobject,
-	     gobject->ref_count);
-
-  if (g_object_get_data (gobject, "js-ref"))
-    {
-      g_object_set_data_full (gobject, "js-ref", NULL, NULL);
-
-      g_object_remove_toggle_ref (gobject, seed_toggle_ref, 0);
+    SEED_NOTE(FINALIZATION, "%s at %p (%d refs)",
+              g_type_name(G_OBJECT_TYPE(gobject)), gobject, gobject->ref_count);
+
+    js_ref = g_object_get_qdata(gobject, js_ref_quark);
+    if (js_ref) {
+        /* Steal the qdata here as otherwise we will call
+         * JSValueUnprotect() from the destroy notify of
+         * the qdata, which is not allowed to be called
+         * from a finalizer!
+         */
+        g_object_steal_qdata(gobject, js_ref_quark);
+
+        g_object_remove_toggle_ref(gobject, seed_toggle_ref, js_ref);
+    } else {
+        g_object_run_dispose(gobject);
     }
-  g_object_run_dispose (gobject);
 }
 
 static JSValueRef
-seed_gobject_get_property (JSContextRef context,
-			   JSObjectRef object,
-			   JSStringRef property_name, JSValueRef * exception)
+seed_gobject_get_property(JSContextRef context,
+                          JSObjectRef object,
+                          JSStringRef property_name,
+                          JSValueRef* exception)
 {
-  GParamSpec *spec;
-  GObject *b;
-  GValue gval = { 0 };
-  char *cproperty_name;
-  gint length;
-  JSValueRef ret;
-  guint i;
-  gsize len;
-
-  b = seed_value_to_object (context, (JSValueRef) object, exception);
-  if (!b)
-    return 0;
-
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  spec =
-    g_object_class_find_property (G_OBJECT_GET_CLASS (b), cproperty_name);
-
-  if (!spec)
-    {
-      len = strlen (cproperty_name) - 1;
-      for (i = 0; i < len; i++)
-	{
-	  if (cproperty_name[i] == '_')
-	    cproperty_name[i] = '-';
-	}
-      spec = g_object_class_find_property (G_OBJECT_GET_CLASS (b),
-					   cproperty_name);
-      if (spec)
-	goto found;
-      else
-	{
-	  GIFieldInfo *field = NULL;
-	  GIBaseInfo *info = (GIBaseInfo *)
-	    g_irepository_find_by_gtype (0, G_OBJECT_TYPE (b));
-	  gint n;
-	  const gchar *name;
-
-	  for (i = 0; i < len; i++)
-	    {
-	      if (cproperty_name[i] == '-')
-		cproperty_name[i] = '_';
-	    }
-
-	  if (!info)
-	    {
-	      return NULL;
-	    }
-
-	  n = g_object_info_get_n_fields ((GIObjectInfo *) info);
-	  for (i = 0; i < n; i++)
-	    {
-	      field = g_object_info_get_field ((GIObjectInfo *) info, i);
-	      name = g_base_info_get_name ((GIBaseInfo *) field);
-
-	      if (!g_strcmp0 (name, cproperty_name))
-		goto found_field;
-	      else
-		{
-		  g_base_info_unref ((GIBaseInfo *) field);
-		  field = 0;
-		}
-	    }
-	found_field:
-	  if (field)
-	    {
-	      ret = seed_field_get_value (context, b, field, exception);
-	      g_base_info_unref ((GIBaseInfo *) info);
-	      return ret;
-	    }
-	  g_base_info_unref ((GIBaseInfo *) info);
-	}
-      return NULL;
+    GParamSpec* spec;
+    GObject* b;
+    GValue gval = { 0 };
+    char* cproperty_name;
+    gint length;
+    JSValueRef ret;
+    guint i;
+    gsize len;
+
+    b = seed_value_to_object(context, (JSValueRef) object, exception);
+    if (!b)
+        return 0;
+
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    spec = g_object_class_find_property(G_OBJECT_GET_CLASS(b), cproperty_name);
+
+    if (!spec) {
+        len = strlen(cproperty_name) - 1;
+        for (i = 0; i < len; i++) {
+            if (cproperty_name[i] == '_')
+                cproperty_name[i] = '-';
+        }
+        spec
+          = g_object_class_find_property(G_OBJECT_GET_CLASS(b), cproperty_name);
+        if (spec)
+            goto found;
+        else {
+            GIFieldInfo* field = NULL;
+            GIBaseInfo* info
+              = (GIBaseInfo*) g_irepository_find_by_gtype(0, G_OBJECT_TYPE(b));
+            gint n;
+            const gchar* name;
+
+            for (i = 0; i < len; i++) {
+                if (cproperty_name[i] == '-')
+                    cproperty_name[i] = '_';
+            }
+
+            if (!info) {
+                return NULL;
+            }
+
+            n = g_object_info_get_n_fields((GIObjectInfo*) info);
+            for (i = 0; i < n; i++) {
+                field = g_object_info_get_field((GIObjectInfo*) info, i);
+                name = g_base_info_get_name((GIBaseInfo*) field);
+
+                if (!g_strcmp0(name, cproperty_name))
+                    goto found_field;
+                else {
+                    g_base_info_unref((GIBaseInfo*) field);
+                    field = 0;
+                }
+            }
+        found_field:
+            if (field) {
+                ret = seed_field_get_value(context, b, field, exception);
+                g_base_info_unref((GIBaseInfo*) info);
+                return ret;
+            }
+            g_base_info_unref((GIBaseInfo*) info);
+        }
+        return NULL;
     }
 found:
 
-  g_value_init (&gval, spec->value_type);
-  g_object_get_property (b, cproperty_name, &gval);
-  ret = seed_value_from_gvalue (context, &gval, exception);
-  g_value_unset (&gval);
+    g_value_init(&gval, spec->value_type);
+    g_object_get_property(b, cproperty_name, &gval);
+    ret = seed_value_from_gvalue(context, &gval, exception);
+    g_value_unset(&gval);
 
-  return (JSValueRef) ret;
+    return (JSValueRef) ret;
 }
 
 static bool
-seed_gobject_set_property (JSContextRef context,
-			   JSObjectRef object,
-			   JSStringRef property_name,
-			   JSValueRef value, JSValueRef * exception)
+seed_gobject_set_property(JSContextRef context,
+                          JSObjectRef object,
+                          JSStringRef property_name,
+                          JSValueRef value,
+                          JSValueRef* exception)
 {
-  GParamSpec *spec = 0;
-  GObject *obj;
-  GValue gval = { 0 };
-  GType type;
-  gchar *cproperty_name;
-  gsize length;
-  gsize i, len;
-
-  if (pthread_getspecific(seed_next_gobject_wrapper_key) ||
-      JSValueIsNull (context, value))
-    return 0;
-
-
-  obj = seed_value_to_object (context, object, 0);
-
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  spec = g_object_class_find_property (G_OBJECT_GET_CLASS (obj),
-				       cproperty_name);
-
-  if (!spec)
-    {
-      len = strlen (cproperty_name);
-      for (i = 0; i < len; i++)
-	{
-	  if (cproperty_name[i] == '_')
-	    cproperty_name[i] = '-';
-	}
-      spec = g_object_class_find_property (G_OBJECT_GET_CLASS (obj),
-					   cproperty_name);
-      if (!spec)
-	{
-	  return FALSE;
-	}
+    GParamSpec* spec = 0;
+    GObject* obj;
+    GValue gval = { 0 };
+    GType type;
+    gchar* cproperty_name;
+    gsize length;
+    gsize i, len;
+
+    if (pthread_getspecific(seed_next_gobject_wrapper_key)
+        || JSValueIsNull(context, value))
+        return 0;
+
+    obj = seed_value_to_object(context, object, 0);
+
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    spec
+      = g_object_class_find_property(G_OBJECT_GET_CLASS(obj), cproperty_name);
+
+    if (!spec) {
+        len = strlen(cproperty_name);
+        for (i = 0; i < len; i++) {
+            if (cproperty_name[i] == '_')
+                cproperty_name[i] = '-';
+        }
+        spec = g_object_class_find_property(G_OBJECT_GET_CLASS(obj),
+                                            cproperty_name);
+        if (!spec) {
+            return FALSE;
+        }
     }
 
-  if (g_type_is_a (spec->value_type, G_TYPE_ENUM))
-    type = G_TYPE_LONG;
-  else
-    type = spec->value_type;
+    if (g_type_is_a(spec->value_type, G_TYPE_ENUM))
+        type = G_TYPE_LONG;
+    else
+        type = spec->value_type;
 
-  seed_value_to_gvalue (context, value, type, &gval, exception);
-  if (*exception)
-    {
-      return FALSE;
+    seed_value_to_gvalue(context, value, type, &gval, exception);
+    if (*exception) {
+        return FALSE;
     }
 
-  if (glib_message)
-    {
-      g_free (glib_message);
-      glib_message = 0;
+    if (glib_message) {
+        g_free(glib_message);
+        glib_message = 0;
     }
-  g_object_set_property (obj, cproperty_name, &gval);
-  if (glib_message != 0)
-    {
-      seed_make_exception (context, exception, "PropertyError",
-			   glib_message, NULL);
+    g_object_set_property(obj, cproperty_name, &gval);
+    if (glib_message != 0) {
+        seed_make_exception(context, exception, "PropertyError", glib_message,
+                            NULL);
 
-      return FALSE;
+        return FALSE;
     }
 
-  g_value_unset (&gval);
+    g_value_unset(&gval);
 
-  return TRUE;
+    return TRUE;
 }
 
 static JSValueRef
-seed_gobject_constructor_convert_to_type (JSContextRef ctx,
-					  JSObjectRef object,
-					  JSType type, JSValueRef * exception)
+seed_gobject_convert_to_type(JSContextRef ctx,
+                             JSObjectRef object,
+                             JSType type,
+                             JSValueRef* exception)
 {
-  GType gtype;
-  gchar *as_string;
+    GObject* obj;
+    gchar* as_string;
 
-  if (type == kJSTypeString)
-    {
-      JSValueRef ret;
-      gtype = (GType) JSObjectGetPrivate (object);
+    if (type == kJSTypeString) {
+        JSValueRef ret;
+        obj = (GObject*) JSObjectGetPrivate(object);
 
-      as_string =
-	g_strdup_printf ("[gobject_constructor %s]", g_type_name (gtype));
-      ret = seed_value_from_string (ctx, as_string, exception);
-      g_free (as_string);
+        as_string
+          = g_strdup_printf("[gobject %s %p]", G_OBJECT_TYPE_NAME(obj), obj);
+        ret = seed_value_from_string(ctx, as_string, exception);
+        g_free(as_string);
 
-      return ret;
+        return ret;
     }
-  return FALSE;
+    return FALSE;
 }
 
-JSStaticFunction gobject_static_funcs[] = {
-  {"__debug_ref_count", seed_gobject_ref_count, 0}
-  ,
-  {"__property_type", seed_gobject_property_type, 0}
-  ,
-  {0, 0, 0}
-};
+static JSValueRef
+seed_gobject_constructor_convert_to_type(JSContextRef ctx,
+                                         JSObjectRef object,
+                                         JSType type,
+                                         JSValueRef* exception)
+{
+    GType gtype;
+    gchar* as_string;
+
+    if (type == kJSTypeString) {
+        JSValueRef ret;
+        gtype = (GType) JSObjectGetPrivate(object);
+
+        as_string
+          = g_strdup_printf("[gobject_constructor %s]", g_type_name(gtype));
+        ret = seed_value_from_string(ctx, as_string, exception);
+        g_free(as_string);
+
+        return ret;
+    }
+    return FALSE;
+}
+
+JSStaticFunction gobject_static_funcs[]
+  = { { "__debug_ref_count", seed_gobject_ref_count, 0 },
+      { "__property_type", seed_gobject_property_type, 0 },
+      { "connect", seed_gobject_signal_connect_by_name, 0 },
+      { 0, 0, 0 } };
 
 JSClassDefinition gobject_def = {
-  0,				/* Version, always 0 */
-  kJSClassAttributeNoAutomaticPrototype,	/* JSClassAttributes */
-  "gobject",			/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  gobject_static_funcs,		/* Static Functions */
-  NULL,
-  seed_gobject_finalize,	/* Finalize */
-  NULL,				/* Has Property */
-  seed_gobject_get_property,	/* Get Property */
-  seed_gobject_set_property,	/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0,                                     /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype, /* JSClassAttributes */
+    "gobject",                             /* Class Name */
+    NULL,                                  /* Parent Class */
+    NULL,                                  /* Static Values */
+    gobject_static_funcs,                  /* Static Functions */
+    NULL,
+    seed_gobject_finalize,       /* Finalize */
+    NULL,                        /* Has Property */
+    seed_gobject_get_property,   /* Get Property */
+    seed_gobject_set_property,   /* Set Property */
+    NULL,                        /* Delete Property */
+    NULL,                        /* Get Property Names */
+    NULL,                        /* Call As Function */
+    NULL,                        /* Call As Constructor */
+    NULL,                        /* Has Instance */
+    seed_gobject_convert_to_type /* Convert To Type */
 };
 
 JSClassDefinition gobject_method_def = {
-  0,				/* Version, always 0 */
-  0,
-  "gobject_method",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  seed_gobject_method_finalize,	/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  seed_gobject_method_invoked,	/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    0,
+    "gobject_method", /* Class Name */
+    NULL,             /* Parent Class */
+    NULL,             /* Static Values */
+    NULL,             /* Static Functions */
+    NULL,
+    seed_gobject_method_finalize, /* Finalize */
+    NULL,                         /* Has Property */
+    NULL,                         /* Get Property */
+    NULL,                         /* Set Property */
+    NULL,                         /* Delete Property */
+    NULL,                         /* Get Property Names */
+    seed_gobject_method_invoked,  /* Call As Function */
+    NULL,                         /* Call As Constructor */
+    NULL,                         /* Has Instance */
+    NULL                          /* Convert To Type */
 };
 
 JSClassDefinition gobject_init_method_def = {
-  0,				/* Version, always 0 */
-  0,
-  "init_method",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  seed_gobject_method_finalize,	/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  seed_gobject_init_method_invoked,	/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    0,
+    "init_method", /* Class Name */
+    NULL,          /* Parent Class */
+    NULL,          /* Static Values */
+    NULL,          /* Static Functions */
+    NULL,
+    seed_gobject_method_finalize,     /* Finalize */
+    NULL,                             /* Has Property */
+    NULL,                             /* Get Property */
+    NULL,                             /* Set Property */
+    NULL,                             /* Delete Property */
+    NULL,                             /* Get Property Names */
+    seed_gobject_init_method_invoked, /* Call As Function */
+    NULL,                             /* Call As Constructor */
+    NULL,                             /* Has Instance */
+    NULL                              /* Convert To Type */
 };
 
 JSClassDefinition seed_callback_def = {
-  0,				/* Version, always 0 */
-  0,
-  "seed_callback",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  NULL,				/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0,                     /* Version, always 0 */
+    0,    "seed_callback", /* Class Name */
+    NULL,                  /* Parent Class */
+    NULL,                  /* Static Values */
+    NULL,                  /* Static Functions */
+    NULL, NULL,            /* Finalize */
+    NULL,                  /* Has Property */
+    NULL,                  /* Get Property */
+    NULL,                  /* Set Property */
+    NULL,                  /* Delete Property */
+    NULL,                  /* Get Property Names */
+    NULL,                  /* Call As Function */
+    NULL,                  /* Call As Constructor */
+    NULL,                  /* Has Instance */
+    NULL                   /* Convert To Type */
 };
 
-JSClassDefinition gobject_constructor_def = {
-  0,				/* Version, always 0 */
-  0,
-  "gobject_constructor",	/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  NULL,				/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  seed_gobject_constructor_invoked,	/* Call As Constructor */
-  seed_gobject_has_instance,				/* Has Instance */
-  seed_gobject_constructor_convert_to_type
-};
-
-JSClassDefinition gobject_named_constructor_def = {
-  0,				/* Version, always 0 */
-  0,
-  "gobject_named_constructor",	/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  NULL,				/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  seed_gobject_named_constructor_invoked,	/* Call As Constructor */
-  seed_gobject_has_instance,				/* Has Instance */
-  seed_gobject_constructor_convert_to_type
-};
+JSClassDefinition gobject_constructor_def
+  = { 0, /* Version, always 0 */
+      0,
+      "gobject_constructor", /* Class Name */
+      NULL,                  /* Parent Class */
+      NULL,                  /* Static Values */
+      NULL,                  /* Static Functions */
+      NULL,
+      NULL,                             /* Finalize */
+      NULL,                             /* Has Property */
+      NULL,                             /* Get Property */
+      NULL,                             /* Set Property */
+      NULL,                             /* Delete Property */
+      NULL,                             /* Get Property Names */
+      NULL,                             /* Call As Function */
+      seed_gobject_constructor_invoked, /* Call As Constructor */
+      seed_gobject_has_instance,        /* Has Instance */
+      seed_gobject_constructor_convert_to_type };
+
+JSClassDefinition gobject_named_constructor_def
+  = { 0,                              /* Version, always 0 */
+      0, "gobject_named_constructor", /* Class Name */
+      NULL,                           /* Parent Class */
+      NULL,                           /* Static Values */
+      NULL,                           /* Static Functions */
+      NULL, NULL,                     /* Finalize */
+      NULL,                           /* Has Property */
+      NULL,                           /* Get Property */
+      NULL,                           /* Set Property */
+      NULL,                           /* Delete Property */
+      NULL,                           /* Get Property Names */
+      // To be compatible with gjs you need to be able to call named
+      // constructors without the new in front
+      seed_gobject_method_invoked,            /* Call As Function */
+      seed_gobject_named_constructor_invoked, /* Call As Constructor */
+      seed_gobject_has_instance,              /* Has Instance */
+      seed_gobject_constructor_convert_to_type };
 
 JSClassDefinition struct_constructor_def = {
-  0,				/* Version, always 0 */
-  0,
-  "struct_constructor",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  NULL,				/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  seed_struct_constructor_invoked,	/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    0,
+    "struct_constructor", /* Class Name */
+    NULL,                 /* Parent Class */
+    NULL,                 /* Static Values */
+    NULL,                 /* Static Functions */
+    NULL,
+    NULL,                            /* Finalize */
+    NULL,                            /* Has Property */
+    NULL,                            /* Get Property */
+    NULL,                            /* Set Property */
+    NULL,                            /* Delete Property */
+    NULL,                            /* Get Property Names */
+    NULL,                            /* Call As Function */
+    seed_struct_constructor_invoked, /* Call As Constructor */
+    NULL,                            /* Has Instance */
+    NULL                             /* Convert To Type */
 };
 
 /**
@@ -1515,7 +1603,7 @@ JSClassDefinition struct_constructor_def = {
  * @ctx: A valid #SeedContext
  * @name: The name of the function (used in exceptions).
  * @func: A #SeedFunctionCallback to implement the function.
- * @obj: The #SeedObject on which to put the function. 
+ * @obj: The #SeedObject on which to put the function.
  *
  * Creates a JavaScript object representing a first-class function; when
  * the function is called from JavaScript, @func will be called. Places
@@ -1523,152 +1611,160 @@ JSClassDefinition struct_constructor_def = {
  *
  */
 void
-seed_create_function (JSContextRef ctx,
-		      gchar * name, gpointer func, JSObjectRef obj)
+seed_create_function(JSContextRef ctx,
+                     gchar* name,
+                     gpointer func,
+                     JSObjectRef obj)
 {
-  JSObjectRef oref;
+    JSObjectRef oref;
 
-  oref = JSObjectMakeFunctionWithCallback (ctx, NULL, func);
-  seed_object_set_property (ctx, obj, name, oref);
+    oref = JSObjectMakeFunctionWithCallback(ctx, NULL, func);
+    seed_object_set_property(ctx, obj, name, oref);
 }
 
 void
-seed_repl_expose (JSContextRef ctx, ...)
+seed_repl_expose(JSContextRef ctx, ...)
 {
-  va_list argp;
-  void *expose;
-  JSObjectRef arrayObj;
-  guint i = 0;
-  JSStringRef script;
-  JSObjectRef seed = (JSObjectRef) seed_object_get_property (ctx,
-							     JSContextGetGlobalObject
-							     (ctx),
-							     "Seed");
-  va_start (argp, ctx);
-
-  arrayObj = JSObjectMake (ctx, NULL, NULL);
-
-  g_print ("Seed Debug REPL\n\nExposing:\n");
-
-  while ((expose = va_arg (argp, void *)))
-    {
-      g_print ("  Seed.debug_argv[%u] = %p\n", i, expose);
-      JSObjectSetPropertyAtIndex (ctx, arrayObj, i++, expose, NULL);
+    va_list argp;
+    void* expose;
+    JSObjectRef arrayObj;
+    guint i = 0;
+    JSStringRef script;
+    JSObjectRef seed
+      = (JSObjectRef) seed_object_get_property(ctx,
+                                               JSContextGetGlobalObject(ctx),
+                                               "Seed");
+    va_start(argp, ctx);
+
+    arrayObj = JSObjectMake(ctx, NULL, NULL);
+
+    g_print("Seed Debug REPL\n\nExposing:\n");
+
+    while ((expose = va_arg(argp, void*) )) {
+        g_print("  Seed.debug_argv[%u] = %p\n", i, expose);
+        JSObjectSetPropertyAtIndex(ctx, arrayObj, i++, expose, NULL);
     }
 
-  g_print ("\n");
+    g_print("\n");
 
-  seed_object_set_property (ctx, seed, "debug_argv", arrayObj);
+    seed_object_set_property(ctx, seed, "debug_argv", arrayObj);
 
-  script = JSStringCreateWithUTF8CString ("readline = imports.readline;"
-					  "while(1) { try { print(eval("
-					  "readline.readline(\"> \"))); } catch(e) {"
-					  "print(e.name + \" \" + e.message);}}");
+    script = JSStringCreateWithUTF8CString(
+      "readline = imports.readline;"
+      "while(1) { try { print(eval("
+      "readline.readline(\"> \"))); } catch(e) {"
+      "print(e.name + \" \" + e.message);}}");
 
-  JSEvaluateScript (ctx, script, NULL, NULL, 0, NULL);
+    JSEvaluateScript(ctx, script, NULL, NULL, 0, NULL);
 
-  JSStringRelease (script);
+    JSStringRelease(script);
 
-  va_end (argp);
+    va_end(argp);
 }
 
 static void
-seed_log_handler (const gchar * domain,
-		  GLogLevelFlags log_level,
-		  const gchar * message, gpointer user_data)
+seed_log_handler(const gchar* domain,
+                 GLogLevelFlags log_level,
+                 const gchar* message,
+                 gpointer user_data)
 {
-  if (glib_message)
-    g_free (glib_message);
-  glib_message = g_strdup (message);
+    if (glib_message)
+        g_free(glib_message);
+    glib_message = g_strdup(message);
 }
 
 #ifdef SEED_ENABLE_DEBUG
 static gboolean
-seed_arg_debug_cb (const char *key, const char *value, gpointer user_data)
+seed_arg_debug_cb(const char* key, const char* value, gpointer user_data)
 {
-  seed_debug_flags |=
-    g_parse_debug_string (value,
-			  seed_debug_keys, G_N_ELEMENTS (seed_debug_keys));
-  return TRUE;
+    seed_debug_flags |= g_parse_debug_string(value, seed_debug_keys,
+                                             G_N_ELEMENTS(seed_debug_keys));
+    return TRUE;
 }
 
 static gboolean
-seed_arg_no_debug_cb (const char *key, const char *value, gpointer user_data)
+seed_arg_no_debug_cb(const char* key, const char* value, gpointer user_data)
 {
-  seed_debug_flags &=
-    ~g_parse_debug_string (value,
-			   seed_debug_keys, G_N_ELEMENTS (seed_debug_keys));
-  return TRUE;
+    seed_debug_flags &= ~g_parse_debug_string(value, seed_debug_keys,
+                                              G_N_ELEMENTS(seed_debug_keys));
+    return TRUE;
 }
 #endif /* SEED_ENABLE_DEBUG */
 
-static GOptionEntry seed_args[] = {
+GOptionGroup*
+seed_get_option_group(SeedEngine* eng)
+{
+    GOptionGroup* group;
+
+    GOptionEntry seed_args[] = {
 #ifdef SEED_ENABLE_DEBUG
-  {"seed-debug", 0, 0, G_OPTION_ARG_CALLBACK, seed_arg_debug_cb,
-   "Seed debugging messages to show. Comma separated list of: all, misc, finalization, initialization, construction, invocation, signal, structs, gtype.",
-   "FLAGS"},
-  {"seed-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, seed_arg_no_debug_cb,
-   "Disable Seed debugging", "FLAGS"},
+        { "seed-debug", 0, 0, G_OPTION_ARG_CALLBACK, seed_arg_debug_cb,
+          "Seed debugging messages to show. Comma separated list of: all, "
+          "misc, "
+          "finalization, initialization, construction, invocation, signal, "
+          "structs, gtype.",
+          "FLAGS" },
+        { "seed-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, seed_arg_no_debug_cb,
+          "Disable Seed debugging", "FLAGS" },
 #endif /* SEED_ENABLE_DEBUG */
-  {"seed-version", 0, 0, G_OPTION_ARG_NONE, &seed_arg_print_version,
-   "Print libseed version", 0},
-  {NULL,},
-};
-
-GOptionGroup *
-seed_get_option_group (void)
-{
-  GOptionGroup *group;
+        { "seed-version", 0, 0, G_OPTION_ARG_NONE, &seed_arg_print_version,
+          "Print libseed version", 0 },
+        { "program-name", 0, 0, G_OPTION_ARG_STRING, &eng->program_name,
+          "Program Name", 0 },
+        {
+          NULL,
+        },
+    };
 
-  group = g_option_group_new ("seed", "Seed Options",
-			      "Show Seed Options", NULL, NULL);
-  g_option_group_add_entries (group, seed_args);
+    group = g_option_group_new("seed", "Seed Options", "Show Seed Options",
+                               NULL, NULL);
+    g_option_group_add_entries(group, seed_args);
 
-  return group;
+    return group;
 }
 
 static gboolean
-seed_parse_args (int *argc, char ***argv)
+seed_parse_args(SeedEngine* eng, int* argc, char*** argv)
 {
-  GOptionContext *option_context;
-  GOptionGroup *seed_group;
-
-  GError *error = NULL;
-  gboolean ret = TRUE;
+    GOptionContext* option_context;
+    GOptionGroup* seed_group;
 
-  option_context = g_option_context_new (NULL);
-  g_option_context_set_ignore_unknown_options (option_context, TRUE);
-  g_option_context_set_help_enabled (option_context, TRUE);
+    GError* error = NULL;
+    gboolean ret = TRUE;
 
-  /* Initiate any command line options from the backend */
+    option_context = g_option_context_new(NULL);
+    g_option_context_set_ignore_unknown_options(option_context, TRUE);
+    g_option_context_set_help_enabled(option_context, TRUE);
 
-  seed_group = seed_get_option_group ();
-  g_option_context_add_group (option_context, seed_group);
+    /* Initiate any command line options from the backend */
+    seed_group = seed_get_option_group(eng);
+    g_option_context_add_group(option_context, seed_group);
 
-  if (!g_option_context_parse (option_context, argc, argv, &error))
-    {
-      if (error)
-	{
-	  g_warning ("%s", error->message);
-	  g_error_free (error);
-	}
+    if (!g_option_context_parse(option_context, argc, argv, &error)) {
+        if (error) {
+            g_warning("%s", error->message);
+            g_error_free(error);
+        }
 
-      ret = FALSE;
+        ret = FALSE;
     }
 
-  g_option_context_free (option_context);
+    if (!eng->program_name)
+        eng->program_name = g_strdup(*argv[0]);
 
-  return ret;
+    g_option_context_free(option_context);
+
+    return ret;
 }
 
 void
-seed_engine_destroy (SeedEngine *eng)
+seed_engine_destroy(SeedEngine* eng)
 {
-  JSValueUnprotect (eng->context, eng->global);
-  JSGlobalContextRelease (eng->context);
-  JSContextGroupRelease (eng->group);
+    JSValueUnprotect(eng->context, eng->global);
+    JSGlobalContextRelease(eng->context);
+    JSContextGroupRelease(eng->group);
 
-  g_free (eng);
+    g_free(eng);
 }
 
 /**
@@ -1678,15 +1774,18 @@ seed_engine_destroy (SeedEngine *eng)
  * @context A reference to an existing JavascriptCore context
  * @group: A #SeedContextGroup within which to create the initial context.
  *
- * Initializes an empty new #SeedEngine. The Javascript context of this engine is
+ * Initializes an empty new #SeedEngine. The Javascript context of this engine
+ * is
  * *not* filled with any builtins functions and the import system.
  *
  * The javascript code executed with this engine can't import arbitrary
  * GObject introspected librairies.
  *
- * Use this when control over what is exposed in the Javascript context is required,
+ * Use this when control over what is exposed in the Javascript context is
+ * required,
  * for security concerns for example.
- * GObject instances can be selectively exposed by calling @seed_engine_expose_gobject.
+ * GObject instances can be selectively exposed by calling
+ * @seed_engine_expose_gobject.
  * Namespaces can be selectively exposed by calling
  *
  * This function should only be called once within a single Seed application.
@@ -1694,77 +1793,82 @@ seed_engine_destroy (SeedEngine *eng)
  * Return value: The newly created and initialized #SeedEngine.
  *
  */
-SeedEngine *
-seed_init_constrained_with_context_and_group (gint * argc,
-                                                     gchar *** argv,
-                                                     JSGlobalContextRef context,
-                                                     JSContextGroupRef group)
+SeedEngine*
+seed_init_constrained_with_context_and_group(gint* argc,
+                                             gchar*** argv,
+                                             JSGlobalContextRef context,
+                                             JSContextGroupRef group)
 {
-  g_type_init ();
-  g_log_set_handler ("GLib-GObject", G_LOG_LEVEL_WARNING, seed_log_handler, 0);
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+    g_type_init();
+#endif
+    g_log_set_handler("GLib-GObject", G_LOG_LEVEL_WARNING, seed_log_handler, 0);
 
-  if ((argc != 0) && seed_parse_args (argc, argv) == FALSE)
-    {
-      SEED_NOTE (MISC, "failed to parse arguments.");
-      return FALSE;
-    }
+    eng = (SeedEngine*) g_malloc(sizeof(SeedEngine));
 
-  if (seed_arg_print_version)
-    {
-      g_print("%s\n", "Seed " VERSION);
-      exit(EXIT_SUCCESS);
+    if ((argc != 0) && seed_parse_args(eng, argc, argv) == FALSE) {
+        SEED_NOTE(MISC, "failed to parse arguments.");
+        return FALSE;
     }
 
-  qname = g_quark_from_static_string ("js-type");
-  qprototype = g_quark_from_static_string ("js-prototype");
-  js_ref_quark = g_quark_from_static_string ("js-ref");
-
-  pthread_key_create(&seed_next_gobject_wrapper_key, NULL);
-
-  eng = (SeedEngine *) g_malloc (sizeof (SeedEngine));
-
-  context_group = group;
-
-  eng->context = context;
-  eng->global = JSContextGetGlobalObject (eng->context);
-  eng->group = context_group;
-  eng->search_path = NULL;
-
-  function_proto = (JSObjectRef)
-    seed_simple_evaluate (eng->context, "Function.prototype", NULL);
-
-  gobject_class = JSClassCreate (&gobject_def);
-  JSClassRetain (gobject_class);
-  gobject_method_class = JSClassCreate (&gobject_method_def);
-  JSClassRetain (gobject_method_class);
-  gobject_constructor_class = JSClassCreate (&gobject_constructor_def);
-  JSClassRetain (gobject_constructor_class);
-  gobject_named_constructor_class =
-    JSClassCreate (&gobject_named_constructor_def);
-  JSClassRetain (gobject_named_constructor_class);
-  gobject_signal_class = JSClassCreate (seed_get_signal_class ());
-  JSClassRetain (gobject_signal_class);
-  seed_callback_class = JSClassCreate (&seed_callback_def);
-  JSClassRetain (seed_callback_class);
-  seed_struct_constructor_class = JSClassCreate (&struct_constructor_def);
-  JSClassRetain (seed_struct_constructor_class);
-  gobject_init_method_class = JSClassCreate (&gobject_init_method_def);
-  JSClassRetain (gobject_init_method_class);
-
-  g_type_set_qdata (G_TYPE_OBJECT, qname, gobject_class);
-
-  seed_obj_ref = JSObjectMake (eng->context, NULL, NULL);
-  seed_object_set_property (eng->context, eng->global, "Seed", seed_obj_ref);
-  JSValueProtect (eng->context, seed_obj_ref);
-
-  g_irepository_require (g_irepository_get_default (), "GObject", NULL, 0, 0);
-  g_irepository_require (g_irepository_get_default (), "GIRepository",
-                         NULL, 0, 0);
-
-  seed_structs_init ();
-  seed_closures_init ();
+    if (seed_arg_print_version) {
+        g_print("%s\n", "Seed " VERSION);
+        exit(EXIT_SUCCESS);
+    }
 
-  return eng;
+    qname = g_quark_from_static_string("js-type");
+    qprototype = g_quark_from_static_string("js-prototype");
+    js_ref_quark = g_quark_from_static_string("js-ref");
+
+    pthread_key_create(&seed_next_gobject_wrapper_key, NULL);
+
+    context_group = group;
+
+    eng->context = context;
+    eng->global = JSContextGetGlobalObject(eng->context);
+    eng->group = context_group;
+    eng->search_path = NULL;
+
+    function_proto
+      = (JSObjectRef) seed_simple_evaluate(eng->context, "Function.prototype",
+                                           NULL);
+
+    gobject_class = JSClassCreate(&gobject_def);
+    JSClassRetain(gobject_class);
+    gobject_method_class = JSClassCreate(&gobject_method_def);
+    JSClassRetain(gobject_method_class);
+    gobject_constructor_class = JSClassCreate(&gobject_constructor_def);
+    JSClassRetain(gobject_constructor_class);
+    gobject_named_constructor_class
+      = JSClassCreate(&gobject_named_constructor_def);
+    JSClassRetain(gobject_named_constructor_class);
+    gobject_signal_class = JSClassCreate(seed_get_signal_class());
+    JSClassRetain(gobject_signal_class);
+    seed_callback_class = JSClassCreate(&seed_callback_def);
+    JSClassRetain(seed_callback_class);
+    seed_struct_constructor_class = JSClassCreate(&struct_constructor_def);
+    JSClassRetain(seed_struct_constructor_class);
+    gobject_init_method_class = JSClassCreate(&gobject_init_method_def);
+    JSClassRetain(gobject_init_method_class);
+
+    g_type_set_qdata(G_TYPE_OBJECT, qname, gobject_class);
+
+    seed_obj_ref = JSObjectMake(eng->context, NULL, NULL);
+    seed_object_set_property(eng->context, eng->global, "Seed", seed_obj_ref);
+    JSValueProtect(eng->context, seed_obj_ref);
+
+    window_obj_ref = JSObjectMake(eng->context, NULL, NULL);
+    seed_object_set_property(eng->context, eng->global, "window",
+                             window_obj_ref);
+    JSValueProtect(eng->context, window_obj_ref);
+    g_irepository_require(g_irepository_get_default(), "GObject", NULL, 0, 0);
+    g_irepository_require(g_irepository_get_default(), "GIRepository", NULL, 0,
+                          0);
+
+    seed_structs_init();
+    seed_closures_init();
+
+    return eng;
 }
 
 /**
@@ -1784,30 +1888,29 @@ seed_init_constrained_with_context_and_group (gint * argc,
  * Return value: The newly created and initialized #SeedEngine.
  *
  */
-SeedEngine *
-seed_init_with_context_and_group (gint * argc,
-			      gchar *** argv, JSGlobalContextRef context, JSContextGroupRef group)
+SeedEngine*
+seed_init_with_context_and_group(gint* argc,
+                                 gchar*** argv,
+                                 JSGlobalContextRef context,
+                                 JSContextGroupRef group)
 {
 
-  eng = seed_init_constrained_with_context_and_group (argc, argv, context, group);
-  seed_init_builtins (eng, argc, argv);
-  seed_initialize_importer (eng->context, eng->global);
-  seed_gtype_init (eng);
+    eng = seed_init_constrained_with_context_and_group(argc, argv, context,
+                                                       group);
+    seed_init_builtins(eng, argc, argv);
+    seed_initialize_importer(eng->context, eng->global);
+    seed_gtype_init(eng);
 
-  defaults_script =
-    JSStringCreateWithUTF8CString ("Seed.include(\"" SEED_PREFIX_PATH
-				   "extensions/Seed.js\");");
+    defaults_script = JSStringCreateWithUTF8CString(
+      "Seed.include(\"/org/seed/extensions/Seed.js\");");
 
-  JSEvaluateScript (eng->context, defaults_script, NULL, NULL, 0, NULL);
+    JSEvaluateScript(eng->context, defaults_script, NULL, NULL, 0, NULL);
 
-  base_info_info =
-    g_irepository_find_by_name (0, "GIRepository", "IBaseInfo");
+    base_info_info = g_irepository_find_by_name(0, "GIRepository", "BaseInfo");
 
-  return eng;
+    return eng;
 }
 
-
-
 /**
  * seed_init_with_context_group:
  * @argc: A reference to the number of arguments remaining to parse.
@@ -1823,11 +1926,11 @@ seed_init_with_context_and_group (gint * argc,
  * Return value: The newly created and initialized #SeedEngine.
  *
  */
-SeedEngine *
-seed_init_with_context_group (gint * argc,
-			      gchar *** argv, JSContextGroupRef group)
+SeedEngine*
+seed_init_with_context_group(gint* argc, gchar*** argv, JSContextGroupRef group)
 {
-  return seed_init_with_context_and_group (argc, argv, JSGlobalContextCreateInGroup (group, NULL), group);
+    return seed_init_with_context_and_group(
+      argc, argv, JSGlobalContextCreateInGroup(group, NULL), group);
 }
 
 /**
@@ -1844,12 +1947,12 @@ seed_init_with_context_group (gint * argc,
  * Return value: The newly created and initialized #SeedEngine.
  *
  */
-SeedEngine *
-seed_init (gint * argc, gchar *** argv)
+SeedEngine*
+seed_init(gint* argc, gchar*** argv)
 {
-  context_group = JSContextGroupCreate ();
+    context_group = JSContextGroupCreate();
 
-  return seed_init_with_context_group (argc, argv, context_group);
+    return seed_init_with_context_group(argc, argv, context_group);
 }
 
 /**
@@ -1858,7 +1961,7 @@ seed_init (gint * argc, gchar *** argv)
  * @argv: A reference to an array of string arguments remaining to parse.
  * @context A reference to an existing JavascriptCore context
 
- * Initializes a new #SeedEngine using an existing JavascriptCore context. 
+ * Initializes a new #SeedEngine using an existing JavascriptCore context.
  * This involves initializing GLib, adding the default globals to the provided
  * @context and initializing various internal parts of Seed.
  *
@@ -1867,12 +1970,12 @@ seed_init (gint * argc, gchar *** argv)
  * Return value: The newly created and initialized #SeedEngine.
  *
  */
-SeedEngine *
-seed_init_with_context (gint * argc, gchar *** argv, JSGlobalContextRef context)
+SeedEngine*
+seed_init_with_context(gint* argc, gchar*** argv, JSGlobalContextRef context)
 {
-  context_group = JSContextGetGroup (context);
+    context_group = JSContextGetGroup(context);
 
-  return seed_init_with_context_and_group (argc, argv, context, context_group);
+    return seed_init_with_context_and_group(argc, argv, context, context_group);
 }
 
 /**
@@ -1880,15 +1983,18 @@ seed_init_with_context (gint * argc, gchar *** argv, JSGlobalContextRef context)
  * @argc: A reference to the number of arguments remaining to parse.
  * @argv: A reference to an array of string arguments remaining to parse.
  *
- * Initializes an empty new #SeedEngine. The Javascript context of this engine is
+ * Initializes an empty new #SeedEngine. The Javascript context of this engine
+ * is
  * *not* filled with any builtins functions and the import system.
  *
  * The javascript code executed with this engine can't import arbitrary
  * GObject introspected librairies.
  *
- * Use this when control over what is exposed in the Javascript context is required,
+ * Use this when control over what is exposed in the Javascript context is
+ * required,
  * for security concerns for example.
- * GObject instances can be selectively exposed by calling @seed_engine_expose_gobject.
+ * GObject instances can be selectively exposed by calling
+ * @seed_engine_expose_gobject.
  * Namespaces can be selectively exposed by calling
  *
  * This function should only be called once within a single Seed application.
@@ -1896,88 +2002,93 @@ seed_init_with_context (gint * argc, gchar *** argv, JSGlobalContextRef context)
  * Return value: The newly created and initialized #SeedEngine.
  *
  */
-SeedEngine *
-seed_init_constrained (gint * argc, gchar *** argv)
+SeedEngine*
+seed_init_constrained(gint* argc, gchar*** argv)
 {
-  context_group = JSContextGroupCreate ();
+    context_group = JSContextGroupCreate();
 
-  return seed_init_constrained_with_context_and_group(argc, argv,
-                                                             JSGlobalContextCreateInGroup (context_group, NULL),
-                                                             context_group);
+    return seed_init_constrained_with_context_and_group(
+      argc, argv, JSGlobalContextCreateInGroup(context_group, NULL),
+      context_group);
 }
 
 /*
  * seed_engine_expose_gobject:
  * @engine:
  * @name: The name of the global javascript variable pointing to @object
- * @object: The #GObject instance that will be exposed in the the javascript context
- * @gir_namespace: The Introspection namespace containing the type of the provided
+ * @object: The #GObject instance that will be exposed in the the javascript
+ * context
+ * @gir_namespace: The Introspection namespace containing the type of the
+ * provided
  * object.
  *
- * Expose a GObject instance to the global Javascript context and makes it accessible
+ * Expose a GObject instance to the global Javascript context and makes it
+ * accessible
  * under the provided @js_name
  *
  * return: the SeedValue representing @object, NULL in case of error
  */
 JSValueRef
-seed_engine_expose_gobject (SeedEngine *engine,
-                            gchar *js_name,
-                            GObject *object,
-                            gchar *gir_namespace,
-                            JSValueRef * exception)
+seed_engine_expose_gobject(SeedEngine* engine,
+                           gchar* js_name,
+                           GObject* object,
+                           gchar* gir_namespace,
+                           JSValueRef* exception)
 {
-  GError *error = NULL;
+    GError* error = NULL;
 
-  g_assert (engine != NULL && gir_namespace != NULL && js_name != NULL);
+    g_assert(engine != NULL && gir_namespace != NULL && js_name != NULL);
 
-  GITypelib *type_lib = g_irepository_require (g_irepository_get_default(),
-                                               gir_namespace, NULL, 0, &error);
-  if (type_lib == NULL)
-  {
-    seed_make_exception_from_gerror (engine->context, exception, error);
-    g_error_free (error);
-    return NULL;
-  }
+    GITypelib* type_lib = g_irepository_require(g_irepository_get_default(),
+                                                gir_namespace, NULL, 0, &error);
+    if (type_lib == NULL) {
+        seed_make_exception_from_gerror(engine->context, exception, error);
+        g_error_free(error);
+        return NULL;
+    }
 
-  JSValueRef obj_js_value = seed_value_from_object (engine->context,
-                                                    G_OBJECT(object),
-                                                    exception);
-  g_return_val_if_fail (obj_js_value != NULL, NULL);
+    JSValueRef obj_js_value
+      = seed_value_from_object(engine->context, G_OBJECT(object), exception);
+    g_return_val_if_fail(obj_js_value != NULL, NULL);
 
-  g_return_val_if_fail (engine->global != NULL, NULL);
+    g_return_val_if_fail(engine->global != NULL, NULL);
 
-  gboolean ok = seed_object_set_property (engine->context,
-                                          engine->global, js_name, obj_js_value);
-  g_return_val_if_fail (ok == TRUE, NULL);
+    gboolean ok = seed_object_set_property(engine->context, engine->global,
+                                           js_name, obj_js_value);
+    g_return_val_if_fail(ok == TRUE, NULL);
 
-  return obj_js_value;
+    return obj_js_value;
 }
 
 /*
  * seed_engine_expose_namespace:
  * @engine:
- * @namespace: Name of the GIR Namespace that should be exposed in the JS context.
+ * @namespace: Name of the GIR Namespace that should be exposed in the JS
+ * context.
  *
- * Expose a GIR namespace in the global Javascript context and makes it accessible
- * under a variable named after the namespace (ex: the namespace 'Notify' is held
+ * Expose a GIR namespace in the global Javascript context and makes it
+ * accessible
+ * under a variable named after the namespace (ex: the namespace 'Notify' is
+ * held
  * by the 'Notify' javascript variable.
  *
  * return: the SeedValue representing @namespace in the javascript context,
  *  NULL in case of error
  */
 JSValueRef
-seed_engine_expose_namespace (SeedEngine *engine,
-                              gchar *namespace_name,
-                              JSValueRef *exception)
+seed_engine_expose_namespace(SeedEngine* engine,
+                             gchar* namespace_name,
+                             JSValueRef* exception)
 {
-  g_assert (engine != NULL && namespace_name != NULL);
+    g_assert(engine != NULL && namespace_name != NULL);
 
-  JSValueRef namespace = seed_gi_importer_do_namespace (engine->context,
-                                                        namespace_name, exception);
-  g_return_val_if_fail (namespace != NULL, NULL);
-  gboolean ok = seed_object_set_property (engine->context,
-                                           engine->global, namespace_name, namespace);
-  g_return_val_if_fail (ok == TRUE, FALSE);
+    JSValueRef namespace
+      = seed_gi_importer_do_namespace(engine->context, namespace_name,
+                                      exception);
+    g_return_val_if_fail(namespace != NULL, NULL);
+    gboolean ok = seed_object_set_property(engine->context, engine->global,
+                                           namespace_name, namespace);
+    g_return_val_if_fail(ok == TRUE, FALSE);
 
-  return namespace;
+    return namespace;
 }
diff --git a/libseed/seed-engine.h b/libseed/seed-engine.h
index 4adcde5..0905420 100644
--- a/libseed/seed-engine.h
+++ b/libseed/seed-engine.h
@@ -32,7 +32,7 @@ extern JSClassRef gobject_init_method_class;
 extern pthread_key_t seed_next_gobject_wrapper_key;
 
 extern JSClassRef seed_callback_class;
-extern SeedEngine *eng;
+extern SeedEngine* eng;
 
 extern JSObjectRef seed_obj_ref;
 
@@ -42,44 +42,48 @@ extern JSStringRef defaults_script;
 
 typedef struct _SeedScript
 {
-  JSStringRef script;
-  JSValueRef exception;
+    JSStringRef script;
+    JSValueRef exception;
 
-  JSStringRef source_url;
-  gint line_number;
+    JSStringRef source_url;
+    gint line_number;
 } SeedScript;
 
-JSObjectRef seed_gobject_get_prototype_for_gtype (GType type);
-JSClassRef seed_gobject_get_class_for_gtype (JSContextRef ctx, GType type);
+JSObjectRef seed_gobject_get_prototype_for_gtype(GType type);
+JSClassRef seed_gobject_get_class_for_gtype(JSContextRef ctx, GType type);
 
-void
-seed_gobject_define_property_from_function_info (JSContextRef ctx,
-						 GIFunctionInfo * info,
-						 JSObjectRef object,
-						 gboolean instance);
-void seed_create_function (JSContextRef ctx, gchar * name,
-			   gpointer func, JSObjectRef obj);
+void seed_gobject_define_property_from_function_info(JSContextRef ctx,
+                                                     GIFunctionInfo* info,
+                                                     JSObjectRef object,
+                                                     gboolean instance);
+void seed_create_function(JSContextRef ctx,
+                          gchar* name,
+                          gpointer func,
+                          JSObjectRef obj);
 
-void seed_repl_expose (JSContextRef ctx, ...);
+void seed_repl_expose(JSContextRef ctx, ...);
 
-typedef JSObjectRef (*SeedModuleInitCallback) (SeedEngine * eng);
+typedef JSObjectRef (*SeedModuleInitCallback)(SeedEngine* eng);
 
-void seed_prepare_global_context (JSContextRef ctx);
+void seed_prepare_global_context(JSContextRef ctx);
 
-SeedScript *seed_make_script (JSContextRef ctx,
-			      const gchar * js,
-			      const gchar * source_url, gint line_number);
-SeedScript *seed_script_new_from_file (JSContextRef ctx, gchar * file);
-JSValueRef seed_script_exception (SeedScript * s);
+SeedScript* seed_make_script(JSContextRef ctx,
+                             const gchar* js,
+                             const gchar* source_url,
+                             gint line_number);
+SeedScript* seed_script_new_from_file(JSContextRef ctx, gchar* file);
+JSValueRef seed_script_exception(SeedScript* s);
 
-JSValueRef seed_evaluate (JSContextRef ctx, SeedScript * script,
-			  JSObjectRef this);
+JSValueRef seed_evaluate(JSContextRef ctx,
+                         SeedScript* script,
+                         JSObjectRef this);
 
-void seed_script_destroy (SeedScript * s);
+void seed_script_destroy(SeedScript* s);
 
-JSValueRef seed_simple_evaluate (JSContextRef ctx, const gchar * script,
-				 JSValueRef * exception);
+JSValueRef seed_simple_evaluate(JSContextRef ctx,
+                                const gchar* script,
+                                JSValueRef* exception);
 
-GOptionGroup * seed_get_option_group (void);
+GOptionGroup* seed_get_option_group(SeedEngine* engine);
 
 #endif
diff --git a/libseed/seed-exceptions.c b/libseed/seed-exceptions.c
index abaa210..6336b21 100644
--- a/libseed/seed-exceptions.c
+++ b/libseed/seed-exceptions.c
@@ -35,48 +35,48 @@
  *
  */
 void
-seed_make_exception (JSContextRef ctx,
-		     JSValueRef * exception,
-		     const gchar * name, const gchar * message, ...)
+seed_make_exception(JSContextRef ctx,
+                    JSValueRef* exception,
+                    const gchar* name,
+                    const gchar* message,
+                    ...)
 {
-  JSStringRef js_name = 0;
-  JSStringRef js_message = 0;
-  JSValueRef js_name_ref = 0, js_message_ref = 0;
-  JSObjectRef exception_obj;
-  gchar *mes;
-  va_list args;
+    JSStringRef js_name = 0;
+    JSStringRef js_message = 0;
+    JSValueRef js_name_ref = 0, js_message_ref = 0;
+    JSObjectRef exception_obj;
+    gchar* mes;
+    va_list args;
 
-  if (!exception)
-    return;
+    if (!exception)
+        return;
 
-  va_start (args, message);
+    va_start(args, message);
 
-  if (name)
-    {
-      js_name = JSStringCreateWithUTF8CString (name);
-      js_name_ref = JSValueMakeString (ctx, js_name);
+    if (name) {
+        js_name = JSStringCreateWithUTF8CString(name);
+        js_name_ref = JSValueMakeString(ctx, js_name);
     }
-  if (message)
-    {
-      mes = g_strdup_vprintf (message, args);
-      js_message = JSStringCreateWithUTF8CString (mes);
-      js_message_ref = JSValueMakeString (ctx, js_message);
-      g_free (mes);
+    if (message) {
+        mes = g_strdup_vprintf(message, args);
+        js_message = JSStringCreateWithUTF8CString(mes);
+        js_message_ref = JSValueMakeString(ctx, js_message);
+        g_free(mes);
     }
 
-  // TODO: needs to create a global class named 'name', and this needs to
-  // be an instance of it, for integration with normal JS!
+    // TODO: needs to create a global class named 'name', and this needs to
+    // be an instance of it, for integration with normal JS!
 
-  exception_obj = JSObjectMake (ctx, 0, NULL);
-  seed_object_set_property (ctx, exception_obj, "message", js_message_ref);
-  seed_object_set_property (ctx, exception_obj, "name", js_name_ref);
+    exception_obj = JSObjectMake(ctx, 0, NULL);
+    seed_object_set_property(ctx, exception_obj, "message", js_message_ref);
+    seed_object_set_property(ctx, exception_obj, "name", js_name_ref);
 
-  *exception = exception_obj;
+    *exception = exception_obj;
 
-  JSStringRelease (js_name);
-  JSStringRelease (js_message);
+    JSStringRelease(js_name);
+    JSStringRelease(js_message);
 
-  va_end (args);
+    va_end(args);
 }
 
 /**
@@ -89,29 +89,26 @@ seed_make_exception (JSContextRef ctx,
  *
  */
 void
-seed_make_exception_from_gerror (JSContextRef ctx,
-				 JSValueRef * exception, GError * error)
+seed_make_exception_from_gerror(JSContextRef ctx,
+                                JSValueRef* exception,
+                                GError* error)
 {
-  const gchar *domain = g_quark_to_string (error->domain);
-  GString *string = g_string_new (domain);
-  guint i;
-  gsize len = string->len;
-
-  *(string->str) = g_unichar_toupper (*(string->str));
-  for (i = 0; i < len; i++)
-    {
-      if (*(string->str + i) == '-')
-	{
-	  *(string->str + i + 1) = g_unichar_toupper (*(string->str + i + 1));
-	  g_string_erase (string, i, 1);
-	}
-      else if (!g_strcmp0 (string->str + i - 1, "Quark"))
-	g_string_truncate (string, i - 1);
+    const gchar* domain = g_quark_to_string(error->domain);
+    GString* string = g_string_new(domain);
+    guint i;
+    gsize len = string->len;
 
+    *(string->str) = g_unichar_toupper(*(string->str));
+    for (i = 0; i < len; i++) {
+        if (*(string->str + i) == '-') {
+            *(string->str + i + 1) = g_unichar_toupper(*(string->str + i + 1));
+            g_string_erase(string, i, 1);
+        } else if (!g_strcmp0(string->str + i - 1, "Quark"))
+            g_string_truncate(string, i - 1);
     }
-  seed_make_exception (ctx, exception, string->str, error->message, NULL);
+    seed_make_exception(ctx, exception, string->str, error->message, NULL);
 
-  g_string_free (string, TRUE);
+    g_string_free(string, TRUE);
 }
 
 /**
@@ -126,16 +123,16 @@ seed_make_exception_from_gerror (JSContextRef ctx,
  * Return value: A #gchar* representing the name of @exception.
  *
  */
-gchar *
-seed_exception_get_name (JSContextRef ctx, JSValueRef e)
+gchar*
+seed_exception_get_name(JSContextRef ctx, JSValueRef e)
 {
-  JSValueRef name;
-  g_assert ((e));
-  if (!JSValueIsObject (ctx, e))
-    return NULL;
+    JSValueRef name;
+    g_assert((e));
+    if (!JSValueIsObject(ctx, e))
+        return NULL;
 
-  name = seed_object_get_property (ctx, (JSObjectRef) e, "name");
-  return seed_value_to_string (ctx, name, NULL);
+    name = seed_object_get_property(ctx, (JSObjectRef) e, "name");
+    return seed_value_to_string(ctx, name, NULL);
 }
 
 /**
@@ -151,16 +148,16 @@ seed_exception_get_name (JSContextRef ctx, JSValueRef e)
  * Return value: A #gchar* representing the detailed message of @exception.
  *
  */
-gchar *
-seed_exception_get_message (JSContextRef ctx, JSValueRef e)
+gchar*
+seed_exception_get_message(JSContextRef ctx, JSValueRef e)
 {
-  JSValueRef name;
-  g_assert ((e));
-  if (!JSValueIsObject (ctx, e))
-    return 0;
+    JSValueRef name;
+    g_assert((e));
+    if (!JSValueIsObject(ctx, e))
+        return 0;
 
-  name = seed_object_get_property (ctx, (JSObjectRef) e, "message");
-  return seed_value_to_string (ctx, name, NULL);
+    name = seed_object_get_property(ctx, (JSObjectRef) e, "message");
+    return seed_value_to_string(ctx, name, NULL);
 }
 
 /**
@@ -176,14 +173,14 @@ seed_exception_get_message (JSContextRef ctx, JSValueRef e)
  *
  */
 guint
-seed_exception_get_line (JSContextRef ctx, JSValueRef e)
+seed_exception_get_line(JSContextRef ctx, JSValueRef e)
 {
-  JSValueRef line;
-  g_assert ((e));
-  if (!JSValueIsObject (ctx, e))
-    return 0;
-  line = seed_object_get_property (ctx, (JSObjectRef) e, "line");
-  return seed_value_to_uint (ctx, line, NULL);
+    JSValueRef line;
+    g_assert((e));
+    if (!JSValueIsObject(ctx, e))
+        return 0;
+    line = seed_object_get_property(ctx, (JSObjectRef) e, "line");
+    return seed_value_to_uint(ctx, line, NULL);
 }
 
 /**
@@ -198,15 +195,15 @@ seed_exception_get_line (JSContextRef ctx, JSValueRef e)
  *               @exception was thrown.
  *
  */
-gchar *
-seed_exception_get_file (JSContextRef ctx, JSValueRef e)
+gchar*
+seed_exception_get_file(JSContextRef ctx, JSValueRef e)
 {
-  JSValueRef line;
-  g_assert ((e));
-  if (!JSValueIsObject (ctx, e))
-    return 0;
-  line = seed_object_get_property (ctx, (JSObjectRef) e, "sourceURL");
-  return seed_value_to_string (ctx, line, 0);
+    JSValueRef line;
+    g_assert((e));
+    if (!JSValueIsObject(ctx, e))
+        return 0;
+    line = seed_object_get_property(ctx, (JSObjectRef) e, "sourceURL");
+    return seed_value_to_string(ctx, line, 0);
 }
 /**
  * seed_exception_get_stack:
@@ -219,18 +216,17 @@ seed_exception_get_file (JSContextRef ctx, JSValueRef e)
  *               @exception was thrown.
  *
  */
-gchar *
-seed_exception_get_stack (JSContextRef ctx, JSValueRef e)
+gchar*
+seed_exception_get_stack(JSContextRef ctx, JSValueRef e)
 {
-  JSValueRef stack ;
-  g_assert ((e));
-  if (!JSValueIsObject (ctx, e))
-    return 0;
-  stack = seed_object_get_property (ctx, (JSObjectRef) e, "stack");
-  return seed_value_to_string (ctx, stack , 0);
+    JSValueRef stack;
+    g_assert((e));
+    if (!JSValueIsObject(ctx, e))
+        return 0;
+    stack = seed_object_get_property(ctx, (JSObjectRef) e, "stack");
+    return seed_value_to_string(ctx, stack, 0);
 }
 
-
 /**
  * seed_exception_to_string:
  * @ctx: A #SeedContext.
@@ -244,23 +240,25 @@ seed_exception_get_stack (JSContextRef ctx, JSValueRef e)
  * Return value: A #gchar* representing the @exception.
  *
  */
-gchar *
-seed_exception_to_string (JSContextRef ctx, JSValueRef e)
+gchar*
+seed_exception_to_string(JSContextRef ctx, JSValueRef e)
 {
-  guint line;
-  gchar *mes, *name, *file, *ret, *stack;
+    guint line;
+    gchar *mes, *name, *file, *ret, *stack;
 
-  line = seed_exception_get_line (ctx, e);
-  mes = seed_exception_get_message (ctx, e);
-  file = seed_exception_get_file (ctx, e);
-  name = seed_exception_get_name (ctx, e);
-  stack = seed_exception_get_stack (ctx, e);
+    line = seed_exception_get_line(ctx, e);
+    mes = seed_exception_get_message(ctx, e);
+    file = seed_exception_get_file(ctx, e);
+    name = seed_exception_get_name(ctx, e);
+    stack = seed_exception_get_stack(ctx, e);
 
-  ret = g_strdup_printf ("Line %d in %s: %s %s\n\nStack:\n%s", line, file, name, mes, stack);
+    ret = g_strdup_printf("Line %d in %s: %s %s\n\nStack:\n%s", line, file,
+                          name, mes, stack);
 
-  g_free (mes);
-  g_free (file);
-  g_free (name);
+    g_free(mes);
+    g_free(file);
+    g_free(name);
+    g_free(stack);
 
-  return ret;
+    return ret;
 }
diff --git a/libseed/seed-exceptions.h b/libseed/seed-exceptions.h
index cc1a261..db4b35c 100644
--- a/libseed/seed-exceptions.h
+++ b/libseed/seed-exceptions.h
@@ -22,20 +22,21 @@
 
 #include "seed-private.h"
 
-void
-seed_make_exception (JSContextRef ctx, JSValueRef * exception,
-		     const gchar * name, const gchar * message, ...)
-G_GNUC_PRINTF (4, 5);
+void seed_make_exception(JSContextRef ctx,
+                         JSValueRef* exception,
+                         const gchar* name,
+                         const gchar* message,
+                         ...) G_GNUC_PRINTF(4, 5);
 
-     void seed_make_exception_from_gerror (JSContextRef ctx,
-					   JSValueRef * exception,
-					   GError * e);
+void seed_make_exception_from_gerror(JSContextRef ctx,
+                                     JSValueRef* exception,
+                                     GError* e);
 
-     gchar *seed_exception_get_name (JSContextRef ctx, JSValueRef e);
-     gchar *seed_exception_get_message (JSContextRef ctx, JSValueRef e);
-     guint seed_exception_get_line (JSContextRef ctx, JSValueRef e);
-     gchar *seed_exception_get_file (JSContextRef ctx, JSValueRef e);
-     gchar *seed_exception_get_stack (JSContextRef ctx, JSValueRef e);
-     gchar *seed_exception_to_string (JSContextRef ctx, JSValueRef e);
+gchar* seed_exception_get_name(JSContextRef ctx, JSValueRef e);
+gchar* seed_exception_get_message(JSContextRef ctx, JSValueRef e);
+guint seed_exception_get_line(JSContextRef ctx, JSValueRef e);
+gchar* seed_exception_get_file(JSContextRef ctx, JSValueRef e);
+gchar* seed_exception_get_stack(JSContextRef ctx, JSValueRef e);
+gchar* seed_exception_to_string(JSContextRef ctx, JSValueRef e);
 
 #endif
diff --git a/libseed/seed-gtype.c b/libseed/seed-gtype.c
index 1121326..55f9e62 100644
--- a/libseed/seed-gtype.c
+++ b/libseed/seed-gtype.c
@@ -20,12 +20,13 @@
 #include "seed-private.h"
 #include <sys/mman.h>
 
-typedef GObject *(*GObjectConstructCallback) (GType, guint,
-					      GObjectConstructParam *);
+typedef GObject* (*GObjectConstructCallback)(GType,
+                                             guint,
+                                             GObjectConstructParam*);
 
 JSClassRef seed_gtype_class;
-GIBaseInfo *objectclass_info = NULL;
-GIBaseInfo *paramspec_info = NULL;
+GIBaseInfo* objectclass_info = NULL;
+GIBaseInfo* paramspec_info = NULL;
 
 JSObjectRef seed_gtype_constructor;
 
@@ -35,1033 +36,926 @@ GQuark qsetter;
 GQuark qiinit;
 GQuark qcinit;
 
-typedef struct _SeedGClassPrivates {
-  JSObjectRef constructor;
-  JSObjectRef func;
+typedef struct _SeedGClassPrivates
+{
+    JSObjectRef constructor;
+    JSObjectRef func;
 
-  JSObjectRef definition;
+    JSObjectRef definition;
 } SeedGClassPrivates;
 
 static JSValueRef
-seed_property_method_invoked (JSContextRef ctx,
-			      JSObjectRef function,
-			      JSObjectRef thisObject,
-			      gsize argumentCount,
-			      const JSValueRef arguments[],
-			      JSValueRef * exception)
+seed_property_method_invoked(JSContextRef ctx,
+                             JSObjectRef function,
+                             JSObjectRef thisObject,
+                             gsize argumentCount,
+                             const JSValueRef arguments[],
+                             JSValueRef* exception)
 {
-  GParamSpec *spec;
-  GObjectClass *class;
-  guint property_count;
-  JSValueRef newcount, oldcount;
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Property installation expected 1 argument"
-			   " got %zd \n", argumentCount);
-
-      return JSValueMakeNull (ctx);
+    GParamSpec* spec;
+    GObjectClass* class;
+    guint property_count;
+    JSValueRef newcount, oldcount;
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Property installation expected 1 argument"
+                            " got %zd \n",
+                            argumentCount);
+
+        return JSValueMakeNull(ctx);
     }
 
-  if (JSValueIsNull (ctx, arguments[0]) ||
-      // Might need to check if JSValueIsObject? Who knows with WebKit.
-      !JSValueIsObjectOfClass (ctx, arguments[0], seed_struct_class))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Property installation expected a "
-			   "GParamSpec as argument");
-      return JSValueMakeNull (ctx);
+    if (JSValueIsNull(ctx, arguments[0]) ||
+        // Might need to check if JSValueIsObject? Who knows with WebKit.
+        !JSValueIsObjectOfClass(ctx, arguments[0], seed_struct_class)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Property installation expected a "
+                            "GParamSpec as argument");
+        return JSValueMakeNull(ctx);
     }
 
-  spec = (GParamSpec *) seed_pointer_get_pointer (ctx, arguments[0]);
+    spec = (GParamSpec*) seed_pointer_get_pointer(ctx, arguments[0]);
 
-  oldcount = seed_object_get_property (ctx, thisObject, "property_count");
-  property_count = seed_value_to_int (ctx, oldcount, exception);
+    oldcount = seed_object_get_property(ctx, thisObject, "property_count");
+    property_count = seed_value_to_int(ctx, oldcount, exception);
 
-  class = seed_pointer_get_pointer (ctx, thisObject);
-  g_object_class_install_property (class, property_count, spec);
+    class = seed_pointer_get_pointer(ctx, thisObject);
+    g_object_class_install_property(class, property_count, spec);
 
-  newcount = seed_value_from_int (ctx, property_count + 1, exception);
-  seed_object_set_property (ctx, thisObject, "property_count", newcount);
+    newcount = seed_value_from_int(ctx, property_count + 1, exception);
+    seed_object_set_property(ctx, thisObject, "property_count", newcount);
 
-  return oldcount;
+    return oldcount;
 }
 
 static JSValueRef
-seed_gsignal_method_invoked (JSContextRef ctx,
-			     JSObjectRef function,
-			     JSObjectRef thisObject,
-			     gsize argumentCount,
-			     const JSValueRef arguments[],
-			     JSValueRef * exception)
+seed_gsignal_method_invoked(JSContextRef ctx,
+                            JSObjectRef function,
+                            JSObjectRef thisObject,
+                            gsize argumentCount,
+                            const JSValueRef arguments[],
+                            JSValueRef* exception)
 {
-  // TODO: class_closure, and accumlator. Not useful until we have structs.
-  JSValueRef jsname, jstype, jsflags, jsreturn_type, jsparams;
-  GType itype, return_type;
-  guint n_params = 0;
-  GType *param_types = 0;
-  gchar *name;
-  guint signal_id;
-  GSignalFlags flags;
-
-  /* Sanity check */
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal constructor expected 1 argument"
-			   " got %zd \n", argumentCount);
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    // TODO: class_closure, and accumlator. Not useful until we have structs.
+    JSValueRef jsname, jstype, jsflags, jsreturn_type, jsparams;
+    GType itype, return_type;
+    guint n_params = 0;
+    GType* param_types = 0;
+    gchar* name;
+    guint signal_id;
+    GSignalFlags flags;
+
+    /* Sanity check */
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal constructor expected 1 argument"
+                            " got %zd \n",
+                            argumentCount);
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
-  if (JSValueIsNull (ctx, arguments[0])
-      || !JSValueIsObject (ctx, arguments[0]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal constructor expected object"
-			   " as first argument");
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    if (JSValueIsNull(ctx, arguments[0])
+        || !JSValueIsObject(ctx, arguments[0])) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal constructor expected object"
+                            " as first argument");
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
 
-  /* Signal name */
-  jsname = seed_object_get_property (ctx, (JSObjectRef) arguments[0], "name");
-  /* seed_value_to_string can handle non strings, however the kind
-   * of strings we want as a signal name are rather small, so make sure
-   * we have an actual string */
-  if (JSValueIsNull (ctx, jsname) || !JSValueIsString (ctx, jsname))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal definition needs name property");
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    /* Signal name */
+    jsname = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "name");
+    /* seed_value_to_string can handle non strings, however the kind
+     * of strings we want as a signal name are rather small, so make sure
+     * we have an actual string */
+    if (JSValueIsNull(ctx, jsname) || !JSValueIsString(ctx, jsname)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal definition needs name property");
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
-  name = seed_value_to_string (ctx, jsname, exception);
-
-  /* Type to install on. Comes from class. */
-  jstype = seed_object_get_property (ctx, thisObject, "type");
-  itype = seed_value_to_int (ctx, jstype, exception);
-
-  SEED_NOTE (GTYPE, "Installing signal with name: %s on type: %s",
-	     name, g_type_name (itype));
-
-  /* Signal flags */
-  jsflags = seed_object_get_property (ctx,
-				      (JSObjectRef) arguments[0], "flags");
-  if (JSValueIsNull (ctx, jsflags) || !JSValueIsNumber (ctx, jsflags))
-    flags = G_SIGNAL_RUN_LAST;
-  else
-    flags = seed_value_to_long (ctx, jsflags, exception);
-
-  /* Return type */
-  jsreturn_type = seed_object_get_property (ctx, (JSObjectRef) arguments[0],
-					    "return_type");
-  if (JSValueIsNull (ctx, jsreturn_type) ||
-      !JSValueIsNumber (ctx, jsreturn_type))
-    return_type = G_TYPE_NONE;
-  else
-    return_type = seed_value_to_int (ctx, jsreturn_type, exception);
-
-  /* Number of params and types */
-  jsparams = seed_object_get_property (ctx, (JSObjectRef) arguments[0],
-				       "parameters");
-  if (!JSValueIsNull (ctx, jsparams) && JSValueIsObject (ctx, jsparams))
-    {
-      n_params = seed_value_to_int
-	(ctx,
-	 seed_object_get_property (ctx, (JSObjectRef) jsparams, "length"),
-	 exception);
-      if (n_params > 0)
-	{
-	  guint i;
-	  JSValueRef ptype;
-
-	  param_types = g_new0 (GType, n_params);
-	  for (i = 0; i < n_params; i++)
-	    {
-	      ptype = JSObjectGetPropertyAtIndex (ctx,
-						  (JSObjectRef)
-						  jsparams, i, exception);
-
-	      param_types[i] = seed_value_to_int (ctx, ptype, exception);
-	    }
-	}
+    name = seed_value_to_string(ctx, jsname, exception);
+
+    /* Type to install on. Comes from class. */
+    jstype = seed_object_get_property(ctx, thisObject, "type");
+    itype = seed_value_to_int(ctx, jstype, exception);
+
+    SEED_NOTE(GTYPE, "Installing signal with name: %s on type: %s", name,
+              g_type_name(itype));
+
+    /* Signal flags */
+    jsflags
+      = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "flags");
+    if (JSValueIsNull(ctx, jsflags) || !JSValueIsNumber(ctx, jsflags))
+        flags = G_SIGNAL_RUN_LAST;
+    else
+        flags = seed_value_to_long(ctx, jsflags, exception);
+
+    /* Return type */
+    jsreturn_type = seed_object_get_property(ctx, (JSObjectRef) arguments[0],
+                                             "return_type");
+    if (JSValueIsNull(ctx, jsreturn_type)
+        || !JSValueIsNumber(ctx, jsreturn_type))
+        return_type = G_TYPE_NONE;
+    else
+        return_type = seed_value_to_int(ctx, jsreturn_type, exception);
+
+    /* Number of params and types */
+    jsparams
+      = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "parameters");
+    if (!JSValueIsNull(ctx, jsparams) && JSValueIsObject(ctx, jsparams)) {
+        n_params = seed_value_to_int(
+          ctx, seed_object_get_property(ctx, (JSObjectRef) jsparams, "length"),
+          exception);
+        if (n_params > 0) {
+            guint i;
+            JSValueRef ptype;
+
+            param_types = g_new0(GType, n_params);
+            for (i = 0; i < n_params; i++) {
+                ptype = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) jsparams,
+                                                   i, exception);
+
+                param_types[i] = seed_value_to_int(ctx, ptype, exception);
+            }
+        }
     }
 
-  signal_id = g_signal_newv (name, itype,
-			     flags, 0, 0, 0,
-			     gi_cclosure_marshal_generic,
-			     return_type, n_params, param_types);
+    signal_id
+      = g_signal_newv(name, itype, flags, 0, 0, 0, gi_cclosure_marshal_generic,
+                      return_type, n_params, param_types);
 
-  g_free (name);
-  g_free (param_types);
+    g_free(name);
+    g_free(param_types);
 
-  return (JSValueRef) seed_value_from_uint (ctx, signal_id, exception);
+    return (JSValueRef) seed_value_from_uint(ctx, signal_id, exception);
 }
 
 static void
-seed_gtype_builtin_set_property (GObject * object,
-				 guint property_id,
-				 const GValue * value, GParamSpec * spec)
+seed_gtype_builtin_set_property(GObject* object,
+                                guint property_id,
+                                const GValue* value,
+                                GParamSpec* spec)
 {
-  JSContextRef ctx = JSGlobalContextCreateInGroup (context_group, 0);
-  gchar *name = g_strjoin (NULL, "_", spec->name, NULL);
-  JSObjectRef jsobj = (JSObjectRef) seed_value_from_object (ctx, object, 0);
+    JSContextRef ctx = JSGlobalContextCreateInGroup(context_group, 0);
+    gchar* name = g_strjoin(NULL, "_", spec->name, NULL);
+    JSObjectRef jsobj = (JSObjectRef) seed_value_from_object(ctx, object, 0);
 
-  seed_prepare_global_context (ctx);
+    seed_prepare_global_context(ctx);
 
-  seed_object_set_property (ctx,
-			    jsobj,
-			    name,
-			    seed_value_from_gvalue (ctx, (GValue *) value,
-						    0));
+    seed_object_set_property(ctx, jsobj, name,
+                             seed_value_from_gvalue(ctx, (GValue*) value, 0));
 
-  g_free (name);
-  JSGlobalContextRelease ((JSGlobalContextRef) ctx);
+    g_free(name);
+    JSGlobalContextRelease((JSGlobalContextRef) ctx);
 }
 
 static void
-seed_gtype_builtin_get_property (GObject * object,
-				 guint property_id,
-				 GValue * value, GParamSpec * spec)
+seed_gtype_builtin_get_property(GObject* object,
+                                guint property_id,
+                                GValue* value,
+                                GParamSpec* spec)
 {
-  // TODO: Exceptions
-  JSContextRef ctx = JSGlobalContextCreateInGroup (context_group, 0);
-  gchar *name = g_strjoin (NULL, "_", spec->name, NULL);
-  JSObjectRef jsobj = (JSObjectRef) seed_value_from_object (ctx, object, 0);
-  JSValueRef jsval = seed_object_get_property (ctx, jsobj,
-					       name);
+    // TODO: Exceptions
+    JSContextRef ctx = JSGlobalContextCreateInGroup(context_group, 0);
+    gchar* name = g_strjoin(NULL, "_", spec->name, NULL);
+    JSObjectRef jsobj = (JSObjectRef) seed_value_from_object(ctx, object, 0);
+    JSValueRef jsval = seed_object_get_property(ctx, jsobj, name);
 
-  seed_prepare_global_context (ctx);
+    seed_prepare_global_context(ctx);
 
-  seed_value_to_gvalue (ctx, jsval, spec->value_type, value, 0);
+    seed_value_to_gvalue(ctx, jsval, spec->value_type, value, 0);
 
-  g_free (name);
-  JSGlobalContextRelease ((JSGlobalContextRef) ctx);
+    g_free(name);
+    JSGlobalContextRelease((JSGlobalContextRef) ctx);
 }
 
 static void
-seed_gtype_set_property (GObject * object,
-			 guint property_id,
-			 const GValue * value, GParamSpec * spec)
+seed_gtype_set_property(GObject* object,
+                        guint property_id,
+                        const GValue* value,
+                        GParamSpec* spec)
 {
-  gpointer data = g_param_spec_get_qdata (spec, qsetter);
+    gpointer data = g_param_spec_get_qdata(spec, qsetter);
 
-  if (!data)
-    {
-      seed_gtype_builtin_set_property (object, property_id, value, spec);
-      return;
+    if (!data) {
+        seed_gtype_builtin_set_property(object, property_id, value, spec);
+        return;
     }
 }
 
 static void
-seed_gtype_get_property (GObject * object,
-			 guint property_id, GValue * value, GParamSpec * spec)
+seed_gtype_get_property(GObject* object,
+                        guint property_id,
+                        GValue* value,
+                        GParamSpec* spec)
 {
-  gpointer data = g_param_spec_get_qdata (spec, qgetter);
+    gpointer data = g_param_spec_get_qdata(spec, qgetter);
 
-  if (!data)
-    {
-      seed_gtype_builtin_get_property (object, property_id, value, spec);
-      return;
+    if (!data) {
+        seed_gtype_builtin_get_property(object, property_id, value, spec);
+        return;
     }
 }
 
-static GIBaseInfo *
-seed_get_class_info_for_type (GType type)
+static GIBaseInfo*
+seed_get_class_info_for_type(GType type)
 {
-  GIBaseInfo *object_info;
-  
-  // Note to self: Investigate the entire premise of this function.
-  while ((type = g_type_parent (type)))
-    {
-      GIBaseInfo *ret;
-
-      object_info = g_irepository_find_by_gtype (NULL, type);
-      if (object_info)
-	{
-	  ret = g_object_info_get_class_struct ((GIObjectInfo *)object_info);
-	  g_base_info_unref (object_info);
-	  
-	  return ret;
-	}
+    GIBaseInfo* object_info;
+
+    // Note to self: Investigate the entire premise of this function.
+    while ((type = g_type_parent(type))) {
+        GIBaseInfo* ret;
+
+        object_info = g_irepository_find_by_gtype(NULL, type);
+        if (object_info) {
+            ret = g_object_info_get_class_struct((GIObjectInfo*) object_info);
+            g_base_info_unref(object_info);
+
+            return ret;
+        }
     }
-  
-  return NULL;
+
+    return NULL;
 }
 
 static void
-seed_attach_methods_to_class_object (JSContextRef ctx,
-				     JSObjectRef object,
-				     JSValueRef * exception)
+seed_attach_methods_to_class_object(JSContextRef ctx,
+                                    JSObjectRef object,
+                                    JSValueRef* exception)
 {
-  seed_create_function (ctx, "c_install_property",
-			&seed_property_method_invoked, object);
-  seed_create_function (ctx, "install_signal",
-			&seed_gsignal_method_invoked, object);
+    seed_create_function(ctx, "c_install_property",
+                         &seed_property_method_invoked, object);
+    seed_create_function(ctx, "install_signal", &seed_gsignal_method_invoked,
+                         object);
 }
 
 static void
-seed_gtype_call_construct (GType type, GObject * object)
+seed_gtype_call_construct(GType type, GObject* object)
 {
-  JSContextRef ctx;
-  JSObjectRef func, this_object;
-  JSValueRef exception = NULL, args[1];
-  gchar *mes;
-
-  func = g_type_get_qdata (type, qiinit);
-
-  if (func)
-    {
-      ctx = JSGlobalContextCreateInGroup (context_group, 0);
-      seed_prepare_global_context (ctx);
-
-      SEED_NOTE (GTYPE, "Handling constructor for: %p with type: %s",
-		 object, g_type_name (type));
-      this_object = (JSObjectRef) seed_value_from_object (ctx, object, NULL);
-      args[0] = this_object;
-
-      JSObjectCallAsFunction (ctx, func, this_object, 1, args, &exception);
-      if (exception)
-	{
-	  mes = seed_exception_to_string (ctx, exception);
-	  g_warning ("Exception in instance construction. %s \n", mes);
-	  g_free (mes);
-	}
-      JSGlobalContextRelease ((JSGlobalContextRef) ctx);
+    JSContextRef ctx;
+    JSObjectRef func, this_object;
+    JSValueRef exception = NULL, args[1];
+    gchar* mes;
+
+    func = g_type_get_qdata(type, qiinit);
+
+    if (func) {
+        ctx = JSGlobalContextCreateInGroup(context_group, 0);
+        seed_prepare_global_context(ctx);
+
+        SEED_NOTE(GTYPE, "Handling constructor for: %p with type: %s", object,
+                  g_type_name(type));
+        this_object = (JSObjectRef) seed_value_from_object(ctx, object, NULL);
+        args[0] = this_object;
+
+        JSObjectCallAsFunction(ctx, func, this_object, 1, args, &exception);
+        if (exception) {
+            mes = seed_exception_to_string(ctx, exception);
+            g_warning("Exception in instance construction. %s \n", mes);
+            g_free(mes);
+        }
+        JSGlobalContextRelease((JSGlobalContextRef) ctx);
     }
-
-
 }
 
-static GObject *
-seed_gtype_construct (GType type,
-		      guint n_construct_params,
-		      GObjectConstructParam * construct_params)
+static GObject*
+seed_gtype_construct(GType type,
+                     guint n_construct_params,
+                     GObjectConstructParam* construct_params)
 {
-  GObject *object;
-  GType parent;
-  GObjectClass *parent_class;
+    GObject* object;
+    GType parent;
+    GObjectClass* parent_class;
 
-  parent = g_type_parent (type);
-  parent_class = g_type_class_ref (parent);
+    parent = g_type_parent(type);
+    parent_class = g_type_class_ref(parent);
 
-  if (parent_class->constructor == seed_gtype_construct)
-    {
-      GType t = parent;
-      parent = g_type_parent (parent);
+    if (parent_class->constructor == seed_gtype_construct) {
+        GType t = parent;
+        parent = g_type_parent(parent);
 
-      g_type_class_unref (parent_class);
-      parent_class = g_type_class_ref (parent);
+        g_type_class_unref(parent_class);
+        parent_class = g_type_class_ref(parent);
 
-      object =
-	parent_class->constructor (type, n_construct_params,
-				   construct_params);
-      
-      seed_gtype_call_construct (t, object);
+        object = parent_class->constructor(type, n_construct_params,
+                                           construct_params);
 
-      g_type_class_unref (parent_class);
-    }
-  else
-    object =
-      parent_class->constructor (type, n_construct_params, construct_params);
+        seed_gtype_call_construct(t, object);
+
+        g_type_class_unref(parent_class);
+    } else
+        object = parent_class->constructor(type, n_construct_params,
+                                           construct_params);
 
-  seed_gtype_call_construct (type, object);
+    seed_gtype_call_construct(type, object);
 
-  g_type_class_unref (parent_class);
+    g_type_class_unref(parent_class);
 
-  return object;
+    return object;
 }
 
 static void
-seed_gtype_install_signals (JSContextRef ctx,
-			    JSObjectRef definition, GType type,
-			    JSValueRef * exception)
+seed_gtype_install_signals(JSContextRef ctx,
+                           JSObjectRef definition,
+                           GType type,
+                           JSValueRef* exception)
 {
-  JSObjectRef signals, signal_def;
-  JSValueRef jslength;
-  guint i, j, length;
-  GType return_type;
-  GType *param_types = NULL;
-  guint n_params = 0;
-  GSignalFlags flags;
-  JSValueRef jsname, jsflags, jsreturn_type, jsparams;
-  gchar *name;
-
-  signals =
-    (JSObjectRef) seed_object_get_property (ctx, definition, "signals");
-  if (JSValueIsNull (ctx, signals) || !JSValueIsObject (ctx, signals))
-    return;
-
-  jslength = seed_object_get_property (ctx, signals, "length");
-  if (JSValueIsNull (ctx, jslength))
-    return;
-
-  length = seed_value_to_uint (ctx, jslength, exception);
-  for (i = 0; i < length; i++)
-    {
-      signal_def = (JSObjectRef) JSObjectGetPropertyAtIndex (ctx,
-							     (JSObjectRef)
-							     signals, i,
-							     exception);
-
-      if (JSValueIsNull (ctx, signal_def)
-	  || !JSValueIsObject (ctx, signal_def))
-	continue;
-
-      // TODO: Error checking
-      jsname = seed_object_get_property (ctx, signal_def, "name");
-      name = seed_value_to_string (ctx, jsname, exception);
-
-      SEED_NOTE (GTYPE, "Installing signal with name: %s on type: %s",
-		 name, g_type_name (type));
-
-      jsflags =
-	seed_object_get_property (ctx, (JSObjectRef) signal_def, "flags");
-      if (JSValueIsNull (ctx, jsflags) || !JSValueIsNumber (ctx, jsflags))
-	flags = G_SIGNAL_RUN_LAST;
-      else
-	flags = seed_value_to_long (ctx, jsflags, exception);
-
-      jsreturn_type =
-	seed_object_get_property (ctx, signal_def, "return_type");
-      if (JSValueIsNull (ctx, jsreturn_type)
-	  || !JSValueIsNumber (ctx, jsreturn_type))
-	return_type = G_TYPE_NONE;
-      else
-	return_type = seed_value_to_long (ctx, jsreturn_type, exception);
-
-      jsparams = seed_object_get_property (ctx, signal_def, "parameters");
-      
-      // reset params..
-      param_types = NULL;
-      n_params = 0;
-      
-      if (!JSValueIsNull (ctx, jsparams) && JSValueIsObject (ctx, jsparams))
-	{
-	  n_params =
-	    seed_value_to_int (ctx,
-			       seed_object_get_property (ctx,
-							 (JSObjectRef)
-							 jsparams, "length"),
-			       exception);
-	  if (n_params > 0)
-	    {
-	      param_types = g_alloca (sizeof (GType) * n_params);
-	      for (j = 0; j < n_params; j++)
-		{
-		  JSValueRef ptype = JSObjectGetPropertyAtIndex (ctx,
-								 (JSObjectRef)
-								 jsparams,
-								 j,
-								 exception);
-		  param_types[j] =
-		    (GType) seed_value_to_long (ctx, ptype, exception);
-		}
-	    }
-	}
-
-      g_signal_newv (name, type,
-		     flags, 0, 0, 0,
-		     gi_cclosure_marshal_generic,
-		     return_type, n_params, param_types);
-      g_free (name);
-
+    JSObjectRef signals, signal_def;
+    JSValueRef jslength;
+    guint i, j, length;
+    GType return_type;
+    GType* param_types = NULL;
+    guint n_params = 0;
+    GSignalFlags flags;
+    JSValueRef jsname, jsflags, jsreturn_type, jsparams;
+    gchar* name;
+
+    signals
+      = (JSObjectRef) seed_object_get_property(ctx, definition, "signals");
+    if (JSValueIsNull(ctx, signals) || !JSValueIsObject(ctx, signals))
+        return;
+
+    jslength = seed_object_get_property(ctx, signals, "length");
+    if (JSValueIsNull(ctx, jslength))
+        return;
+
+    length = seed_value_to_uint(ctx, jslength, exception);
+    for (i = 0; i < length; i++) {
+        signal_def
+          = (JSObjectRef) JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) signals,
+                                                     i, exception);
+
+        if (JSValueIsNull(ctx, signal_def) || !JSValueIsObject(ctx, signal_def))
+            continue;
+
+        // TODO: Error checking
+        jsname = seed_object_get_property(ctx, signal_def, "name");
+        name = seed_value_to_string(ctx, jsname, exception);
+
+        SEED_NOTE(GTYPE, "Installing signal with name: %s on type: %s", name,
+                  g_type_name(type));
+
+        jsflags
+          = seed_object_get_property(ctx, (JSObjectRef) signal_def, "flags");
+        if (JSValueIsNull(ctx, jsflags) || !JSValueIsNumber(ctx, jsflags))
+            flags = G_SIGNAL_RUN_LAST;
+        else
+            flags = seed_value_to_long(ctx, jsflags, exception);
+
+        jsreturn_type
+          = seed_object_get_property(ctx, signal_def, "return_type");
+        if (JSValueIsNull(ctx, jsreturn_type)
+            || !JSValueIsNumber(ctx, jsreturn_type))
+            return_type = G_TYPE_NONE;
+        else
+            return_type = seed_value_to_long(ctx, jsreturn_type, exception);
+
+        jsparams = seed_object_get_property(ctx, signal_def, "parameters");
+
+        // reset params..
+        param_types = NULL;
+        n_params = 0;
+
+        if (!JSValueIsNull(ctx, jsparams) && JSValueIsObject(ctx, jsparams)) {
+            n_params = seed_value_to_int(
+              ctx,
+              seed_object_get_property(ctx, (JSObjectRef) jsparams, "length"),
+              exception);
+            if (n_params > 0) {
+                param_types = g_alloca(sizeof(GType) * n_params);
+                for (j = 0; j < n_params; j++) {
+                    JSValueRef ptype
+                      = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) jsparams,
+                                                   j, exception);
+                    param_types[j]
+                      = (GType) seed_value_to_long(ctx, ptype, exception);
+                }
+            }
+        }
+
+        g_signal_newv(name, type, flags, 0, 0, 0, gi_cclosure_marshal_generic,
+                      return_type, n_params, param_types);
+        g_free(name);
     }
 }
 
 static unsigned int
-seed_gtype_install_properties (JSContextRef ctx,
-			       JSObjectRef definition,
-			       GType type, GObjectClass *g_class,
-			       JSValueRef * exception)
+seed_gtype_install_properties(JSContextRef ctx,
+                              JSObjectRef definition,
+                              GType type,
+                              GObjectClass* g_class,
+                              JSValueRef* exception)
 {
-  JSObjectRef properties, property_def;
-  JSValueRef jslength;
-  guint i, length;
-  GType property_type, object_type;
-  GParamFlags flags;
-  JSValueRef jsname, jsflags, jsproperty_type, jsdefault_value, jsobject_type;
-  JSValueRef jsnick, jsblurb, jsmin_value, jsmax_value;
-  gchar *name , *nick, *blurb;
-  GParamSpec *pspec;
-  guint property_count = 0;
-
-  properties = (JSObjectRef) seed_object_get_property (ctx, definition,
-						       "properties");
-  if (JSValueIsNull (ctx, properties) || !JSValueIsObject (ctx, properties))
-    return 0;
-
-  jslength = seed_object_get_property (ctx, properties, "length");
-  if (JSValueIsNull (ctx, jslength))
-    return 0;
-
-  length = seed_value_to_uint (ctx, jslength, exception);
-  for (i = 0; i < length; i++)
-    {
-      property_def = (JSObjectRef) JSObjectGetPropertyAtIndex (ctx,
-							       (JSObjectRef)
-							       properties, i,
-							       NULL);
-
-      if (JSValueIsNull (ctx, property_def)
-	  || !JSValueIsObject (ctx, property_def))
-	continue;
-
-      jsname = seed_object_get_property (ctx, property_def, "name");
-      if (!JSValueIsString(ctx, jsname))
-	{
-	  seed_make_exception (ctx, exception, "PropertyInstallationError",
-			       "Property requires name attribute");
-	  return property_count;
-	}
-      name = seed_value_to_string (ctx, jsname, exception);
-
-      // Check for "nick" property; set to name if nonexistent
-      jsnick = seed_object_get_property (ctx, property_def, "nick");
-      if (!JSValueIsString(ctx, jsnick))
-	nick = name;
-      else
-	nick = seed_value_to_string (ctx, jsnick, exception);
-
-      // Check for "blurb" property; set to name if nonexistent
-      jsblurb = seed_object_get_property (ctx, property_def, "blurb");
-      if (!JSValueIsString(ctx, jsblurb))
-	blurb = name;
-      else
-	blurb = seed_value_to_string (ctx, jsblurb, exception);
-
-      SEED_NOTE (GTYPE, "Installing property with name: %s on type: %s",
-		 name, g_type_name (type));
-
-      // Flags default to read/write, non-construct
-      jsflags =
-	seed_object_get_property (ctx, (JSObjectRef) property_def, "flags");
-      if (JSValueIsNull (ctx, jsflags) || !JSValueIsNumber (ctx, jsflags))
-	flags = G_PARAM_READABLE | G_PARAM_WRITABLE;
-      else
-	flags = seed_value_to_long (ctx, jsflags, exception);
-
-      jsproperty_type = seed_object_get_property (ctx, property_def, "type");
-
-      if (JSValueIsNull (ctx, jsproperty_type) ||
-	  !JSValueIsNumber (ctx, jsproperty_type))
-	property_type = G_TYPE_NONE;
-      else
-	property_type = seed_value_to_long (ctx, jsproperty_type, exception);
-
-      jsdefault_value = seed_object_get_property (ctx, property_def,
-						  "default_value");
-
-      if (JSValueIsNull (ctx, jsdefault_value) ||
-	  JSValueIsUndefined (ctx, jsdefault_value))
-	{
-	  if(property_type == G_TYPE_OBJECT)
-	    continue;
-
-	  seed_make_exception (ctx, exception, "PropertyInstallationError",
-			       "Property of type %s requires default_value attribute",
-			       g_type_name(property_type));
-	  return property_count;
-	}
-
-      jsmin_value = seed_object_get_property (ctx, property_def,
-					      "minimum_value");
-      jsmax_value = seed_object_get_property (ctx, property_def,
-					      "maximum_value");
-
-      // Make sure min/max properties are defined, based on type
-      if(property_type == G_TYPE_CHAR ||
-	 property_type == G_TYPE_UCHAR ||
-	 property_type == G_TYPE_INT ||
-	 property_type == G_TYPE_UINT ||
-	 property_type == G_TYPE_INT64 ||
-	 property_type == G_TYPE_UINT64 ||
-	 property_type == G_TYPE_FLOAT ||
-	 property_type == G_TYPE_DOUBLE)
-	{
-	  if (JSValueIsNull (ctx, jsmin_value) ||
-	      !JSValueIsNumber (ctx, jsmin_value))
-	    {
-	      seed_make_exception (ctx, exception, "PropertyInstallationError",
-				   "Property of type %s requires minimum_value attribute",
-				   g_type_name(property_type));
-	      return property_count;
-	    }
-	  if (JSValueIsNull (ctx, jsmax_value) ||
-	      !JSValueIsNumber (ctx, jsmax_value))
-	    {
-	      seed_make_exception (ctx, exception, "PropertyInstallationError",
-				   "Property of type %s requires maximum_value attribute",
-				   g_type_name(property_type));
-	      return property_count;
-	    }
-	}
-
-
-      switch(property_type)
-	{
-	case G_TYPE_BOOLEAN:
-	  pspec = g_param_spec_boolean(name, nick, blurb,
-				       seed_value_to_boolean(ctx,
-							     jsdefault_value,
-							     exception), flags);
-	  break;
-	case G_TYPE_CHAR:
-	  pspec = g_param_spec_char(name, nick, blurb,
-				    seed_value_to_char(ctx,
-						       jsmin_value,
-						       exception),
-				    seed_value_to_char(ctx,
-						       jsmax_value,
-						       exception),
-				    seed_value_to_char(ctx,
-						       jsdefault_value,
-						       exception), flags);
-	  break;
-	case G_TYPE_UCHAR:
-	  pspec = g_param_spec_uchar(name, nick, blurb,
-				     seed_value_to_uchar(ctx,
-							 jsmin_value,
-							 exception),
-				     seed_value_to_uchar(ctx,
-							 jsmax_value,
-							 exception),
-				     seed_value_to_uchar(ctx,
-							 jsdefault_value,
-							 exception), flags);
-	  break;
-	case G_TYPE_INT:
-	  pspec = g_param_spec_int(name, nick, blurb,
-				   seed_value_to_int(ctx,
-						     jsmin_value,
-						     exception),
-				   seed_value_to_int(ctx,
-						     jsmax_value,
-						     exception),
-				   seed_value_to_int(ctx,
-						     jsdefault_value,
-						     exception), flags);
-	  break;
-	case G_TYPE_UINT:
-	  pspec = g_param_spec_uint(name, nick, blurb,
-				    seed_value_to_uint(ctx,
-						       jsmin_value,
-						       exception),
-				    seed_value_to_uint(ctx,
-						       jsmax_value,
-						       exception),
-				    seed_value_to_uint(ctx,
-						       jsdefault_value,
-						       exception), flags);
-	  break;
-	case G_TYPE_LONG:
-	  pspec = g_param_spec_long(name, nick, blurb,
-				    seed_value_to_long(ctx,
-						       jsmin_value,
-						       exception),
-				    seed_value_to_long(ctx,
-						       jsmax_value,
-						       exception),
-				    seed_value_to_long(ctx,
-						       jsdefault_value,
-						       exception), flags);
-	  break;
-	case G_TYPE_ULONG:
-	  pspec = g_param_spec_ulong(name, nick, blurb,
-				     seed_value_to_ulong(ctx,
-							 jsmin_value,
-							 exception),
-				     seed_value_to_ulong(ctx,
-							 jsmax_value,
-							 exception),
-				     seed_value_to_ulong(ctx,
-							 jsdefault_value,
-							 exception), flags);
-	  break;
-	case G_TYPE_INT64:
-	  pspec = g_param_spec_int64(name, nick, blurb,
-				     seed_value_to_int64(ctx,
-							 jsmin_value,
-							 exception),
-				     seed_value_to_int64(ctx,
-							 jsmax_value,
-							 exception),
-				     seed_value_to_int64(ctx,
-							 jsdefault_value,
-							 exception), flags);
-	  break;
-	case G_TYPE_UINT64:
-	  pspec = g_param_spec_uint64(name, nick, blurb,
-				      seed_value_to_uint64(ctx,
-							   jsmin_value,
-							   exception),
-				      seed_value_to_uint64(ctx,
-							   jsmax_value,
-							   exception),
-				      seed_value_to_uint64(ctx,
-							   jsdefault_value,
-							   exception), flags);
-	  break;
-	case G_TYPE_FLOAT:
-	  pspec = g_param_spec_float(name, nick, blurb,
-				     seed_value_to_float(ctx,
-							 jsmin_value,
-							 exception),
-				     seed_value_to_float(ctx,
-							 jsmax_value,
-							 exception),
-				     seed_value_to_float(ctx,
-							 jsdefault_value,
-							 exception), flags);
-	  break;
-	case G_TYPE_DOUBLE:
-	  pspec = g_param_spec_double(name, nick, blurb,
-				      seed_value_to_double(ctx,
-							   jsmin_value,
-							   exception),
-				      seed_value_to_double(ctx,
-							   jsmax_value,
-							   exception),
-				      seed_value_to_double(ctx,
-							   jsdefault_value,
-							   exception), flags);
-	  break;
-	  // TODO: support enums/flags/params
-	case G_TYPE_STRING:
-	  // TODO: leaky?
-	  pspec = g_param_spec_string(name, nick, blurb,
-				      seed_value_to_string(ctx,
-							   jsdefault_value,
-							   exception), flags);
-	  break;
-	case G_TYPE_OBJECT:
-	  jsobject_type = seed_object_get_property (ctx, property_def,
-						    "object_type");
-
-	  if (JSValueIsNull (ctx, jsobject_type) ||
-	      !JSValueIsNumber (ctx, jsobject_type))
-	    object_type = G_TYPE_NONE;
-	  else
-	    object_type = seed_value_to_long (ctx, jsobject_type, exception);
-
-	  if(object_type == G_TYPE_NONE)
-	    {
-	      seed_make_exception (ctx, exception, "PropertyInstallationError",
-				   "Property of type %s requires object_type attribute",
-				   g_type_name(property_type));
-	      return property_count;
-	    }
-
-	  pspec = g_param_spec_object(name, nick, blurb,
-				      object_type, flags);
-	  break;
-	case G_TYPE_BOXED: // Boxed types TODO: this is almost certainly wrong
-	  pspec = g_param_spec_boxed(name, nick, blurb, type, flags);
-	  break;
-	default:
-	case G_TYPE_NONE:
-	  seed_make_exception (ctx, exception, "PropertyInstallationError",
-			       "Property requires type attribute");
-	  return property_count;
-	  break;
-	}
-
-      g_object_class_install_property (g_class, ++property_count, pspec);
-
-      if (nick != name)
-	g_free (nick);
-
-      if (blurb != name)
-	g_free (blurb);
-
-      g_free (name);
+    JSObjectRef properties, property_def;
+    JSValueRef jslength;
+    guint i, length;
+    GType property_type, object_type;
+    GParamFlags flags;
+    JSValueRef jsname, jsflags, jsproperty_type, jsdefault_value, jsobject_type;
+    JSValueRef jsnick, jsblurb, jsmin_value, jsmax_value;
+    gchar *name, *nick, *blurb;
+    GParamSpec* pspec;
+    guint property_count = 0;
+
+    properties
+      = (JSObjectRef) seed_object_get_property(ctx, definition, "properties");
+    if (JSValueIsNull(ctx, properties) || !JSValueIsObject(ctx, properties))
+        return 0;
+
+    jslength = seed_object_get_property(ctx, properties, "length");
+    if (JSValueIsNull(ctx, jslength))
+        return 0;
+
+    length = seed_value_to_uint(ctx, jslength, exception);
+    for (i = 0; i < length; i++) {
+        property_def
+          = (JSObjectRef) JSObjectGetPropertyAtIndex(ctx,
+                                                     (JSObjectRef) properties,
+                                                     i, NULL);
+
+        if (JSValueIsNull(ctx, property_def)
+            || !JSValueIsObject(ctx, property_def))
+            continue;
+
+        jsname = seed_object_get_property(ctx, property_def, "name");
+        if (!JSValueIsString(ctx, jsname)) {
+            seed_make_exception(ctx, exception, "PropertyInstallationError",
+                                "Property requires name attribute");
+            return property_count;
+        }
+        name = seed_value_to_string(ctx, jsname, exception);
+
+        // Check for "nick" property; set to name if nonexistent
+        jsnick = seed_object_get_property(ctx, property_def, "nick");
+        if (!JSValueIsString(ctx, jsnick))
+            nick = name;
+        else
+            nick = seed_value_to_string(ctx, jsnick, exception);
+
+        // Check for "blurb" property; set to name if nonexistent
+        jsblurb = seed_object_get_property(ctx, property_def, "blurb");
+        if (!JSValueIsString(ctx, jsblurb))
+            blurb = name;
+        else
+            blurb = seed_value_to_string(ctx, jsblurb, exception);
+
+        SEED_NOTE(GTYPE, "Installing property with name: %s on type: %s", name,
+                  g_type_name(type));
+
+        // Flags default to read/write, non-construct
+        jsflags
+          = seed_object_get_property(ctx, (JSObjectRef) property_def, "flags");
+        if (JSValueIsNull(ctx, jsflags) || !JSValueIsNumber(ctx, jsflags))
+            flags = G_PARAM_READABLE | G_PARAM_WRITABLE;
+        else
+            flags = seed_value_to_long(ctx, jsflags, exception);
+
+        jsproperty_type = seed_object_get_property(ctx, property_def, "type");
+
+        if (JSValueIsNull(ctx, jsproperty_type)
+            || !JSValueIsNumber(ctx, jsproperty_type))
+            property_type = G_TYPE_NONE;
+        else
+            property_type = seed_value_to_long(ctx, jsproperty_type, exception);
+
+        jsdefault_value
+          = seed_object_get_property(ctx, property_def, "default_value");
+
+        if (JSValueIsNull(ctx, jsdefault_value)
+            || JSValueIsUndefined(ctx, jsdefault_value)) {
+            if (property_type == G_TYPE_OBJECT)
+                continue;
+
+            seed_make_exception(
+              ctx, exception, "PropertyInstallationError",
+              "Property of type %s requires default_value attribute",
+              g_type_name(property_type));
+            return property_count;
+        }
+
+        jsmin_value
+          = seed_object_get_property(ctx, property_def, "minimum_value");
+        jsmax_value
+          = seed_object_get_property(ctx, property_def, "maximum_value");
+
+        // Make sure min/max properties are defined, based on type
+        if (property_type == G_TYPE_CHAR || property_type == G_TYPE_UCHAR
+            || property_type == G_TYPE_INT || property_type == G_TYPE_UINT
+            || property_type == G_TYPE_INT64 || property_type == G_TYPE_UINT64
+            || property_type == G_TYPE_FLOAT
+            || property_type == G_TYPE_DOUBLE) {
+            if (JSValueIsNull(ctx, jsmin_value)
+                || !JSValueIsNumber(ctx, jsmin_value)) {
+                seed_make_exception(
+                  ctx, exception, "PropertyInstallationError",
+                  "Property of type %s requires minimum_value attribute",
+                  g_type_name(property_type));
+                return property_count;
+            }
+            if (JSValueIsNull(ctx, jsmax_value)
+                || !JSValueIsNumber(ctx, jsmax_value)) {
+                seed_make_exception(
+                  ctx, exception, "PropertyInstallationError",
+                  "Property of type %s requires maximum_value attribute",
+                  g_type_name(property_type));
+                return property_count;
+            }
+        }
+
+        switch (property_type) {
+            case G_TYPE_BOOLEAN:
+                pspec = g_param_spec_boolean(
+                  name, nick, blurb,
+                  seed_value_to_boolean(ctx, jsdefault_value, exception),
+                  flags);
+                break;
+            case G_TYPE_CHAR:
+                pspec = g_param_spec_char(
+                  name, nick, blurb,
+                  seed_value_to_char(ctx, jsmin_value, exception),
+                  seed_value_to_char(ctx, jsmax_value, exception),
+                  seed_value_to_char(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_UCHAR:
+                pspec = g_param_spec_uchar(
+                  name, nick, blurb,
+                  seed_value_to_uchar(ctx, jsmin_value, exception),
+                  seed_value_to_uchar(ctx, jsmax_value, exception),
+                  seed_value_to_uchar(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_INT:
+                pspec = g_param_spec_int(
+                  name, nick, blurb,
+                  seed_value_to_int(ctx, jsmin_value, exception),
+                  seed_value_to_int(ctx, jsmax_value, exception),
+                  seed_value_to_int(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_UINT:
+                pspec = g_param_spec_uint(
+                  name, nick, blurb,
+                  seed_value_to_uint(ctx, jsmin_value, exception),
+                  seed_value_to_uint(ctx, jsmax_value, exception),
+                  seed_value_to_uint(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_LONG:
+                pspec = g_param_spec_long(
+                  name, nick, blurb,
+                  seed_value_to_long(ctx, jsmin_value, exception),
+                  seed_value_to_long(ctx, jsmax_value, exception),
+                  seed_value_to_long(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_ULONG:
+                pspec = g_param_spec_ulong(
+                  name, nick, blurb,
+                  seed_value_to_ulong(ctx, jsmin_value, exception),
+                  seed_value_to_ulong(ctx, jsmax_value, exception),
+                  seed_value_to_ulong(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_INT64:
+                pspec = g_param_spec_int64(
+                  name, nick, blurb,
+                  seed_value_to_int64(ctx, jsmin_value, exception),
+                  seed_value_to_int64(ctx, jsmax_value, exception),
+                  seed_value_to_int64(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_UINT64:
+                pspec = g_param_spec_uint64(
+                  name, nick, blurb,
+                  seed_value_to_uint64(ctx, jsmin_value, exception),
+                  seed_value_to_uint64(ctx, jsmax_value, exception),
+                  seed_value_to_uint64(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_FLOAT:
+                pspec = g_param_spec_float(
+                  name, nick, blurb,
+                  seed_value_to_float(ctx, jsmin_value, exception),
+                  seed_value_to_float(ctx, jsmax_value, exception),
+                  seed_value_to_float(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_DOUBLE:
+                pspec = g_param_spec_double(
+                  name, nick, blurb,
+                  seed_value_to_double(ctx, jsmin_value, exception),
+                  seed_value_to_double(ctx, jsmax_value, exception),
+                  seed_value_to_double(ctx, jsdefault_value, exception), flags);
+                break;
+            // TODO: support enums/flags/params
+            case G_TYPE_STRING:
+                // TODO: leaky?
+                pspec = g_param_spec_string(
+                  name, nick, blurb,
+                  seed_value_to_string(ctx, jsdefault_value, exception), flags);
+                break;
+            case G_TYPE_OBJECT:
+                jsobject_type
+                  = seed_object_get_property(ctx, property_def, "object_type");
+
+                if (JSValueIsNull(ctx, jsobject_type)
+                    || !JSValueIsNumber(ctx, jsobject_type))
+                    object_type = G_TYPE_NONE;
+                else
+                    object_type
+                      = seed_value_to_long(ctx, jsobject_type, exception);
+
+                if (object_type == G_TYPE_NONE) {
+                    seed_make_exception(
+                      ctx, exception, "PropertyInstallationError",
+                      "Property of type %s requires object_type attribute",
+                      g_type_name(property_type));
+                    return property_count;
+                }
+
+                pspec
+                  = g_param_spec_object(name, nick, blurb, object_type, flags);
+                break;
+            case G_TYPE_BOXED: // Boxed types TODO: this is almost certainly
+                               // wrong
+                pspec = g_param_spec_boxed(name, nick, blurb, type, flags);
+                break;
+            default:
+            case G_TYPE_NONE:
+                seed_make_exception(ctx, exception, "PropertyInstallationError",
+                                    "Property requires type attribute");
+                return property_count;
+                break;
+        }
+
+        g_object_class_install_property(g_class, ++property_count, pspec);
+
+        if (nick != name)
+            g_free(nick);
+
+        if (blurb != name)
+            g_free(blurb);
+
+        g_free(name);
     }
 
-  return property_count;
+    return property_count;
 }
 
 static void
-seed_gtype_class_init (gpointer g_class, gpointer class_data)
+seed_gtype_class_init(gpointer g_class, gpointer class_data)
 {
-  SeedGClassPrivates *priv;
-  GIBaseInfo *class_info;
-  JSContextRef ctx;
-  JSValueRef jsargs[2];
-  GType type;
-  JSValueRef exception = NULL;
-  int initial_prop_count = 1;
-  GQuark class_init_exception_q = 
-  	g_quark_from_static_string("type-class-init-exception");
-
-  priv = (SeedGClassPrivates *) class_data;
-
-  ((GObjectClass *)g_class)->get_property = seed_gtype_get_property;
-  ((GObjectClass *)g_class)->set_property = seed_gtype_set_property;
-  ((GObjectClass *)g_class)->constructor = seed_gtype_construct;
-
-  ctx = JSGlobalContextCreateInGroup (context_group, 0);
-
-  type = (GType) JSObjectGetPrivate (priv->constructor);
-  seed_gtype_install_signals (ctx, priv->definition, type, &exception);
-  initial_prop_count = seed_gtype_install_properties (ctx,
-						      priv->definition,
-						      type,
-						      (GObjectClass *) g_class,
-						      &exception);
-
-  if (!priv->func)
-    {
-      JSGlobalContextRelease ((JSGlobalContextRef) ctx);
-      if (exception)
-	{
-	  g_type_set_qdata(type, class_init_exception_q, (gpointer)exception);
-	}
-      return;
+    SeedGClassPrivates* priv;
+    GIBaseInfo* class_info;
+    JSContextRef ctx;
+    JSValueRef jsargs[2];
+    GType type;
+    JSValueRef exception = NULL;
+    int initial_prop_count = 1;
+    GQuark class_init_exception_q
+      = g_quark_from_static_string("type-class-init-exception");
+
+    priv = (SeedGClassPrivates*) class_data;
+
+    ((GObjectClass*) g_class)->get_property = seed_gtype_get_property;
+    ((GObjectClass*) g_class)->set_property = seed_gtype_set_property;
+    ((GObjectClass*) g_class)->constructor = seed_gtype_construct;
+
+    ctx = JSGlobalContextCreateInGroup(context_group, 0);
+
+    type = (GType) JSObjectGetPrivate(priv->constructor);
+    seed_gtype_install_signals(ctx, priv->definition, type, &exception);
+    initial_prop_count
+      = seed_gtype_install_properties(ctx, priv->definition, type,
+                                      (GObjectClass*) g_class, &exception);
+
+    if (!priv->func) {
+        JSGlobalContextRelease((JSGlobalContextRef) ctx);
+        if (exception) {
+            g_type_set_qdata(type, class_init_exception_q,
+                             (gpointer) exception);
+        }
+        return;
     }
 
-  seed_prepare_global_context (ctx);
+    seed_prepare_global_context(ctx);
 
-  class_info = seed_get_class_info_for_type (type);
+    class_info = seed_get_class_info_for_type(type);
 
-  jsargs[0] = seed_make_struct (ctx, g_class, class_info);
-  jsargs[1] = seed_gobject_get_prototype_for_gtype (type);
+    jsargs[0] = seed_make_struct(ctx, g_class, class_info);
+    jsargs[1] = seed_gobject_get_prototype_for_gtype(type);
 
-  seed_attach_methods_to_class_object (ctx, (JSObjectRef) jsargs[0],
-				       &exception);
+    seed_attach_methods_to_class_object(ctx, (JSObjectRef) jsargs[0],
+                                        &exception);
 
-  g_base_info_unref ((GIBaseInfo *) class_info);
+    g_base_info_unref((GIBaseInfo*) class_info);
 
-  SEED_NOTE (GTYPE, "Marshalling class init for type: %s",
-	     g_type_name (type));
+    SEED_NOTE(GTYPE, "Marshalling class init for type: %s", g_type_name(type));
 
-  seed_object_set_property (ctx, (JSObjectRef) jsargs[0],
-			    "type", seed_value_from_int (ctx, type, 0));
-  seed_object_set_property (ctx, (JSObjectRef) jsargs[0],
-			    "property_count",
-			    seed_value_from_int (ctx, initial_prop_count + 1,
-						 0));
+    seed_object_set_property(ctx, (JSObjectRef) jsargs[0], "type",
+                             seed_value_from_int(ctx, type, 0));
+    seed_object_set_property(ctx, (JSObjectRef) jsargs[0], "property_count",
+                             seed_value_from_int(ctx, initial_prop_count + 1,
+                                                 0));
 
-  JSObjectCallAsFunction (ctx, priv->func, 0, 2, jsargs, &exception);
-  if (exception)
-    {
-      g_type_set_qdata(type, class_init_exception_q, (gpointer)exception);
+    JSObjectCallAsFunction(ctx, priv->func, 0, 2, jsargs, &exception);
+    if (exception) {
+        g_type_set_qdata(type, class_init_exception_q, (gpointer) exception);
     }
 
-  JSGlobalContextRelease ((JSGlobalContextRef) ctx);
+    JSGlobalContextRelease((JSGlobalContextRef) ctx);
 }
 
 static JSObjectRef
-seed_gtype_constructor_invoked (JSContextRef ctx,
-				JSObjectRef constructor,
-				gsize argumentCount,
-				const JSValueRef arguments[],
-				JSValueRef * exception)
+seed_gtype_constructor_invoked(JSContextRef ctx,
+                               JSObjectRef constructor,
+                               gsize argumentCount,
+                               const JSValueRef arguments[],
+                               JSValueRef* exception)
 {
-  JSValueRef class_init, instance_init, name, parent_ref;
-  GType parent_type, new_type;
-  gchar *new_name;
-  GTypeInfo type_info = {
-    0,
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) NULL,
-    (GClassFinalizeFunc) NULL,
-    NULL,
-    0,
-    0,
-    NULL
-  };
-  GTypeQuery query;
-  JSObjectRef constructor_ref;
-  SeedGClassPrivates *priv;
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "GType constructor expected 1 "
-			   "argument, got %zd \n", argumentCount);
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    JSValueRef class_init, instance_init, name, parent_ref;
+    GType parent_type, new_type;
+    gchar* new_name;
+    GTypeInfo type_info = { 0,
+                            (GBaseInitFunc) NULL,
+                            (GBaseFinalizeFunc) NULL,
+                            (GClassInitFunc) NULL,
+                            (GClassFinalizeFunc) NULL,
+                            NULL,
+                            0,
+                            0,
+                            NULL };
+    GTypeQuery query;
+    JSObjectRef constructor_ref;
+    SeedGClassPrivates* priv;
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "GType constructor expected 1 "
+                            "argument, got %zd \n",
+                            argumentCount);
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
-  if (!JSValueIsObject (ctx, arguments[0]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "GType constructor expected a"
-			   "class definition object. Got a nonobject");
+    if (!JSValueIsObject(ctx, arguments[0])) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "GType constructor expected a"
+                            "class definition object. Got a nonobject");
 
-      return (JSObjectRef) JSValueMakeNull (ctx);
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
-  parent_ref = seed_object_get_property (ctx,
-					 (JSObjectRef) arguments[0],
-					 "parent");
-  class_init =
-    seed_object_get_property (ctx, (JSObjectRef) arguments[0], "class_init");
-  instance_init =
-    seed_object_get_property (ctx, (JSObjectRef) arguments[0], "init");
-  name = seed_object_get_property (ctx, (JSObjectRef) arguments[0], "name");
-
-  new_name = seed_value_to_string (ctx, name, exception);
-  if (!JSValueIsNumber (ctx, parent_ref))
-    {
-      seed_make_exception (ctx, exception, "TypeError",
-			   "GType constructor expected GType for parent");
-
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    parent_ref
+      = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "parent");
+    class_init
+      = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "class_init");
+    instance_init
+      = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "init");
+    name = seed_object_get_property(ctx, (JSObjectRef) arguments[0], "name");
+
+    new_name = seed_value_to_string(ctx, name, exception);
+    if (!JSValueIsNumber(ctx, parent_ref)) {
+        seed_make_exception(ctx, exception, "TypeError",
+                            "GType constructor expected GType for parent");
+
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
 
+    // TODO: GType is of variable length, so this is an incorrect fix
+    parent_type = (GType) seed_value_to_long(ctx, parent_ref, exception);
 
-  // TODO: GType is of variable length, so this is an incorrect fix
-  parent_type = (GType) seed_value_to_long (ctx, parent_ref, exception);
-
-  SEED_NOTE (GTYPE, "Registering new GType with name: %s as child of %s.",
-	     new_name, g_type_name (parent_type));
+    SEED_NOTE(GTYPE, "Registering new GType with name: %s as child of %s.",
+              new_name, g_type_name(parent_type));
 
-  g_type_query (parent_type, &query);
-  type_info.class_size = query.class_size;
-  type_info.instance_size = query.instance_size;
-  type_info.class_init = seed_gtype_class_init;
+    g_type_query(parent_type, &query);
+    type_info.class_size = query.class_size;
+    type_info.instance_size = query.instance_size;
+    type_info.class_init = seed_gtype_class_init;
 
-  priv = g_slice_alloc (sizeof (SeedGClassPrivates));
+    priv = g_slice_alloc(sizeof(SeedGClassPrivates));
 
-  if (!JSValueIsNull (ctx, class_init) &&
-      JSValueIsObject (ctx, class_init) &&
-      JSObjectIsFunction (ctx, (JSObjectRef) class_init))
-    {
-      priv->func = (gpointer) class_init;
-      JSValueProtect (ctx, class_init);
+    if (!JSValueIsNull(ctx, class_init) && JSValueIsObject(ctx, class_init)
+        && JSObjectIsFunction(ctx, (JSObjectRef) class_init)) {
+        priv->func = (gpointer) class_init;
+        JSValueProtect(ctx, class_init);
     }
 
+    constructor_ref
+      = JSObjectMake(ctx, gobject_constructor_class, (gpointer) 0);
+    JSValueProtect(ctx, constructor_ref);
 
-  constructor_ref = JSObjectMake (ctx, gobject_constructor_class,
-				  (gpointer) 0);
-  JSValueProtect (ctx, constructor_ref);
+    priv->constructor = constructor_ref;
 
-  priv->constructor = constructor_ref;
+    JSValueProtect(ctx, arguments[0]);
+    priv->definition = (JSObjectRef) arguments[0];
 
-  JSValueProtect (ctx, arguments[0]);
-  priv->definition = (JSObjectRef) arguments[0];
+    type_info.class_data = priv;
 
-  type_info.class_data = priv;
+    new_type = g_type_register_static(parent_type, new_name, &type_info, 0);
+    seed_gobject_get_class_for_gtype(ctx, new_type);
+    JSObjectSetPrivate(constructor_ref, (gpointer) new_type);
 
-  new_type = g_type_register_static (parent_type, new_name, &type_info, 0);
-  seed_gobject_get_class_for_gtype (ctx, new_type);
-  JSObjectSetPrivate (constructor_ref, (gpointer) new_type);
+    seed_object_set_property(ctx, constructor_ref, "type",
+                             seed_value_from_int(ctx, new_type, exception));
 
-  seed_object_set_property (ctx, constructor_ref,
-			    "type", seed_value_from_int (ctx, new_type,
-							 exception));
-
-  if (!JSValueIsNull (ctx, instance_init) &&
-      JSValueIsObject (ctx, instance_init) &&
-      JSObjectIsFunction (ctx, (JSObjectRef) instance_init))
-    {
-      g_type_set_qdata (new_type, qiinit, (gpointer) instance_init);
-      JSValueProtect (ctx, instance_init);
+    if (!JSValueIsNull(ctx, instance_init)
+        && JSValueIsObject(ctx, instance_init)
+        && JSObjectIsFunction(ctx, (JSObjectRef) instance_init)) {
+        g_type_set_qdata(new_type, qiinit, (gpointer) instance_init);
+        JSValueProtect(ctx, instance_init);
     }
 
-  g_free (new_name);
-  return constructor_ref;
+    g_free(new_name);
+    return constructor_ref;
 }
 
 static JSValueRef
-seed_param_getter_invoked (JSContextRef ctx,
-			   JSObjectRef function,
-			   JSObjectRef thisObject,
-			   gsize argumentCount,
-			   const JSValueRef arguments[],
-			   JSValueRef * exception)
+seed_param_getter_invoked(JSContextRef ctx,
+                          JSObjectRef function,
+                          JSObjectRef thisObject,
+                          gsize argumentCount,
+                          const JSValueRef arguments[],
+                          JSValueRef* exception)
 {
-  GParamSpec *pspec = seed_pointer_get_pointer (ctx, thisObject);
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "ParamSpec.get expected "
-			   "1 argument, got %zd", argumentCount);
-
-      return JSValueMakeNull (ctx);
-    }
-  else if (JSValueIsNull (ctx, arguments[0]) ||
-	   !JSValueIsObject (ctx, arguments[0]) ||
-	   !JSObjectIsFunction (ctx, (JSObjectRef) arguments[0]))
-    {
-      // Maybe should  accept C functions
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "ParamSpec.get expected a function");
-      return JSValueMakeNull (ctx);
+    GParamSpec* pspec = seed_pointer_get_pointer(ctx, thisObject);
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "ParamSpec.get expected "
+                            "1 argument, got %zd",
+                            argumentCount);
+
+        return JSValueMakeNull(ctx);
+    } else if (JSValueIsNull(ctx, arguments[0])
+               || !JSValueIsObject(ctx, arguments[0])
+               || !JSObjectIsFunction(ctx, (JSObjectRef) arguments[0])) {
+        // Maybe should  accept C functions
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "ParamSpec.get expected a function");
+        return JSValueMakeNull(ctx);
     }
 
-  g_param_spec_set_qdata (pspec, qgetter, (gpointer) arguments[0]);
+    g_param_spec_set_qdata(pspec, qgetter, (gpointer) arguments[0]);
 
-  return seed_value_from_boolean (ctx, TRUE, exception);
+    return seed_value_from_boolean(ctx, TRUE, exception);
 }
 
 static JSValueRef
-seed_param_setter_invoked (JSContextRef ctx,
-			   JSObjectRef function,
-			   JSObjectRef thisObject,
-			   gsize argumentCount,
-			   const JSValueRef arguments[],
-			   JSValueRef * exception)
+seed_param_setter_invoked(JSContextRef ctx,
+                          JSObjectRef function,
+                          JSObjectRef thisObject,
+                          gsize argumentCount,
+                          const JSValueRef arguments[],
+                          JSValueRef* exception)
 {
-  GParamSpec *pspec = seed_pointer_get_pointer (ctx, thisObject);
-
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "ParamSpec.set expected "
-			   "1 argument, got %zd", argumentCount);
-
-      return JSValueMakeNull (ctx);
-    }
-  else if (JSValueIsNull (ctx, arguments[0]) ||
-	   !JSValueIsObject (ctx, arguments[0]) ||
-	   !JSObjectIsFunction (ctx, (JSObjectRef) arguments[0]))
-    {
-      // Maybe should  accept C functions
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "ParamSpec.set expected a function");
-      return JSValueMakeNull (ctx);
+    GParamSpec* pspec = seed_pointer_get_pointer(ctx, thisObject);
+
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "ParamSpec.set expected "
+                            "1 argument, got %zd",
+                            argumentCount);
+
+        return JSValueMakeNull(ctx);
+    } else if (JSValueIsNull(ctx, arguments[0])
+               || !JSValueIsObject(ctx, arguments[0])
+               || !JSObjectIsFunction(ctx, (JSObjectRef) arguments[0])) {
+        // Maybe should  accept C functions
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "ParamSpec.set expected a function");
+        return JSValueMakeNull(ctx);
     }
 
-  g_param_spec_set_qdata (pspec, qsetter, (gpointer) arguments[0]);
+    g_param_spec_set_qdata(pspec, qsetter, (gpointer) arguments[0]);
 
-  return seed_value_from_boolean (ctx, TRUE, exception);
+    return seed_value_from_boolean(ctx, TRUE, exception);
 }
 
 void
-seed_define_gtype_functions (JSContextRef ctx)
+seed_define_gtype_functions(JSContextRef ctx)
 {
-  JSObjectRef proto;
-
-  objectclass_info = g_irepository_find_by_name (NULL,
-						 "GObject", "ObjectClass");
-
-  proto = seed_struct_prototype (ctx, objectclass_info);
-/*
-  // paramspec is remove in newer versions of introspeciton - removing
-  // until we can work out how to replace this.
-  paramspec_info = g_irepository_find_by_name (NULL, "GObject", "ParamSpec");
-  proto = seed_struct_prototype (ctx, paramspec_info);
-*/
-  seed_create_function (ctx, "get", &seed_param_getter_invoked, proto);
-  seed_create_function (ctx, "set", &seed_param_setter_invoked, proto);
+    JSObjectRef proto;
+
+    objectclass_info
+      = g_irepository_find_by_name(NULL, "GObject", "ObjectClass");
+
+    proto = seed_struct_prototype(ctx, objectclass_info);
+    /*
+      // paramspec is remove in newer versions of introspeciton - removing
+      // until we can work out how to replace this.
+      paramspec_info = g_irepository_find_by_name (NULL, "GObject",
+      "ParamSpec");
+      proto = seed_struct_prototype (ctx, paramspec_info);
+    */
+    seed_create_function(ctx, "get", &seed_param_getter_invoked, proto);
+    seed_create_function(ctx, "set", &seed_param_setter_invoked, proto);
 }
 
 void
-seed_gtype_init (SeedEngine * local_eng)
+seed_gtype_init(SeedEngine* local_eng)
 {
-  JSClassDefinition gtype_def = kJSClassDefinitionEmpty;
+    JSClassDefinition gtype_def = kJSClassDefinitionEmpty;
 
-  gtype_def.callAsConstructor = seed_gtype_constructor_invoked;
-  seed_gtype_class = JSClassCreate (&gtype_def);
-  JSClassRetain (seed_gtype_class);
+    gtype_def.callAsConstructor = seed_gtype_constructor_invoked;
+    seed_gtype_class = JSClassCreate(&gtype_def);
+    JSClassRetain(seed_gtype_class);
 
-  seed_gtype_constructor =
-    JSObjectMake (local_eng->context, seed_gtype_class, 0);
+    seed_gtype_constructor
+      = JSObjectMake(local_eng->context, seed_gtype_class, 0);
 
-  seed_object_set_property (local_eng->context,
-			    local_eng->global, "GType",
-			    seed_gtype_constructor);
+    seed_object_set_property(local_eng->context, local_eng->global, "GType",
+                             seed_gtype_constructor);
 
-  qiinit = g_quark_from_static_string("js-instance-init");
+    qiinit = g_quark_from_static_string("js-instance-init");
 
-  seed_define_gtype_functions (local_eng->context);
+    seed_define_gtype_functions(local_eng->context);
 }
diff --git a/libseed/seed-gtype.h b/libseed/seed-gtype.h
index b16fc58..466eaa0 100644
--- a/libseed/seed-gtype.h
+++ b/libseed/seed-gtype.h
@@ -22,7 +22,7 @@
 
 #include "seed-private.h"
 
-void seed_gtype_init (SeedEngine * eng);
+void seed_gtype_init(SeedEngine* eng);
 
 extern JSObjectRef seed_gtype_constructor;
 
diff --git a/libseed/seed-importer.c b/libseed/seed-importer.c
index de331ff..b40d614 100644
--- a/libseed/seed-importer.c
+++ b/libseed/seed-importer.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <gio/gio.h>
 
 #include "seed-private.h"
 
@@ -35,8 +36,8 @@ JSObjectRef importer_search_path;
 
 JSClassRef importer_dir_class;
 
-GHashTable *gi_imports;
-GHashTable *file_imports;
+GHashTable* gi_imports;
+GHashTable* file_imports;
 
 /*
  * Some high level documentation of the importer object.
@@ -72,41 +73,77 @@ GHashTable *file_imports;
  *        for that context.
  */
 
+gboolean
+seed_file_test(const gchar* path, GFileTest test)
+{
+    // XXX: This is a nasty hack. what we should do is probably
+    // to check for GResource children in a given path and
+    // then return TRUE if any children exists for that path
+    gboolean exists = FALSE;
+    gboolean isdir = FALSE;
+
+    if (g_str_has_prefix(path, "/org/seed")) {
+        if (g_strcmp0(path, "/org/seed") == 0
+            || g_strcmp0(path, "/org/seed/extensions") == 0
+            || g_strcmp0(path, "/org/seed/extensions/gjs") == 0) {
+            isdir = TRUE;
+            exists = TRUE;
+        } else if (g_resources_get_info(path, G_RESOURCE_LOOKUP_FLAGS_NONE,
+                                        NULL, NULL, NULL)) {
+            isdir = FALSE;
+            exists = TRUE;
+        }
+
+        // Return only if file is in GResource.
+        // Otherwise fallback to g_file_test
+        if (exists) {
+            if (test & G_FILE_TEST_EXISTS)
+                return TRUE;
+            if (test & G_FILE_TEST_IS_REGULAR)
+                if (!isdir)
+                    return !isdir;
+            if (test & G_FILE_TEST_IS_DIR)
+                if (isdir)
+                    return isdir;
+        }
+    }
+
+    return g_file_test(path, test);
+}
+
 /*
 * Handle definition of toplevel functions in a namespace.
-* i.e. Gtk.main
+* i.e. Gtk.main.
 */
 
 static gboolean
-seed_gi_importer_is_init (GIFunctionInfo * info)
+seed_gi_importer_is_init(GIFunctionInfo* info)
 {
-  if (g_strcmp0 (g_base_info_get_name ((GIBaseInfo *) info), "init"))
-    {
-      return FALSE;
+    if (g_strcmp0(g_base_info_get_name((GIBaseInfo*) info), "init")) {
+        return FALSE;
     }
-  if (g_callable_info_get_n_args ((GICallableInfo *) info) != 2)
-    return FALSE;
+    if (g_callable_info_get_n_args((GICallableInfo*) info) != 2)
+        return FALSE;
 
-  return TRUE;
+    return TRUE;
 }
 
 static void
-seed_gi_importer_handle_function (JSContextRef ctx,
-				  JSObjectRef namespace_ref,
-				  GIFunctionInfo * info,
-				  JSValueRef * exception)
+seed_gi_importer_handle_function(JSContextRef ctx,
+                                 JSObjectRef namespace_ref,
+                                 GIFunctionInfo* info,
+                                 JSValueRef* exception)
 {
-  if (!seed_gi_importer_is_init (info))
-    seed_gobject_define_property_from_function_info (ctx,
-						     (GIFunctionInfo *) info,
-						     namespace_ref, FALSE);
-  else
-    {
-      JSObjectRef init_method;
-
-      init_method = JSObjectMake (ctx, gobject_init_method_class,
-				  g_base_info_ref ((GIBaseInfo *) info));
-      seed_object_set_property (ctx, namespace_ref, "init", init_method);
+    if (!seed_gi_importer_is_init(info))
+        seed_gobject_define_property_from_function_info(ctx,
+                                                        (GIFunctionInfo*) info,
+                                                        namespace_ref, FALSE);
+    else {
+        JSObjectRef init_method;
+
+        init_method = JSObjectMake(ctx, gobject_init_method_class,
+                                   g_base_info_ref((GIBaseInfo*) info));
+        seed_object_set_property(ctx, namespace_ref, "init", init_method);
     }
 }
 
@@ -117,46 +154,44 @@ seed_gi_importer_handle_function (JSContextRef ctx,
  * i.e. Gtk.WindowType.NORMAL
  */
 static void
-seed_gi_importer_handle_enum (JSContextRef ctx,
-			      JSObjectRef namespace_ref,
-			      GIEnumInfo * info, JSValueRef * exception)
+seed_gi_importer_handle_enum(JSContextRef ctx,
+                             JSObjectRef namespace_ref,
+                             GIEnumInfo* info,
+                             JSValueRef* exception)
 {
-  JSObjectRef enum_class;
-  guint num_vals, i, j;
-  gsize name_len;
-  gint value; // TODO: investigate what's up with the glong/gint mystery here
-  gchar *name;
-  GIValueInfo *val;
-
-  enum_class = JSObjectMake (ctx, 0, 0);
-  num_vals = g_enum_info_get_n_values (info);
-  seed_object_set_property (ctx, namespace_ref,
-			    g_base_info_get_name ((GIBaseInfo *) info),
-			    enum_class);
-
-  for (i = 0; i < num_vals; i++)
-    {
-      val = g_enum_info_get_value ((GIEnumInfo *) info, i);
-      value = g_value_info_get_value (val);
-      name = g_strdup (g_base_info_get_name ((GIBaseInfo *) val));
-      name_len = strlen (name);
-      JSValueRef value_ref;
-
-      value_ref = JSValueMakeNumber (ctx, value);
-      JSValueProtect (ctx, (JSValueRef) value_ref);
-
-      for (j = 0; j < name_len; j++)
-	{
-	  if (name[j] == '-')
-	    name[j] = '_';
-	  name[j] = g_ascii_toupper (name[j]);
-	}
-
-      seed_object_set_property (ctx, enum_class, name, value_ref);
-
-      g_free (name);
-      g_base_info_unref ((GIBaseInfo *) val);
+    JSObjectRef enum_class;
+    guint num_vals, i, j;
+    gsize name_len;
+    gint value; // TODO: investigate what's up with the glong/gint mystery here
+    gchar* name;
+    GIValueInfo* val;
+
+    enum_class = JSObjectMake(ctx, 0, 0);
+    num_vals = g_enum_info_get_n_values(info);
+    seed_object_set_property(ctx, namespace_ref,
+                             g_base_info_get_name((GIBaseInfo*) info),
+                             enum_class);
+
+    for (i = 0; i < num_vals; i++) {
+        val = g_enum_info_get_value((GIEnumInfo*) info, i);
+        value = g_value_info_get_value(val);
+        name = g_strdup(g_base_info_get_name((GIBaseInfo*) val));
+        name_len = strlen(name);
+        JSValueRef value_ref;
+
+        value_ref = JSValueMakeNumber(ctx, value);
+        JSValueProtect(ctx, (JSValueRef) value_ref);
+
+        for (j = 0; j < name_len; j++) {
+            if (name[j] == '-')
+                name[j] = '_';
+            name[j] = g_ascii_toupper(name[j]);
+        }
 
+        seed_object_set_property(ctx, enum_class, name, value_ref);
+
+        g_free(name);
+        g_base_info_unref((GIBaseInfo*) val);
     }
 }
 
@@ -166,925 +201,1027 @@ seed_gi_importer_handle_enum (JSContextRef ctx,
  * the prototype object. Namespace.Type.type will be the GType.
  */
 static void
-seed_gi_importer_handle_object (JSContextRef ctx,
-				JSObjectRef namespace_ref,
-				GIObjectInfo * info, JSValueRef * exception)
+seed_gi_importer_handle_object(JSContextRef ctx,
+                               JSObjectRef namespace_ref,
+                               GIObjectInfo* info,
+                               JSValueRef* exception)
+{
+    GType type;
+    JSClassRef class_ref;
+
+    type = g_registered_type_info_get_g_type((GIRegisteredTypeInfo*) info);
+
+    if (type != 0) {
+        GIFunctionInfo* finfo;
+        GIFunctionInfoFlags flags;
+        JSObjectRef constructor_ref;
+        guint i, n_methods;
+
+        class_ref = seed_gobject_get_class_for_gtype(ctx, type);
+
+        constructor_ref
+          = JSObjectMake(ctx, gobject_constructor_class, (gpointer) type);
+
+        seed_object_set_property(ctx, constructor_ref, "type",
+                                 seed_value_from_long(ctx, type, exception));
+        n_methods = g_object_info_get_n_methods(info);
+        for (i = 0; i < n_methods; i++) {
+            finfo = g_object_info_get_method(info, i);
+            flags = g_function_info_get_flags(finfo);
+            if (flags & GI_FUNCTION_IS_CONSTRUCTOR) {
+                JSObjectRef constructor
+                  = JSObjectMake(ctx, gobject_named_constructor_class, finfo);
+                const gchar* fname = g_base_info_get_name((GIBaseInfo*) finfo);
+                if (g_strrstr(fname, "new_") == fname) {
+                    // To be compatible with gjs, we need to have a method with
+                    // new_, too.
+                    seed_object_set_property(ctx, constructor_ref, fname,
+                                             constructor);
+                    fname += 4;
+                }
+
+                else if (!g_strcmp0(fname, "new")) {
+                    // To be compatible with gjs, we need to have new as
+                    // function, too.
+                    seed_object_set_property(ctx, constructor_ref, fname,
+                                             constructor);
+                    fname = "c_new";
+                }
+
+                seed_object_set_property(ctx, constructor_ref, fname,
+                                         constructor);
+            } else if (!(flags & GI_FUNCTION_IS_METHOD)) {
+                seed_gobject_define_property_from_function_info(ctx, finfo,
+                                                                constructor_ref,
+                                                                FALSE);
+            } else {
+                g_base_info_unref((GIBaseInfo*) finfo);
+            }
+        }
+
+        seed_object_set_property(ctx, namespace_ref,
+                                 g_base_info_get_name((GIBaseInfo*) info),
+                                 constructor_ref);
+        seed_object_set_property(ctx, constructor_ref, "prototype",
+                                 seed_gobject_get_prototype_for_gtype(type));
+    }
+}
+
+static void
+seed_gi_importer_handle_iface(JSContextRef ctx,
+                              JSObjectRef namespace_ref,
+                              GIObjectInfo* info,
+                              JSValueRef* exception)
 {
-  GType type;
-  JSClassRef class_ref;
-
-  type = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *) info);
-
-  if (type != 0)
-    {
-      GIFunctionInfo *finfo;
-      GIFunctionInfoFlags flags;
-      JSObjectRef constructor_ref;
-      guint i, n_methods;
-
-      class_ref = seed_gobject_get_class_for_gtype (ctx, type);
-
-      constructor_ref =
-	JSObjectMake (ctx, gobject_constructor_class, (gpointer) type);
-
-      seed_object_set_property (ctx, constructor_ref,
-				"type",
-				seed_value_from_long (ctx, type, exception));
-      n_methods = g_object_info_get_n_methods (info);
-      for (i = 0; i < n_methods; i++)
-	{
-	  finfo = g_object_info_get_method (info, i);
-	  flags = g_function_info_get_flags (finfo);
-	  if (flags & GI_FUNCTION_IS_CONSTRUCTOR)
-	    {
-	      JSObjectRef constructor = JSObjectMake (ctx,
-						      gobject_named_constructor_class,
-						      finfo);
-	      const gchar *fname =
-		g_base_info_get_name ((GIBaseInfo *) finfo);
-	      if (g_strrstr (fname, "new_") == fname)
-		fname += 4;
-	      else if (!g_strcmp0 (fname, "new"))
-		fname = "c_new";
-
-	      seed_object_set_property (ctx,
-					constructor_ref, fname, constructor);
-	    }
-	  else if (!(flags & GI_FUNCTION_IS_METHOD))
-	    {
-	      seed_gobject_define_property_from_function_info
-		(ctx, finfo, constructor_ref, FALSE);
-	    }
-	  else
-	    {
-	      g_base_info_unref ((GIBaseInfo *) finfo);
-	    }
-	}
-
-      seed_object_set_property (ctx, namespace_ref,
-				g_base_info_get_name ((GIBaseInfo *) info),
-				constructor_ref);
-      seed_object_set_property (ctx, constructor_ref,
-				"prototype",
-				seed_gobject_get_prototype_for_gtype (type));
+    GType type;
+
+    type = g_registered_type_info_get_g_type((GIRegisteredTypeInfo*) info);
+
+    if (type != 0) {
+        GIFunctionInfo* finfo;
+        GIFunctionInfoFlags flags;
+        JSObjectRef constructor_ref;
+        guint i, n_methods;
+
+        constructor_ref
+          = JSObjectMake(ctx, gobject_constructor_class, (gpointer) type);
+
+        seed_object_set_property(ctx, constructor_ref, "type",
+                                 seed_value_from_long(ctx, type, exception));
+        n_methods = g_interface_info_get_n_methods(info);
+        for (i = 0; i < n_methods; i++) {
+            finfo = g_interface_info_get_method(info, i);
+            flags = g_function_info_get_flags(finfo);
+            if (!(flags & GI_FUNCTION_IS_METHOD)) {
+                seed_gobject_define_property_from_function_info(ctx, finfo,
+                                                                constructor_ref,
+                                                                FALSE);
+            } else {
+                g_base_info_unref((GIBaseInfo*) finfo);
+            }
+        }
+
+        seed_object_set_property(ctx, namespace_ref,
+                                 g_base_info_get_name((GIBaseInfo*) info),
+                                 constructor_ref);
+        seed_object_set_property(ctx, constructor_ref, "prototype",
+                                 seed_gobject_get_prototype_for_gtype(type));
     }
 }
 
 /*
- * Set up prototype and constructor for structs. Same semantics as objects except
+ * Set up prototype and constructor for structs. Same semantics as objects
+ * except
  * for the type.
  */
 static void
-seed_gi_importer_handle_struct (JSContextRef ctx,
-				JSObjectRef namespace_ref,
-				GIStructInfo * info, JSValueRef * exception)
+seed_gi_importer_handle_struct(JSContextRef ctx,
+                               JSObjectRef namespace_ref,
+                               GIStructInfo* info,
+                               JSValueRef* exception)
 {
-  JSObjectRef struct_ref;
-  JSObjectRef proto;
-  gint i, n_methods;
-  GIFunctionInfo *finfo;
-
-  struct_ref = JSObjectMake (ctx, seed_struct_constructor_class, info);
-  g_base_info_ref (info);
-  
-  n_methods = g_struct_info_get_n_methods (info);
-
-  for (i = 0; i < n_methods; i++)
-    {
-      GIFunctionInfoFlags flags;
-      finfo = g_struct_info_get_method (info, i);
-
-      flags = g_function_info_get_flags (finfo);
-
-      if (flags & GI_FUNCTION_IS_CONSTRUCTOR)
-	{
-	  JSObjectRef constructor = JSObjectMake (ctx,
-						  gobject_named_constructor_class,
-						  finfo);
-	  const gchar *fname = g_base_info_get_name ((GIBaseInfo *) finfo);
-	  if (g_str_has_prefix (fname, "new_"))
-	    fname += 4;
-	  else if (!g_strcmp0 (fname, "new"))
-	    fname = "c_new";
-
-	  seed_object_set_property (ctx, struct_ref, fname, constructor);
-	}
-      else if (flags & GI_FUNCTION_IS_METHOD)
-	g_base_info_unref ((GIBaseInfo *) finfo);
-      else
-	seed_gobject_define_property_from_function_info
-	  (ctx, finfo, struct_ref, FALSE);
+    JSObjectRef struct_ref;
+    JSObjectRef proto;
+    gint i, n_methods;
+    GIFunctionInfo* finfo;
+
+    struct_ref = JSObjectMake(ctx, seed_struct_constructor_class, info);
+    g_base_info_ref(info);
+
+    n_methods = g_struct_info_get_n_methods(info);
+
+    for (i = 0; i < n_methods; i++) {
+        GIFunctionInfoFlags flags;
+        finfo = g_struct_info_get_method(info, i);
+
+        flags = g_function_info_get_flags(finfo);
+
+        if (flags & GI_FUNCTION_IS_CONSTRUCTOR) {
+            JSObjectRef constructor
+              = JSObjectMake(ctx, gobject_named_constructor_class, finfo);
+            const gchar* fname = g_base_info_get_name((GIBaseInfo*) finfo);
+            if (g_strrstr(fname, "new_") == fname) {
+                // To be compatible with gjs, we need to have a method with
+                // new_, too.
+                seed_object_set_property(ctx, struct_ref, fname, constructor);
+                fname += 4;
+            }
+
+            else if (!g_strcmp0(fname, "new")) {
+                // To be compatible with gjs, we need to have new as function,
+                // too.
+                seed_object_set_property(ctx, struct_ref, fname, constructor);
+                fname = "c_new";
+            }
+
+            seed_object_set_property(ctx, struct_ref, fname, constructor);
+        } else if (flags & GI_FUNCTION_IS_METHOD)
+            g_base_info_unref((GIBaseInfo*) finfo);
+        else
+            seed_gobject_define_property_from_function_info(ctx, finfo,
+                                                            struct_ref, FALSE);
     }
 
-  proto = seed_struct_prototype (ctx, (GIBaseInfo *) info);
-  seed_object_set_property (ctx, struct_ref, "prototype", proto);
+    proto = seed_struct_prototype(ctx, (GIBaseInfo*) info);
+    seed_object_set_property(ctx, struct_ref, "prototype", proto);
 
-  seed_object_set_property (ctx, namespace_ref,
-			    g_base_info_get_name ((GIBaseInfo *) info),
-			    struct_ref);
+    seed_object_set_property(ctx, namespace_ref,
+                             g_base_info_get_name((GIBaseInfo*) info),
+                             struct_ref);
 }
 
 static void
-seed_gi_importer_handle_union (JSContextRef ctx,
-			       JSObjectRef namespace_ref,
-			       GIUnionInfo * info, JSValueRef * exception)
+seed_gi_importer_handle_union(JSContextRef ctx,
+                              JSObjectRef namespace_ref,
+                              GIUnionInfo* info,
+                              JSValueRef* exception)
 {
-  JSObjectRef union_ref;
-  JSObjectRef proto;
-  guint i, n_methods;
-  GIFunctionInfo *finfo;
+    JSObjectRef union_ref;
+    JSObjectRef proto;
+    guint i, n_methods;
+    GIFunctionInfo* finfo;
 
-  union_ref = JSObjectMake (ctx, seed_struct_constructor_class, info);
-  g_base_info_ref (info);
+    union_ref = JSObjectMake(ctx, seed_struct_constructor_class, info);
+    g_base_info_ref(info);
 
-  n_methods = g_union_info_get_n_methods (info);
+    n_methods = g_union_info_get_n_methods(info);
 
-  for (i = 0; i < n_methods; i++)
-    {
-      GIFunctionInfoFlags flags;
-      finfo = g_union_info_get_method (info, i);
+    for (i = 0; i < n_methods; i++) {
+        GIFunctionInfoFlags flags;
+        finfo = g_union_info_get_method(info, i);
 
-      flags = g_function_info_get_flags (finfo);
+        flags = g_function_info_get_flags(finfo);
 
-      if (flags & GI_FUNCTION_IS_METHOD)
-	g_base_info_unref ((GIBaseInfo *) finfo);
-      else
-	seed_gobject_define_property_from_function_info
-	  (ctx, finfo, union_ref, FALSE);
+        if (flags & GI_FUNCTION_IS_METHOD)
+            g_base_info_unref((GIBaseInfo*) finfo);
+        else
+            seed_gobject_define_property_from_function_info(ctx, finfo,
+                                                            union_ref, FALSE);
     }
 
-  proto = seed_union_prototype (ctx, (GIBaseInfo *) info);
-  seed_object_set_property (ctx, union_ref, "prototype", proto);
+    proto = seed_union_prototype(ctx, (GIBaseInfo*) info);
+    seed_object_set_property(ctx, union_ref, "prototype", proto);
 
-  seed_object_set_property (ctx, namespace_ref,
-			    g_base_info_get_name ((GIBaseInfo *) info),
-			    union_ref);
+    seed_object_set_property(ctx, namespace_ref,
+                             g_base_info_get_name((GIBaseInfo*) info),
+                             union_ref);
 }
 
 static void
-seed_gi_importer_handle_callback (JSContextRef ctx,
-				  JSObjectRef namespace_ref,
-				  GICallbackInfo * info,
-				  JSValueRef * exception)
+seed_gi_importer_handle_callback(JSContextRef ctx,
+                                 JSObjectRef namespace_ref,
+                                 GICallbackInfo* info,
+                                 JSValueRef* exception)
 {
-  JSObjectRef callback_ref = JSObjectMake (ctx,
-					   seed_callback_class,
-					   info);
-  seed_object_set_property (ctx, namespace_ref,
-			    g_base_info_get_name ((GIBaseInfo *) info),
-			    (JSValueRef) callback_ref);
+    JSObjectRef callback_ref = JSObjectMake(ctx, seed_callback_class, info);
+    seed_object_set_property(ctx, namespace_ref,
+                             g_base_info_get_name((GIBaseInfo*) info),
+                             (JSValueRef) callback_ref);
 }
 
 /*
  * Define constants toplevel. Uses the casing as in the typelib
  */
 static void
-seed_gi_importer_handle_constant (JSContextRef ctx,
-				  JSObjectRef namespace_ref,
-				  GIConstantInfo * info,
-				  JSValueRef * exception)
+seed_gi_importer_handle_constant(JSContextRef ctx,
+                                 JSObjectRef namespace_ref,
+                                 GIConstantInfo* info,
+                                 JSValueRef* exception)
 {
-  GArgument argument;
-  GITypeInfo *constant_type = g_constant_info_get_type (info);
-  JSValueRef constant_value;
-
-  g_constant_info_get_value (info, &argument);
-  constant_value =
-    seed_value_from_gi_argument (ctx, &argument, constant_type, exception);
-  seed_object_set_property (ctx, namespace_ref,
-			    g_base_info_get_name ((GIBaseInfo *) info),
-			    constant_value);
-
-  g_base_info_unref ((GIBaseInfo *) constant_type);
+    GArgument argument;
+    GITypeInfo* constant_type = g_constant_info_get_type(info);
+    JSValueRef constant_value;
+
+    g_constant_info_get_value(info, &argument);
+    constant_value
+      = seed_value_from_gi_argument(ctx, &argument, constant_type, exception);
+    seed_object_set_property(ctx, namespace_ref,
+                             g_base_info_get_name((GIBaseInfo*) info),
+                             constant_value);
+
+    g_base_info_unref((GIBaseInfo*) constant_type);
+    g_constant_info_free_value(info, &argument);
 }
 
-static gchar *
-seed_gi_importer_get_version (JSContextRef ctx,
-			      gchar * namespace, JSValueRef * exception)
+static gchar*
+seed_gi_importer_get_version(JSContextRef ctx,
+                             gchar* namespace,
+                             JSValueRef* exception)
 {
-  JSValueRef version_ref;
-  gchar *version = NULL;
+    JSValueRef version_ref;
+    gchar* version = NULL;
 
-  version_ref =
-    seed_object_get_property (ctx, gi_importer_versions, namespace);
-  if (!JSValueIsUndefined (ctx, version_ref))
-    version = seed_value_to_string (ctx, version_ref, exception);
+    version_ref
+      = seed_object_get_property(ctx, gi_importer_versions, namespace);
+    if (!JSValueIsUndefined(ctx, version_ref))
+        version = seed_value_to_string(ctx, version_ref, exception);
 
-  return version;
+    return version;
 }
 
 JSObjectRef
-seed_gi_importer_do_namespace (JSContextRef ctx,
-			       gchar * namespace, JSValueRef * exception)
+seed_gi_importer_do_namespace(JSContextRef ctx,
+                              gchar* namespace,
+                              JSValueRef* exception)
 {
-  GIBaseInfo *info;
-  JSObjectRef namespace_ref;
-  GError *e = NULL;
-  guint n, i;
-  gchar *version = NULL;
-  gchar *jsextension;
-  JSStringRef extension_script;
-
-  if (gi_imports == NULL)
-    gi_imports = g_hash_table_new (g_str_hash, g_str_equal);
-
-  if ((namespace_ref = g_hash_table_lookup (gi_imports, namespace)))
-    {
-      SEED_NOTE (IMPORTER, "Using existing namespace ref (%p) for %s",
-		 namespace_ref, namespace);
-      return namespace_ref;
+    GIBaseInfo* info;
+    JSObjectRef namespace_ref;
+    GError* e = NULL;
+    guint n, i;
+    gchar* version = NULL;
+    gchar* jsextension;
+    JSStringRef extension_script;
+
+    if (gi_imports == NULL)
+        gi_imports = g_hash_table_new(g_str_hash, g_str_equal);
+
+    if ((namespace_ref = g_hash_table_lookup(gi_imports, namespace))) {
+        SEED_NOTE(IMPORTER, "Using existing namespace ref (%p) for %s",
+                  namespace_ref, namespace);
+        return namespace_ref;
     }
 
-  if (gi_importer_versions != NULL)
-    version = seed_gi_importer_get_version (ctx, namespace, exception);
-  if (!g_irepository_require (NULL, namespace, version, 0, &e))
-    {
-      seed_make_exception_from_gerror (ctx, exception, e);
-      g_error_free (e);
-      g_free (version);
-      return NULL;
+    if (gi_importer_versions != NULL)
+        version = seed_gi_importer_get_version(ctx, namespace, exception);
+    if (!g_irepository_require(NULL, namespace, version, 0, &e)) {
+        seed_make_exception_from_gerror(ctx, exception, e);
+        g_error_free(e);
+        g_free(version);
+        return NULL;
     }
-  if (version != NULL)
-    g_free (version);
-
-  n = g_irepository_get_n_infos (NULL, namespace);
-
-  namespace_ref = JSObjectMake (ctx, NULL, NULL);
-  SEED_NOTE (IMPORTER, "Constructing namespace ref (%p) for %s",
-	     namespace_ref, namespace);
-
-  JSValueProtect (ctx, namespace_ref);
-
-  for (i = 0; i < n; i++)
-    {
-      GIInfoType info_type;
-
-      info = g_irepository_get_info (NULL, namespace, i);
-      info_type = g_base_info_get_type (info);
-
-      switch (info_type)
-	{
-	case GI_INFO_TYPE_FUNCTION:
-	  seed_gi_importer_handle_function (ctx, namespace_ref,
-					    (GIFunctionInfo *) info,
-					    exception);
-	  break;
-	case GI_INFO_TYPE_ENUM:
-	case GI_INFO_TYPE_FLAGS:
-	  seed_gi_importer_handle_enum (ctx, namespace_ref,
-					(GIEnumInfo *) info, exception);
-	  break;
-	case GI_INFO_TYPE_OBJECT:
-	  seed_gi_importer_handle_object (ctx, namespace_ref,
-					  (GIObjectInfo *) info, exception);
-	  break;
-	case GI_INFO_TYPE_STRUCT:
-	  seed_gi_importer_handle_struct (ctx, namespace_ref,
-					  (GIStructInfo *) info, exception);
-	  break;
-	case GI_INFO_TYPE_UNION:
-	  seed_gi_importer_handle_union (ctx, namespace_ref,
-					 (GIUnionInfo *) info, exception);
-	  break;
-	case GI_INFO_TYPE_CALLBACK:
-	  seed_gi_importer_handle_callback (ctx, namespace_ref,
-					    (GICallbackInfo *) info,
-					    exception);
-	  break;
-	case GI_INFO_TYPE_CONSTANT:
-	  seed_gi_importer_handle_constant (ctx, namespace_ref,
-					    (GIConstantInfo *) info,
-					    exception);
-	  break;
-	default:
-	  break;
-	}
-      g_base_info_unref (info);
+    if (version != NULL)
+        g_free(version);
+
+    n = g_irepository_get_n_infos(NULL, namespace);
+
+    namespace_ref = JSObjectMake(ctx, NULL, NULL);
+    SEED_NOTE(IMPORTER, "Constructing namespace ref (%p) for %s", namespace_ref,
+              namespace);
+
+    JSValueProtect(ctx, namespace_ref);
+
+    for (i = 0; i < n; i++) {
+        GIInfoType info_type;
+
+        info = g_irepository_get_info(NULL, namespace, i);
+        info_type = g_base_info_get_type(info);
+
+        switch (info_type) {
+            case GI_INFO_TYPE_FUNCTION:
+                seed_gi_importer_handle_function(ctx, namespace_ref,
+                                                 (GIFunctionInfo*) info,
+                                                 exception);
+                break;
+            case GI_INFO_TYPE_ENUM:
+            case GI_INFO_TYPE_FLAGS:
+                seed_gi_importer_handle_enum(ctx, namespace_ref,
+                                             (GIEnumInfo*) info, exception);
+                break;
+            case GI_INFO_TYPE_OBJECT:
+                seed_gi_importer_handle_object(ctx, namespace_ref,
+                                               (GIObjectInfo*) info, exception);
+                break;
+            case GI_INFO_TYPE_INTERFACE:
+                seed_gi_importer_handle_iface(ctx, namespace_ref,
+                                              (GIObjectInfo*) info, exception);
+                break;
+            case GI_INFO_TYPE_STRUCT:
+                seed_gi_importer_handle_struct(ctx, namespace_ref,
+                                               (GIStructInfo*) info, exception);
+                break;
+            case GI_INFO_TYPE_UNION:
+                seed_gi_importer_handle_union(ctx, namespace_ref,
+                                              (GIUnionInfo*) info, exception);
+                break;
+            case GI_INFO_TYPE_CALLBACK:
+                seed_gi_importer_handle_callback(ctx, namespace_ref,
+                                                 (GICallbackInfo*) info,
+                                                 exception);
+                break;
+            case GI_INFO_TYPE_CONSTANT:
+                seed_gi_importer_handle_constant(ctx, namespace_ref,
+                                                 (GIConstantInfo*) info,
+                                                 exception);
+                break;
+            default:
+                SEED_NOTE(IMPORTER, "Unhandled type %s for %s",
+                          g_info_type_to_string(info_type),
+                          g_base_info_get_name(info));
+                break;
+        }
+        g_base_info_unref(info);
     }
 
-  g_hash_table_insert (gi_imports, g_strdup (namespace), namespace_ref);
-
-  jsextension = g_strdup_printf ("imports.extensions.%s", namespace);
-  extension_script = JSStringCreateWithUTF8CString (jsextension);
-  JSEvaluateScript (ctx, extension_script, NULL, NULL, 0, exception);
-  JSStringRelease (extension_script);
-  g_free (jsextension);
+    g_hash_table_insert(gi_imports, g_strdup(namespace), namespace_ref);
 
+    jsextension = g_strdup_printf("imports.extensions.%s", namespace);
+    extension_script = JSStringCreateWithUTF8CString(jsextension);
+    JSEvaluateScript(ctx, extension_script, NULL, NULL, 0, exception);
+    JSStringRelease(extension_script);
+    g_free(jsextension);
 
-  return namespace_ref;
-
+    return namespace_ref;
 }
 
 static JSValueRef
-seed_gi_importer_get_property (JSContextRef ctx,
-			       JSObjectRef object,
-			       JSStringRef property_name,
-			       JSValueRef * exception)
+seed_gi_importer_get_property(JSContextRef ctx,
+                              JSObjectRef object,
+                              JSStringRef property_name,
+                              JSValueRef* exception)
 {
-  JSObjectRef ret;
-  guint len;
-  gchar *prop;
+    JSObjectRef ret;
+    guint len;
+    gchar* prop;
 
-  len = JSStringGetMaximumUTF8CStringSize (property_name);
-  prop = g_alloca (len * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, prop, len);
+    len = JSStringGetMaximumUTF8CStringSize(property_name);
+    prop = g_alloca(len * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, prop, len);
 
-  SEED_NOTE (IMPORTER, "seed_gi_importer_get_property with %s", prop);
+    SEED_NOTE(IMPORTER, "seed_gi_importer_get_property with %s", prop);
 
-  if (!g_strcmp0 (prop, "versions"))
-    return gi_importer_versions;
-  // Nasty hack
-  else if (!g_strcmp0 (prop, "toString"))
-    return 0;
-  if (!g_strcmp0 (prop, "valueOf"))	// HACK
-    return NULL;
+    if (!g_strcmp0(prop, "versions"))
+        return gi_importer_versions;
+    // Nasty hack
+    else if (!g_strcmp0(prop, "toString"))
+        return 0;
+    if (!g_strcmp0(prop, "valueOf")) // HACK
+        return NULL;
 
+    ret = seed_gi_importer_do_namespace(ctx, prop, exception);
+    SEED_NOTE(IMPORTER, "Result (%p) from attempting to import %s: %s", ret,
+              prop, seed_value_to_string(ctx, ret, exception));
 
-  ret = seed_gi_importer_do_namespace (ctx, prop, exception);
-  SEED_NOTE (IMPORTER, "Result (%p) from attempting to import %s: %s",
-	     ret, prop, seed_value_to_string (ctx, ret, exception));
+    return ret;
+}
 
-  return ret;
+gboolean
+seed_importer_get_file_contents(const gchar* filename,
+                                gchar** contents,
+                                gsize* length,
+                                GError** error)
+{
+    GBytes* bytes
+      = g_resources_lookup_data(filename, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
+    if (bytes) {
+        *contents = g_strdup(g_bytes_get_data(bytes, length));
+        g_bytes_unref(bytes);
+        return true;
+    }
+
+    return g_file_get_contents(filename, contents, length, error);
 }
 
 static JSObjectRef
-seed_make_importer_dir (JSContextRef ctx, gchar * path)
+seed_make_importer_dir(JSContextRef ctx, gchar* path)
 {
-  gchar *init;
-  JSObjectRef dir;
+    gchar* init;
+    JSObjectRef dir;
 
-  dir = JSObjectMake (ctx, importer_dir_class, path);
+    dir = JSObjectMake(ctx, importer_dir_class, path);
 
-  init = g_build_filename (path, "__init__.js", NULL);
-  if (g_file_test (init, G_FILE_TEST_IS_REGULAR))
-    {
-      SeedScript *s;
-      SEED_NOTE (IMPORTER, "Found __init__.js (%s)", path);
+    init = g_build_filename(path, "__init__.js", NULL);
+    if (seed_file_test(init, G_FILE_TEST_IS_REGULAR)) {
+        SeedScript* s;
+        SEED_NOTE(IMPORTER, "Found __init__.js (%s)", path);
 
-      s = seed_script_new_from_file (ctx, init);
-      seed_evaluate (ctx, s, dir);
-      seed_script_destroy (s);
+        s = seed_script_new_from_file(ctx, init);
+        seed_evaluate(ctx, s, dir);
+        seed_script_destroy(s);
     }
 
-  g_free (init);
-  return dir;
+    g_free(init);
+    return dir;
 }
 
 static void
-seed_importer_free_search_path (GSList * path)
+seed_importer_free_search_path(GSList* path)
 {
-  GSList *walk = path;
+    GSList* walk = path;
 
-  while (walk)
-    {
-      g_free (walk->data);
-      walk = walk->next;
+    while (walk) {
+        g_free(walk->data);
+        walk = walk->next;
     }
 
-  g_slist_free (path);
+    g_slist_free(path);
 }
 
-
-GSList *
-seed_importer_get_search_path (JSContextRef ctx, JSValueRef * exception)
+GSList*
+seed_importer_get_search_path(JSContextRef ctx, JSValueRef* exception)
 {
-  GSList *path = NULL;
-  gchar *entry;
-  JSValueRef search_path_ref, length_ref;
-  guint length, i;
-
-  search_path_ref = seed_object_get_property (ctx, importer, "searchPath");
-  if (!JSValueIsObject (ctx, search_path_ref))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Importer searchPath object is not an array");
-      return NULL;
+    GSList* path = NULL;
+    gchar* entry;
+    JSValueRef search_path_ref, length_ref;
+    guint length, i;
+
+    search_path_ref = seed_object_get_property(ctx, importer, "searchPath");
+    if (!JSValueIsObject(ctx, search_path_ref)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Importer searchPath object is not an array");
+        return NULL;
     }
 
-  length_ref =
-    seed_object_get_property (ctx, (JSObjectRef) search_path_ref, "length");
-  length = seed_value_to_uint (ctx, length_ref, exception);
+    length_ref
+      = seed_object_get_property(ctx, (JSObjectRef) search_path_ref, "length");
+    length = seed_value_to_uint(ctx, length_ref, exception);
 
-  for (i = 0; i < length; i++)
-    {
-      JSValueRef entry_ref;
+    for (i = 0; i < length; i++) {
+        JSValueRef entry_ref;
 
-      entry_ref =
-	JSObjectGetPropertyAtIndex (ctx, (JSObjectRef) search_path_ref, i,
-				    exception);
-      entry = seed_value_to_string (ctx, entry_ref, exception);
+        entry_ref
+          = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) search_path_ref, i,
+                                       exception);
+        entry = seed_value_to_string(ctx, entry_ref, exception);
 
-      if (g_file_test (entry, G_FILE_TEST_EXISTS) == TRUE)
-        path = g_slist_append (path, entry);
+        if (seed_file_test(entry, G_FILE_TEST_EXISTS) == TRUE)
+            path = g_slist_append(path, entry);
+        else {
+            g_free(entry);
+        }
     }
 
-  return path;
+    return path;
 }
 
 /* forward reference */
-static JSObjectRef
-seed_importer_handle_file (JSContextRef ctx,
-			   const gchar * dir,
-			   const gchar * file, 
-			   JSValueRef * exception);
-
-
+static JSObjectRef seed_importer_handle_file(JSContextRef ctx,
+                                             const gchar* dir,
+                                             const gchar* file,
+                                             const gchar* module_name,
+                                             JSValueRef* exception);
 
 static JSObjectRef
-seed_importer_handle_native_module (JSContextRef ctx,
-				    const gchar * dir,
-				    const gchar * prop,
-				    JSValueRef * exception)
+seed_importer_handle_native_module(JSContextRef ctx,
+                                   const gchar* dir,
+                                   const gchar* prop,
+                                   JSValueRef* exception)
 {
-  GModule *module;
-  JSObjectRef module_obj;
-  SeedModuleInitCallback init;
-  gchar *file_path = g_strconcat (dir, "/libseed_", prop, ".", G_MODULE_SUFFIX, NULL);
-
-  SEED_NOTE (IMPORTER, "Trying native module: %s", file_path);
-
-  if ((module_obj = g_hash_table_lookup (file_imports, file_path)))
-    {
-      SEED_NOTE (IMPORTER, "Using existing global");
-      g_free (file_path);
-      return module_obj;
+    GModule* module;
+    JSObjectRef module_obj;
+    SeedModuleInitCallback init;
+    gchar* file_path
+      = g_strconcat(dir, "/libseed_", prop, ".", G_MODULE_SUFFIX, NULL);
+
+    SEED_NOTE(IMPORTER, "Trying native module: %s", file_path);
+
+    if ((module_obj = g_hash_table_lookup(file_imports, file_path))) {
+        SEED_NOTE(IMPORTER, "Using existing global");
+        g_free(file_path);
+        return module_obj;
     }
 
-  module = g_module_open (file_path, 0);
+    module = g_module_open(file_path, 0);
 
-  if (!module)
-    {
-      // Could be a better exception
-      seed_make_exception (ctx, exception, "ModuleError",
-			   "Error loading native module at %s: %s",
-			   file_path, g_module_error ());
-      g_free (file_path);
+    if (!module) {
+        // Could be a better exception
+        seed_make_exception(ctx, exception, "ModuleError",
+                            "Error loading native module at %s: %s", file_path,
+                            g_module_error());
+        g_free(file_path);
 
-      return NULL;
+        return NULL;
     }
-  g_module_symbol (module, "seed_module_init", (gpointer *) & init);
-  module_obj = (*init) (eng);
-  g_hash_table_insert (file_imports, file_path, module_obj);
-  SEED_NOTE (IMPORTER, "Loaded native module");
-
-  //protect module_obj since the GC won't find the module in our file_imports cache
-  JSValueProtect (ctx, module_obj);
-  
-  file_path = g_strconcat ("libseed_", prop, ".js", NULL);
-  seed_importer_handle_file (ctx, dir, file_path, exception);
-  g_free (file_path);
-
-  return module_obj;
+    g_module_symbol(module, "seed_module_init", (gpointer*) &init);
+    module_obj = (*init)(eng);
+    g_hash_table_insert(file_imports, file_path, module_obj);
+    SEED_NOTE(IMPORTER, "Loaded native module");
+
+    // protect module_obj since the GC won't find the module in our file_imports
+    // cache
+    JSValueProtect(ctx, module_obj);
+
+    file_path = g_strconcat("libseed_", prop, ".js", NULL);
+    seed_importer_handle_file(ctx, dir, file_path, prop, exception);
+    g_free(file_path);
+
+    return module_obj;
 }
 
-static gchar *
-seed_importer_canonicalize_path (gchar * path)
+static gchar*
+seed_importer_canonicalize_path(gchar* path)
 {
-  GFile *file;
-  gchar *absolute_path;
+    GFile* file;
+    gchar* absolute_path;
 
-  file = g_file_new_for_path (path);
-  absolute_path = g_file_get_path (file);
-  g_object_unref (file);
+    file = g_file_new_for_path(path);
+    absolute_path = g_file_get_path(file);
+    g_object_unref(file);
 
-  return absolute_path;
+    return absolute_path;
 }
 
 static JSObjectRef
-seed_importer_handle_file (JSContextRef ctx,
-			   const gchar * dir,
-			   const gchar * file, JSValueRef * exception)
+seed_importer_handle_file(JSContextRef ctx,
+                          const gchar* dir,
+                          const gchar* file,
+                          const gchar* module_name,
+                          JSValueRef* exception)
 {
-  JSContextRef nctx;
-  JSValueRef js_file_dirname;
-  JSObjectRef global, c_global;
-  JSStringRef file_contents, file_name;
-  gchar *contents, *walk, *file_path, *canonical, *absolute_path, *normalp;
-  gchar *normalized_path;
-  gsize path_max;
-
-  file_path = g_build_filename (dir, file, NULL);
-  canonical = seed_importer_canonicalize_path (file_path);
-  SEED_NOTE (IMPORTER, "Trying to import file: %s", file_path);
-
-  if ((global = g_hash_table_lookup (file_imports, canonical)))
-    {
-      SEED_NOTE (IMPORTER, "Using existing global");
-
-      g_free (file_path);
-      g_free (canonical);
-      return global;
+    JSContextRef nctx;
+    JSValueRef js_file_dirname;
+    JSObjectRef global, c_global;
+    JSStringRef file_contents, file_name, initscript;
+    gchar *contents, *walk, *file_path, *canonical, *absolute_path;
+    char* normalized_path;
+
+    file_path = g_build_filename(dir, file, NULL);
+    canonical = seed_importer_canonicalize_path(file_path);
+    SEED_NOTE(IMPORTER, "Trying to import file: %s", file_path);
+
+    if ((global = g_hash_table_lookup(file_imports, canonical))) {
+        SEED_NOTE(IMPORTER, "Using existing global");
+
+        g_free(file_path);
+        g_free(canonical);
+        return global;
     }
 
-  if (!g_file_test (file_path, G_FILE_TEST_IS_REGULAR))
-    {
-      if (g_file_test (file_path, G_FILE_TEST_IS_DIR))
-	{
-	  SEED_NOTE (IMPORTER, "File is directory");
-	  return seed_make_importer_dir (ctx, file_path);
-	}
-      return NULL;
+    if (!seed_file_test(file_path, G_FILE_TEST_IS_REGULAR)) {
+        if (seed_file_test(file_path, G_FILE_TEST_IS_DIR)) {
+            SEED_NOTE(IMPORTER, "File is directory");
+            return seed_make_importer_dir(ctx, file_path);
+        }
+        return NULL;
     }
 
-  g_file_get_contents (file_path, &contents, 0, NULL);
-  walk = contents;
-  if (*walk == '#')
-    {
-      while (*walk != '\n')
-	walk++;
-      walk++;
+    seed_importer_get_file_contents(file_path, &contents, 0, NULL);
+    walk = contents;
+    if (*walk == '#') {
+        while (*walk != '\n')
+            walk++;
+        walk++;
     }
-  walk = g_strdup (walk);
-  g_free (contents);
+    walk = g_strdup(walk);
+    g_free(contents);
 
-  file_contents = JSStringCreateWithUTF8CString (walk);
-  file_name = JSStringCreateWithUTF8CString (canonical);
+    file_contents = JSStringCreateWithUTF8CString(walk);
+    file_name = JSStringCreateWithUTF8CString(canonical);
 
-  nctx = JSGlobalContextCreateInGroup (context_group, 0);
-  seed_prepare_global_context (nctx);
+    nctx = JSGlobalContextCreateInGroup(context_group, 0);
+    seed_prepare_global_context(nctx);
 
-  global = JSContextGetGlobalObject (nctx);
-  c_global = JSContextGetGlobalObject (ctx);
-  JSValueProtect (eng->context, global);
+    global = JSContextGetGlobalObject(nctx);
+    c_global = JSContextGetGlobalObject(ctx);
+    JSValueProtect(eng->context, global);
 
-  absolute_path = g_path_get_dirname (file_path);
-  if (!g_path_is_absolute (absolute_path))
-    {
-      g_free (absolute_path);
-      absolute_path = g_build_filename (g_get_current_dir (),
-					g_path_get_dirname (file_path), NULL);
+    absolute_path = g_path_get_dirname(file_path);
+    if (!g_path_is_absolute(absolute_path)) {
+        g_free(absolute_path);
+        absolute_path = g_build_filename(g_get_current_dir(),
+                                         g_path_get_dirname(file_path), NULL);
     }
 
-#ifdef PATH_MAX
-  path_max = PATH_MAX;
-#else
-  path_max = pathconf (absolute_path, _PC_PATH_MAX);
-  if (path_max <= 0)
-    path_max = 4096;
-#endif
-  normalized_path = (gchar *) g_malloc (path_max);
-  normalp = realpath (absolute_path, normalized_path);
+    normalized_path = realpath(absolute_path, NULL);
+
+    js_file_dirname = seed_value_from_string(ctx, normalized_path, NULL);
 
-  js_file_dirname = seed_value_from_string (ctx, normalp, NULL);
+    seed_object_set_property(nctx, global, "__script_path__", js_file_dirname);
 
-  seed_object_set_property (nctx, global, "__script_path__", js_file_dirname);
+    g_hash_table_insert(file_imports, canonical, global);
+    g_free(file_path);
+    g_free(absolute_path);
+    g_free(normalized_path);
 
-  g_hash_table_insert (file_imports, canonical, global);
-  g_free (file_path);
-  g_free (absolute_path);
-  g_free (normalized_path);
+    JSEvaluateScript(nctx, file_contents, NULL, file_name, 0, exception);
 
-  JSEvaluateScript (nctx, file_contents, NULL, file_name, 0, exception);
+    if (gi_imports && g_hash_table_lookup(gi_imports, module_name)) {
+        SEED_NOTE(IMPORTER, "Calling %s_init():", module_name);
+        gchar* initstr = g_strdup_printf(
+          "if (typeof(_init) === \"function\") { _init.apply(imports.gi.%s)}",
+          module_name);
+        initscript = JSStringCreateWithUTF8CString(initstr);
+        JSEvaluateScript(nctx, initscript, NULL, file_name, 0, exception);
+        JSStringRelease(initscript);
+        g_free(initstr);
+    }
 
-  // Does leak...but it's a debug statement.
-  SEED_NOTE (IMPORTER, "Evaluated file, exception: %s",
-	     *exception ? seed_exception_to_string (ctx,
-						    *exception) : "(null)");
+    // Does leak...but it's a debug statement.
+    SEED_NOTE(IMPORTER, "Evaluated file, exception: %s",
+              *exception ? seed_exception_to_string(ctx, *exception)
+                         : "(null)");
 
-  JSGlobalContextRelease ((JSGlobalContextRef) nctx);
+    JSGlobalContextRelease((JSGlobalContextRef) nctx);
 
-  JSStringRelease (file_contents);
-  JSStringRelease (file_name);
-  g_free (walk);
+    JSStringRelease(file_contents);
+    JSStringRelease(file_name);
+    g_free(walk);
 
-  return global;
+    return global;
 }
 
 static JSObjectRef
-seed_importer_search_dirs (JSContextRef ctx, GSList *path, gchar *prop, JSValueRef *exception)
+seed_importer_try_load(JSContextRef ctx,
+                       const gchar* test_path,
+                       const gchar* script_path,
+                       const gchar* prop,
+                       const gchar* prop_as_js,
+                       const gchar* prop_as_lib,
+                       JSValueRef* exception)
 {
-    GSList *walk;
+    gchar* file_path = NULL;
+    JSObjectRef ret = NULL;
+    // replace '.' with current script_path if not null
+    if (script_path && !g_strcmp0(".", test_path))
+        test_path = script_path;
+
+    // check if prop is a file or dir (imports['foo.js'] or imports.mydir)
+    file_path = g_build_filename(test_path, prop, NULL);
+    if (seed_file_test(file_path,
+                       G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_DIR)) {
+        ret = seed_importer_handle_file(ctx, test_path, prop, prop, exception);
+        g_free(file_path);
+        return ret;
+    }
+    g_free(file_path);
+
+    // check if prop is file ending with '.js'
+    file_path = g_build_filename(test_path, prop_as_js, NULL);
+    if (seed_file_test(file_path, G_FILE_TEST_IS_REGULAR)) {
+        ret = seed_importer_handle_file(ctx, test_path, prop_as_js, prop,
+                                        exception);
+        g_free(file_path);
+        return ret;
+    }
+    g_free(file_path);
+
+    // check if file is native module
+    file_path = g_build_filename(test_path, prop_as_lib, NULL);
+    if (seed_file_test(file_path, G_FILE_TEST_IS_REGULAR)) {
+        ret
+          = seed_importer_handle_native_module(ctx, test_path, prop, exception);
+        g_free(file_path);
+        return ret;
+    }
+    g_free(file_path);
+
+    return ret;
+}
+
+static JSObjectRef
+seed_importer_search_dirs(JSContextRef ctx,
+                          GSList* path,
+                          gchar* prop,
+                          JSValueRef* exception)
+{
+    GSList* walk;
     JSObjectRef ret, global;
     JSValueRef script_path_prop;
     gchar *prop_as_lib, *prop_as_js, *script_path;
 
-    prop_as_lib = g_strconcat ("libseed_", prop, ".", G_MODULE_SUFFIX, NULL);
-    prop_as_js = g_strconcat (prop, ".js", NULL);
+    prop_as_lib = g_strconcat("libseed_", prop, ".", G_MODULE_SUFFIX, NULL);
+    prop_as_js = g_strconcat(prop, ".js", NULL);
 
-    // get the current script_path      
-    global = JSContextGetGlobalObject (ctx);
-    script_path_prop = seed_object_get_property (ctx, global, "__script_path__");
-    if (script_path_prop==NULL || JSValueIsUndefined (ctx, script_path_prop))
+    // get the current script_path
+    global = JSContextGetGlobalObject(ctx);
+    script_path_prop = seed_object_get_property(ctx, global, "__script_path__");
+    if (script_path_prop == NULL || JSValueIsUndefined(ctx, script_path_prop))
         script_path = NULL;
     else
-        script_path = seed_value_to_string (ctx, script_path_prop, exception);
+        script_path = seed_value_to_string(ctx, script_path_prop, exception);
 
     ret = NULL;
     walk = path;
     while (walk) {
-        gchar *test_path = walk->data;
-        gchar *file_path;
-        
-        // replace '.' with current script_path if not null
-        if(script_path && !g_strcmp0(".",test_path))
-            test_path = script_path;
-
-        // check if prop is a file or dir (imports['foo.js'] or imports.mydir)
-        file_path = g_build_filename (test_path, prop, NULL);
-        if (g_file_test (file_path, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_DIR)) {
-            ret = seed_importer_handle_file (ctx, test_path, prop, exception);
-            g_free (file_path);
-            break;
-        }
-        g_free (file_path);
+        gchar* test_path = g_strconcat(walk->data, "/gjs", NULL);
 
-        // check if prop is file ending with '.js'
-        file_path = g_build_filename (test_path, prop_as_js, NULL);
-        if (g_file_test (file_path, G_FILE_TEST_IS_REGULAR)) {
-            ret = seed_importer_handle_file (ctx, test_path, prop_as_js, exception);
-            g_free (file_path);
-            break;
-        }
-        g_free (file_path);
-      
-        // check if file is native module
-        file_path = g_build_filename (test_path, prop_as_lib, NULL);
-        if (g_file_test (file_path, G_FILE_TEST_IS_REGULAR)) {
-            ret = seed_importer_handle_native_module (ctx, test_path, prop, exception);
-            g_free (file_path);
+        ret = seed_importer_try_load(ctx, test_path, script_path, prop,
+                                     prop_as_js, prop_as_lib, exception);
+        g_free(test_path);
+        walk = walk->next;
+
+        if (ret)
             break;
-        }
-        g_free (file_path);
+    }
+    if (!ret) {
+        walk = path;
+        while (walk) {
+            gchar* test_path = walk->data;
 
-        walk = walk->next;
+            ret = seed_importer_try_load(ctx, test_path, script_path, prop,
+                                         prop_as_js, prop_as_lib, exception);
+            walk = walk->next;
+
+            if (ret)
+                break;
+        }
     }
 
-    g_free (prop_as_lib);
-    g_free (prop_as_js);
-    g_free (script_path);
-    
+    g_free(prop_as_lib);
+    g_free(prop_as_js);
+    g_free(script_path);
+
     return ret;
 }
 
 static JSObjectRef
-seed_importer_search (JSContextRef ctx, gchar *prop, JSValueRef *exception)
+seed_importer_search(JSContextRef ctx, gchar* prop, JSValueRef* exception)
 {
+
     JSObjectRef ret = NULL;
-    GSList *path = seed_importer_get_search_path (ctx, exception);
-    ret = seed_importer_search_dirs (ctx, path, prop, exception);
-    seed_importer_free_search_path (path);
+    GSList* path = seed_importer_get_search_path(ctx, exception);
+    ret = seed_importer_search_dirs(ctx, path, prop, exception);
+    seed_importer_free_search_path(path);
     return ret;
 }
 
 static JSValueRef
-seed_importer_get_property (JSContextRef ctx,
-			    JSObjectRef object,
-			    JSStringRef property_name, JSValueRef * exception)
+seed_importer_get_property(JSContextRef ctx,
+                           JSObjectRef object,
+                           JSStringRef property_name,
+                           JSValueRef* exception)
 {
-  JSValueRef ret;
-  guint len;
-  gchar *prop;
+    JSValueRef ret;
+    guint len;
+    gchar* prop;
 
-  len = JSStringGetMaximumUTF8CStringSize (property_name);
-  prop = g_alloca (len * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, prop, len);
+    len = JSStringGetMaximumUTF8CStringSize(property_name);
+    prop = g_alloca(len * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, prop, len);
 
-  if (!g_strcmp0 (prop, "gi"))
-    return gi_importer;
-  if (!g_strcmp0 (prop, "searchPath"))
-    return NULL;
-  if (!g_strcmp0 (prop, "toString"))	// HACK
-    return NULL;
+    if (!g_strcmp0(prop, "gi"))
+        return gi_importer;
+    if (!g_strcmp0(prop, "searchPath"))
+        return NULL;
+    if (!g_strcmp0(prop, "toString")) // HACK
+        return NULL;
 
-  ret = seed_importer_search (ctx, prop, exception);
+    ret = seed_importer_search(ctx, prop, exception);
 
-  return ret;
+    return ret;
 }
 
 static JSValueRef
-seed_importer_dir_get_property (JSContextRef ctx,
+seed_importer_dir_get_property(JSContextRef ctx,
                                JSObjectRef object,
                                JSStringRef property_name,
-                               JSValueRef * exception)
+                               JSValueRef* exception)
 {
     guint len;
-    gchar *prop;
+    gchar* prop;
     GSList path;
 
-    path.data = JSObjectGetPrivate (object);
+    path.data = JSObjectGetPrivate(object);
     path.next = NULL;
 
-    len = JSStringGetMaximumUTF8CStringSize (property_name);
-    prop = g_alloca (len * sizeof (gchar));
-    JSStringGetUTF8CString (property_name, prop, len);
+    len = JSStringGetMaximumUTF8CStringSize(property_name);
+    prop = g_alloca(len * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, prop, len);
 
-    /* These prevent print(imports.somefile) running "somefile/toString.js" 
+    /* These prevent print(imports.somefile) running "somefile/toString.js"
        Which is more than a little unexpected.. */
 
-    if (!g_strcmp0 (prop, "toString"))
+    if (!g_strcmp0(prop, "toString"))
         return NULL;
-    if (!g_strcmp0 (prop, "valueOf"))
+    if (!g_strcmp0(prop, "valueOf"))
         return NULL;
-    
+
     return seed_importer_search_dirs(ctx, &path, prop, exception);
 }
 
 static void
-seed_importer_dir_finalize (JSObjectRef dir)
+seed_importer_dir_finalize(JSObjectRef dir)
 {
-  gchar *dir_path = (gchar *) JSObjectGetPrivate (dir);
-  g_free (dir_path);
+    gchar* dir_path = (gchar*) JSObjectGetPrivate(dir);
+    g_free(dir_path);
 }
 
 void
-seed_importer_add_global (JSObjectRef global, gchar * name)
+seed_importer_add_global(JSObjectRef global, gchar* name)
 {
-  JSValueProtect (eng->context, global);
-  g_hash_table_insert (file_imports, seed_importer_canonicalize_path (name),
-		       global);
+    JSValueProtect(eng->context, global);
+    g_hash_table_insert(file_imports, seed_importer_canonicalize_path(name),
+                        global);
 }
 
 static void
-seed_importer_dir_enumerate_properties (JSContextRef ctx,
-					JSObjectRef object,
-					JSPropertyNameAccumulatorRef
-					propertyNames)
+seed_importer_dir_enumerate_properties(
+  JSContextRef ctx,
+  JSObjectRef object,
+  JSPropertyNameAccumulatorRef propertyNames)
 {
-  const gchar *entry;
-  GDir *dir;
-  GError *e = NULL;
-  gchar *path = JSObjectGetPrivate (object);
-
-
-  dir = g_dir_open (path, 0, &e);
-  if (e)
-    {
-      SEED_NOTE (IMPORTER,
-		 "Error in g_dir_open in seed_importer_enumerate_dir_properties: %s",
-		 e->message);
-      g_error_free (e);
-      // Not much we can do here.
-      return;
+    const gchar* entry;
+    GDir* dir;
+    GError* e = NULL;
+    gchar* path = JSObjectGetPrivate(object);
+
+    dir = g_dir_open(path, 0, &e);
+    if (e) {
+        SEED_NOTE(
+          IMPORTER,
+          "Error in g_dir_open in seed_importer_enumerate_dir_properties: %s",
+          e->message);
+        g_error_free(e);
+        // Not much we can do here.
+        return;
     }
 
-  while ((entry = g_dir_read_name (dir)))
-    {
-      JSStringRef jname;
+    while ((entry = g_dir_read_name(dir))) {
+        JSStringRef jname;
 
-      jname = JSStringCreateWithUTF8CString (entry);
-      JSPropertyNameAccumulatorAddName (propertyNames, jname);
-      JSStringRelease (jname);
+        jname = JSStringCreateWithUTF8CString(entry);
+        JSPropertyNameAccumulatorAddName(propertyNames, jname);
+        JSStringRelease(jname);
     }
-  g_dir_close (dir);
+    g_dir_close(dir);
 }
 
 JSObjectRef
-seed_importer_construct_dir (JSContextRef ctx,
-			     JSObjectRef constructor,
-			     gsize argumentCount,
-			     const JSValueRef arguments[],
-			     JSValueRef * exception)
+seed_importer_construct_dir(JSContextRef ctx,
+                            JSObjectRef constructor,
+                            gsize argumentCount,
+                            const JSValueRef arguments[],
+                            JSValueRef* exception)
 {
-  gchar *path;
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Directory constructor expects 1 argument");
-      return (JSObjectRef) JSValueMakeUndefined (ctx);
+    gchar* path;
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Directory constructor expects 1 argument");
+        return (JSObjectRef) JSValueMakeUndefined(ctx);
     }
-  path = seed_value_to_string (ctx, arguments[0], exception);
-
-  if (!g_file_test (path, G_FILE_TEST_IS_DIR))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Path (%s) is not a directory", path);
-      g_free (path);
-      return (JSObjectRef) JSValueMakeUndefined (ctx);
+    path = seed_value_to_string(ctx, arguments[0], exception);
+
+    if (!seed_file_test(path, G_FILE_TEST_IS_DIR)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Path (%s) is not a directory", path);
+        g_free(path);
+        return (JSObjectRef) JSValueMakeUndefined(ctx);
     }
 
-  return seed_make_importer_dir (ctx, path);
+    return seed_make_importer_dir(ctx, path);
 }
 
 void
-seed_importer_set_search_path (JSContextRef ctx, gchar ** search_path)
+seed_importer_set_search_path(JSContextRef ctx, gchar** search_path)
 {
-  JSObjectRef imports, array;
-  JSValueRef *array_elem;
-  guint length = g_strv_length (search_path), i;
-
-  array_elem = g_alloca (length * sizeof (array_elem));
-  imports =
-    (JSObjectRef) seed_object_get_property (ctx,
-					    JSContextGetGlobalObject (ctx),
-					    "imports");
-
-  for (i = 0; i < length; i++)
-    {
-      array_elem[i] = seed_value_from_string (ctx, search_path[i], NULL);
+    JSObjectRef imports, array;
+    JSValueRef* array_elem;
+    guint length = g_strv_length(search_path), i;
+
+    array_elem = g_alloca(length * sizeof(array_elem));
+    imports
+      = (JSObjectRef) seed_object_get_property(ctx,
+                                               JSContextGetGlobalObject(ctx),
+                                               "imports");
+
+    for (i = 0; i < length; i++) {
+        array_elem[i] = seed_value_from_string(ctx, search_path[i], NULL);
     }
 
-  array = JSObjectMakeArray (ctx, length, array_elem, NULL);
-  seed_object_set_property (ctx, imports, "searchPath", array);
+    array = JSObjectMakeArray(ctx, length, array_elem, NULL);
+    seed_object_set_property(ctx, imports, "searchPath", array);
 }
 
 void
-seed_importer_add_search_path (JSContextRef ctx, gchar *search_path)
+seed_importer_add_search_path(JSContextRef ctx, gchar* search_path)
 {
-  GSList *paths, *l;
-  GPtrArray *tmp;
+    GSList *paths, *l;
+    GPtrArray* tmp;
 
-  tmp = g_ptr_array_new ();
+    tmp = g_ptr_array_new();
 
-  paths = seed_importer_get_search_path (ctx, NULL);
-  for (l = paths; l != NULL; l = g_slist_next (l))
-    {
-      g_ptr_array_add (tmp, l->data);
+    paths = seed_importer_get_search_path(ctx, NULL);
+    for (l = paths; l != NULL; l = g_slist_next(l)) {
+        g_ptr_array_add(tmp, l->data);
     }
 
-  g_ptr_array_add (tmp, search_path);
-  g_ptr_array_add (tmp, NULL);
+    g_ptr_array_add(tmp, search_path);
+    g_ptr_array_add(tmp, NULL);
 
-  seed_importer_set_search_path (ctx, (gchar **) tmp->pdata);
+    seed_importer_set_search_path(ctx, (gchar**) tmp->pdata);
 
-  g_ptr_array_unref (tmp);
-  seed_importer_free_search_path (paths);
+    g_ptr_array_unref(tmp);
+    seed_importer_free_search_path(paths);
 }
 
 JSClassDefinition importer_class_def = {
-  0,				/* Version, always 0 */
-  0,
-  "importer",			/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,				/* Initialize */
-  NULL,				/* Finalize */
-  NULL,				/* Has Property */
-  seed_importer_get_property,	/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    0,
+    "importer",                 /* Class Name */
+    NULL,                       /* Parent Class */
+    NULL,                       /* Static Values */
+    NULL,                       /* Static Functions */
+    NULL,                       /* Initialize */
+    NULL,                       /* Finalize */
+    NULL,                       /* Has Property */
+    seed_importer_get_property, /* Get Property */
+    NULL,                       /* Set Property */
+    NULL,                       /* Delete Property */
+    NULL,                       /* Get Property Names */
+    NULL,                       /* Call As Function */
+    NULL,                       /* Call As Constructor */
+    NULL,                       /* Has Instance */
+    NULL                        /* Convert To Type */
 };
 
 JSClassDefinition gi_importer_class_def = {
-  0,				/* Version, always 0 */
-  0,
-  "gi_importer",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,				/* Initialize */
-  NULL,				/* Finalize */
-  NULL,				/* Has Property */
-  seed_gi_importer_get_property,	/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    0,
+    "gi_importer",                 /* Class Name */
+    NULL,                          /* Parent Class */
+    NULL,                          /* Static Values */
+    NULL,                          /* Static Functions */
+    NULL,                          /* Initialize */
+    NULL,                          /* Finalize */
+    NULL,                          /* Has Property */
+    seed_gi_importer_get_property, /* Get Property */
+    NULL,                          /* Set Property */
+    NULL,                          /* Delete Property */
+    NULL,                          /* Get Property Names */
+    NULL,                          /* Call As Function */
+    NULL,                          /* Call As Constructor */
+    NULL,                          /* Has Instance */
+    NULL                           /* Convert To Type */
 };
 
 JSClassDefinition importer_dir_class_def = {
-  0,				/* Version, always 0 */
-  0,
-  "importer_dir",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,				/* Initialize */
-  seed_importer_dir_finalize,	/* Finalize */
-  NULL,				/* Has Property */
-  seed_importer_dir_get_property,	/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  seed_importer_dir_enumerate_properties,	/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    0,
+    "importer_dir",                         /* Class Name */
+    NULL,                                   /* Parent Class */
+    NULL,                                   /* Static Values */
+    NULL,                                   /* Static Functions */
+    NULL,                                   /* Initialize */
+    seed_importer_dir_finalize,             /* Finalize */
+    NULL,                                   /* Has Property */
+    seed_importer_dir_get_property,         /* Get Property */
+    NULL,                                   /* Set Property */
+    NULL,                                   /* Delete Property */
+    seed_importer_dir_enumerate_properties, /* Get Property Names */
+    NULL,                                   /* Call As Function */
+    NULL,                                   /* Call As Constructor */
+    NULL,                                   /* Has Instance */
+    NULL                                    /* Convert To Type */
 };
 
+extern GResource* libseed_get_resource(void);
+
 void
-seed_initialize_importer (JSContextRef ctx, JSObjectRef global)
+seed_initialize_importer(JSContextRef ctx, JSObjectRef global)
 {
-  JSObjectRef dir_constructor;
+    JSObjectRef dir_constructor;
 
-  importer_class = JSClassCreate (&importer_class_def);
-  importer = JSObjectMake (ctx, importer_class, NULL);
+    importer_class = JSClassCreate(&importer_class_def);
+    importer = JSObjectMake(ctx, importer_class, NULL);
 
-  gi_importer_class = JSClassCreate (&gi_importer_class_def);
-  gi_importer = JSObjectMake (ctx, gi_importer_class, NULL);
-  gi_importer_versions = JSObjectMake (ctx, NULL, NULL);
+    gi_importer_class = JSClassCreate(&gi_importer_class_def);
+    gi_importer = JSObjectMake(ctx, gi_importer_class, NULL);
+    gi_importer_versions = JSObjectMake(ctx, NULL, NULL);
 
-  JSValueProtect (ctx, gi_importer);
-  JSValueProtect (ctx, gi_importer_versions);
+    JSValueProtect(ctx, gi_importer);
+    JSValueProtect(ctx, gi_importer_versions);
 
-  importer_dir_class = JSClassCreate (&importer_dir_class_def);
+    importer_dir_class = JSClassCreate(&importer_dir_class_def);
 
-  gi_imports = g_hash_table_new (g_str_hash, g_str_equal);
-  file_imports = g_hash_table_new (g_str_hash, g_str_equal);
+    gi_imports = g_hash_table_new(g_str_hash, g_str_equal);
+    file_imports = g_hash_table_new(g_str_hash, g_str_equal);
 
-  /* Passing nonnull for class requires a webkit fix that most people wont have yet. It also has minimal benefit */
-  //  dir_constructor = JSObjectMakeConstructor (ctx, importer_dir_class, seed_importer_construct_dir);
-  dir_constructor =
-    JSObjectMakeConstructor (ctx, NULL, seed_importer_construct_dir);
-  seed_object_set_property (ctx, importer, "Directory", dir_constructor);
+    /* Passing nonnull for class requires a webkit fix that most people wont
+     * have yet. It also has minimal benefit */
+    //  dir_constructor = JSObjectMakeConstructor (ctx, importer_dir_class,
+    //  seed_importer_construct_dir);
+    dir_constructor
+      = JSObjectMakeConstructor(ctx, NULL, seed_importer_construct_dir);
+    seed_object_set_property(ctx, importer, "Directory", dir_constructor);
 
-  seed_object_set_property (ctx, global, "imports", importer);
+    seed_object_set_property(ctx, global, "imports", importer);
 }
diff --git a/libseed/seed-importer.h b/libseed/seed-importer.h
index 8fb2e7a..9aa2309 100644
--- a/libseed/seed-importer.h
+++ b/libseed/seed-importer.h
@@ -24,8 +24,14 @@
 
 extern JSObjectRef importer;
 
-void seed_initialize_importer (JSContextRef ctx, JSObjectRef global);
-JSObjectRef seed_gi_importer_do_namespace (JSContextRef ctx,
-                                           gchar * namespace, JSValueRef * exception);
+void seed_initialize_importer(JSContextRef ctx, JSObjectRef global);
+JSObjectRef seed_gi_importer_do_namespace(JSContextRef ctx,
+                                          gchar* namespace,
+                                          JSValueRef* exception);
+
+gboolean seed_importer_get_file_contents(const gchar* filename,
+                                         gchar** contents,
+                                         gsize* length,
+                                         GError** error);
 
 #endif
diff --git a/libseed/seed-module.h b/libseed/seed-module.h
index e8b7fd6..e704fb6 100644
--- a/libseed/seed-module.h
+++ b/libseed/seed-module.h
@@ -43,14 +43,13 @@
  *
  */
 
-#define CHECK_ARG_COUNT(name, argnum) \
-	if ( argument_count != argnum ) \
-	{ \
-		seed_make_exception (ctx, exception, "ArgumentError", \
-		                     "wrong number of arguments; expected %s, got %Zd", \
-		                     #argnum, argument_count); \
-		return seed_make_undefined (ctx); \
-	}
+#define CHECK_ARG_COUNT(name, argnum)                                          \
+    if (argument_count != argnum) {                                            \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "wrong number of arguments; expected %s, got %zd", \
+                            #argnum, argument_count);                          \
+        return seed_make_undefined(ctx);                                       \
+    }
 
 /**
  * DEFINE_ENUM_MEMBER:
@@ -64,9 +63,9 @@
  * &num;defines as well.
  *
  */
-#define DEFINE_ENUM_MEMBER(holder, member) \
-	seed_object_set_property(ctx, holder, #member, \
-	                         seed_value_from_long(ctx, member, NULL))
+#define DEFINE_ENUM_MEMBER(holder, member)                                     \
+    seed_object_set_property(ctx, holder, #member,                             \
+                             seed_value_from_long(ctx, member, NULL))
 
 /**
  * DEFINE_ENUM_MEMBER_EXT:
@@ -85,8 +84,8 @@
  * </programlisting>
  *
  */
-#define DEFINE_ENUM_MEMBER_EXT(holder, name, val) \
-	seed_object_set_property(ctx, holder, name, \
-	                         seed_value_from_long(ctx, val, NULL))
+#define DEFINE_ENUM_MEMBER_EXT(holder, name, val)                              \
+    seed_object_set_property(ctx, holder, name,                                \
+                             seed_value_from_long(ctx, val, NULL))
 
 #endif
diff --git a/libseed/seed-path.h b/libseed/seed-path.h
index 73bb65c..876a5c7 100644
--- a/libseed/seed-path.h
+++ b/libseed/seed-path.h
@@ -1 +1 @@
-#define SEED_PREFIX_PATH "/usr/local""/share/seed-gtk3/"
+#define SEED_PREFIX_PATH "/home/danilo/webkitinstall""/share/seed-gtk4/"
diff --git a/libseed/seed-private.h b/libseed/seed-private.h
index c60ac38..880a6c6 100644
--- a/libseed/seed-private.h
+++ b/libseed/seed-private.h
@@ -36,11 +36,12 @@ typedef struct _SeedEngine SeedEngine;
 
 struct _SeedEngine
 {
-  JSGlobalContextRef context;
-  JSObjectRef global;
-  gchar **search_path;
+    JSGlobalContextRef context;
+    JSObjectRef global;
+    gchar** search_path;
 
-  JSContextGroupRef group;
+    JSContextGroupRef group;
+    gchar* program_name;
 };
 
 #include "seed-debug.h"
diff --git a/libseed/seed-signals.c b/libseed/seed-signals.c
index f1bbddc..4e31275 100644
--- a/libseed/seed-signals.c
+++ b/libseed/seed-signals.c
@@ -22,444 +22,420 @@
 
 typedef struct _signal_privates
 {
-  GObject *object;
-  gchar *signal_name;
+    GObject* object;
+    gchar* signal_name;
 } signal_privates;
 
 JSClassRef signal_holder_class;
 
 static void
-seed_signal_finalize (JSObjectRef object)
+seed_signal_finalize(JSObjectRef object)
 {
-  signal_privates *sig_priv = JSObjectGetPrivate (object);
+    signal_privates* sig_priv = JSObjectGetPrivate(object);
 
-  g_free (sig_priv->signal_name);
-  g_slice_free1 (sizeof (signal_privates), sig_priv);
+    g_free(sig_priv->signal_name);
+    g_slice_free1(sizeof(signal_privates), sig_priv);
 }
 
-
 gulong
-seed_gobject_signal_connect (JSContextRef ctx,
-			     const gchar * signal_name,
-			     GObject * on_obj,
-			     JSObjectRef func,
-			     JSObjectRef this_obj, JSObjectRef user_data)
+seed_gobject_signal_connect(JSContextRef ctx,
+                            const gchar* signal_name,
+                            GObject* on_obj,
+                            JSObjectRef func,
+                            JSObjectRef this_obj,
+                            JSObjectRef user_data)
 {
-  GSignalQuery query;
-  GClosure *closure;
+    GSignalQuery query;
+    GClosure* closure;
 
-  if (g_str_has_prefix (signal_name, "notify::"))
-    g_signal_query (g_signal_lookup ("notify", G_OBJECT_TYPE (on_obj)),
-                    &query);
-  else
-    g_signal_query (g_signal_lookup (signal_name, G_OBJECT_TYPE (on_obj)),
-                    &query);
+    if (g_str_has_prefix(signal_name, "notify::"))
+        g_signal_query(g_signal_lookup("notify", G_OBJECT_TYPE(on_obj)),
+                       &query);
+    else
+        g_signal_query(g_signal_lookup(signal_name, G_OBJECT_TYPE(on_obj)),
+                       &query);
 
 #ifdef SEED_ENABLE_DEBUG
-  {
-    guint function_arity = seed_value_to_uint (ctx,
-					       seed_object_get_property (ctx,
-									 func,
-									 "length"),
-					       NULL);
-    if (function_arity != query.n_params)
-      {
-	SEED_MARK ();
-	SEED_NOTE (SIGNAL,
-		   "Connecting signal: %s. Function has arity %d, signal expects %d",
-		   query.signal_name, function_arity, query.n_params);
-	SEED_MARK ();
-      }
-  }
+    {
+        guint function_arity
+          = seed_value_to_uint(ctx,
+                               seed_object_get_property(ctx, func, "length"),
+                               NULL);
+        if (function_arity != query.n_params) {
+            SEED_MARK();
+            SEED_NOTE(
+              SIGNAL,
+              "Connecting signal: %s. Function has arity %d, signal expects %d",
+              query.signal_name, function_arity, query.n_params);
+            SEED_MARK();
+        }
+    }
 #endif
 
-  closure = seed_closure_new_for_signal (ctx, func, user_data, "signal handler", query.signal_id);
+    closure = seed_closure_new_for_signal(ctx, func, user_data,
+                                          "signal handler", query.signal_id);
 
-  // This seems wrong...
-  ((SeedClosure *) closure)->return_type = query.return_type;
-  return g_signal_connect_closure (on_obj, signal_name, closure, FALSE);
+    // This seems wrong...
+    ((SeedClosure*) closure)->return_type = query.return_type;
+    return g_signal_connect_closure(on_obj, signal_name, closure, FALSE);
 }
 
-static JSValueRef
-seed_gobject_signal_connect_by_name (JSContextRef ctx,
-				     JSObjectRef function,
-				     JSObjectRef thisObject,
-				     size_t argumentCount,
-				     const JSValueRef arguments[],
-				     JSValueRef * exception)
+JSValueRef
+seed_gobject_signal_connect_by_name(JSContextRef ctx,
+                                    JSObjectRef function,
+                                    JSObjectRef thisObject,
+                                    size_t argumentCount,
+                                    const JSValueRef arguments[],
+                                    JSValueRef* exception)
 {
-  GType obj_type;
-  JSObjectRef user_data = NULL;
-  gchar *signal_name;
-  GObject *obj;
-  gulong id;
-
-  if (argumentCount < 2 || argumentCount > 3)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal connection expected"
-			   " 2 or 3 arguments. Got " "%zd", argumentCount);
-
-      return JSValueMakeNull (ctx);
+    JSObjectRef user_data = NULL;
+    gchar* signal_name;
+    GObject* obj;
+    gulong id;
+
+    if (argumentCount < 2 || argumentCount > 3) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal connection expected"
+                            " 2 or 3 arguments. Got "
+                            "%zd",
+                            argumentCount);
+
+        return JSValueMakeNull(ctx);
     }
 
-  if (JSValueIsNull (ctx, arguments[1]) ||
-      !JSValueIsObject (ctx, arguments[1]) ||
-      !JSObjectIsFunction (ctx, (JSObjectRef) arguments[1]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal connection by name "
-			   "requires a function" " as second argument");
-      return JSValueMakeNull (ctx);
+    if (JSValueIsNull(ctx, arguments[1]) || !JSValueIsObject(ctx, arguments[1])
+        || !JSObjectIsFunction(ctx, (JSObjectRef) arguments[1])) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal connection by name "
+                            "requires a function"
+                            " as second argument");
+        return JSValueMakeNull(ctx);
     }
 
-  if (argumentCount == 3)
-    {
-      user_data = (JSObjectRef) arguments[2];
+    if (argumentCount == 3) {
+        user_data = (JSObjectRef) arguments[2];
     }
 
-  signal_name = seed_value_to_string (ctx, arguments[0], exception);
-  obj = (GObject *) JSObjectGetPrivate (thisObject);
-  obj_type = G_OBJECT_TYPE (obj);
+    signal_name = seed_value_to_string(ctx, arguments[0], exception);
+    obj = (GObject*) JSObjectGetPrivate(thisObject);
 
-  id = seed_gobject_signal_connect (ctx, signal_name, obj,
-				    (JSObjectRef) arguments[1], NULL,
-				    user_data);
+    id = seed_gobject_signal_connect(ctx, signal_name, obj,
+                                     (JSObjectRef) arguments[1], NULL,
+                                     user_data);
 
-  g_free (signal_name);
+    g_free(signal_name);
 
-  return seed_value_from_ulong (ctx, id, exception);
+    return seed_value_from_ulong(ctx, id, exception);
 }
 
 void
-seed_add_signals_to_object (JSContextRef ctx,
-			    JSObjectRef object_ref, GObject * obj)
+seed_add_signals_to_object(JSContextRef ctx,
+                           JSObjectRef object_ref,
+                           GObject* obj)
 {
-  GType type;
-  JSObjectRef signals_ref;
+    g_assert(obj);
 
-  g_assert (obj);
+    JSObjectRef signals_ref;
 
-  type = G_OBJECT_TYPE (obj);
+    signals_ref = JSObjectMake(ctx, signal_holder_class, obj);
 
-  signals_ref = JSObjectMake (ctx, signal_holder_class, obj);
-
-  seed_object_set_property (ctx, object_ref, "signal", signals_ref);
+    seed_object_set_property(ctx, object_ref, "signal", signals_ref);
 }
 
 void
-seed_signal_marshal_func (GClosure * closure,
-			  GValue * return_value,
-			  guint n_param_values,
-			  const GValue * param_values,
-			  gpointer invocation_hint, gpointer marshal_data)
+seed_signal_marshal_func(GClosure* closure,
+                         GValue* return_value,
+                         guint n_param_values,
+                         const GValue* param_values,
+                         gpointer invocation_hint,
+                         gpointer marshal_data)
 {
-  SeedClosure *seed_closure = (SeedClosure *) closure;
-  JSValueRef *args, exception = 0;
-  JSValueRef ret = 0;
-  guint i;
-  gchar *mes;
-  GSignalQuery signal_query = { 0, };
-
-  if (marshal_data)
-    {
-      /* Inspired from gjs/gi/value.c:closure_marshal() */
-      /* we are used for a signal handler */
-      guint signal_id;
-
-      signal_id = GPOINTER_TO_UINT(marshal_data);
-
-      g_signal_query(signal_id, &signal_query);
-
-      if (!signal_query.signal_id)
-          g_error("Signal handler being called on invalid signal");
-
-      if (signal_query.n_params + 1 != n_param_values)
-          g_error("Signal handler being called with wrong number of parameters");
-  }
-
-  JSContextRef ctx = JSGlobalContextCreateInGroup (context_group,
-						   0);
+    SeedClosure* seed_closure = (SeedClosure*) closure;
+    JSValueRef *args, exception = 0;
+    JSValueRef ret = 0;
+    guint i;
+    gchar* mes;
+    GSignalQuery signal_query = {
+        0,
+    };
+
+    if (marshal_data) {
+        /* Inspired from gjs/gi/value.c:closure_marshal() */
+        /* we are used for a signal handler */
+        guint signal_id;
+
+        signal_id = GPOINTER_TO_UINT(marshal_data);
+
+        g_signal_query(signal_id, &signal_query);
+
+        if (!signal_query.signal_id)
+            g_error("Signal handler being called on invalid signal");
+
+        if (signal_query.n_params + 1 != n_param_values)
+            g_error(
+              "Signal handler being called with wrong number of parameters");
+    }
 
-  seed_prepare_global_context (ctx);
-  SEED_NOTE (INVOCATION, "Signal Marshal: ");
+    JSContextRef ctx = JSGlobalContextCreateInGroup(context_group, 0);
 
-  args = g_newa (JSValueRef, n_param_values + 1);
+    seed_prepare_global_context(ctx);
+    SEED_NOTE(INVOCATION, "Signal Marshal: ");
 
-  for (i = 0; i < n_param_values; i++)
-    {
-      args[i] = seed_value_from_gvalue_for_signal (ctx,
-                    (GValue *) & param_values[i], 0, &signal_query, i);
+    args = g_newa(JSValueRef, n_param_values + 1);
 
-      if (!args[i])
-	g_error ("Error in signal marshal. "
-		 "Unable to convert argument of type: %s \n",
-		 g_type_name (param_values[i].g_type));
+    for (i = 0; i < n_param_values; i++) {
+        args[i]
+          = seed_value_from_gvalue_for_signal(ctx, (GValue*) &param_values[i],
+                                              0, &signal_query, i);
 
+        if (!args[i])
+            g_error("Error in signal marshal. "
+                    "Unable to convert argument of type: %s \n",
+                    g_type_name(param_values[i].g_type));
     }
 
-  if (seed_closure->user_data)
-    args[i] = seed_closure->user_data;
-  else
-    args[i] = JSValueMakeNull (ctx);
+    if (seed_closure->user_data)
+        args[i] = seed_closure->user_data;
+    else
+        args[i] = JSValueMakeNull(ctx);
 
-  ret = JSObjectCallAsFunction (ctx, seed_closure->function,
-				NULL, n_param_values + 1, args, &exception);
+    ret = JSObjectCallAsFunction(ctx, seed_closure->function, NULL,
+                                 n_param_values + 1, args, &exception);
 
-  if (exception)
-    {
-      seed_closure_warn_exception (closure, ctx, exception);
-      exception = NULL;
+    if (exception) {
+        seed_closure_warn_exception(closure, ctx, exception);
+        exception = NULL;
     }
 
-  if (ret && !JSValueIsNull (ctx, ret)
-      && (seed_closure->return_type != G_TYPE_NONE))
-    {
-      seed_value_to_gvalue (ctx, ret, seed_closure->return_type,
-			    return_value, &exception);
+    if (ret && !JSValueIsNull(ctx, ret)
+        && (seed_closure->return_type != G_TYPE_NONE)) {
+        seed_value_to_gvalue(ctx, ret, seed_closure->return_type, return_value,
+                             &exception);
     }
 
-  if (exception)
-    {
-      mes = seed_exception_to_string (ctx, exception);
-      g_warning ("Exception in signal handler return value. %s \n", mes);
-      g_free (mes);
+    if (exception) {
+        mes = seed_exception_to_string(ctx, exception);
+        g_warning("Exception in signal handler return value. %s \n", mes);
+        g_free(mes);
     }
 
-  JSGlobalContextRelease ((JSGlobalContextRef) ctx);
-  JSGarbageCollect(ctx);
-
+    JSGlobalContextRelease((JSGlobalContextRef) ctx);
+    JSGarbageCollect(ctx);
 }
 
 static JSValueRef
-seed_gobject_signal_emit (JSContextRef ctx,
-			  JSObjectRef function,
-			  JSObjectRef thisObject,
-			  size_t argumentCount,
-			  const JSValueRef arguments[],
-			  JSValueRef * exception)
+seed_gobject_signal_emit(JSContextRef ctx,
+                         JSObjectRef function,
+                         JSObjectRef thisObject,
+                         size_t argumentCount,
+                         const JSValueRef arguments[],
+                         JSValueRef* exception)
 {
-  JSValueRef ret;
-  GValue *params;
-  GValue ret_value = { 0 };
-  GSignalQuery query;
+    JSValueRef ret;
+    GValue* params;
+    GValue ret_value = { 0 };
+    GSignalQuery query;
 
-  signal_privates *privates;
-  guint i, signal_id;
+    signal_privates* privates;
+    guint i, signal_id;
 
-  privates = JSObjectGetPrivate (thisObject);
+    privates = JSObjectGetPrivate(thisObject);
 
-  signal_id = g_signal_lookup (privates->signal_name,
-			       G_OBJECT_TYPE (privates->object));
+    signal_id
+      = g_signal_lookup(privates->signal_name, G_OBJECT_TYPE(privates->object));
 
-  g_signal_query (signal_id, &query);
+    g_signal_query(signal_id, &query);
 
-  if (argumentCount != query.n_params)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal: %s for type %s expected %u "
-			   "arguments, got %zd",
-			   query.signal_name,
-			   g_type_name (query.itype),
-			   query.n_params, argumentCount);
-
-      return JSValueMakeNull (ctx);
-    }
+    if (argumentCount != query.n_params) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal: %s for type %s expected %u "
+                            "arguments, got %zd",
+                            query.signal_name, g_type_name(query.itype),
+                            query.n_params, argumentCount);
 
-  params = g_new0 (GValue, argumentCount + 1);
+        return JSValueMakeNull(ctx);
+    }
 
-  g_value_init (&params[0], G_TYPE_OBJECT);
-  g_value_set_object (&params[0], privates->object);
-  for (i = 0; i < argumentCount; i++)
-    seed_value_to_gvalue (ctx, arguments[i],
-			  query.param_types[i],
-			  &params[i + 1], exception);
+    params = g_new0(GValue, argumentCount + 1);
 
+    g_value_init(&params[0], G_TYPE_OBJECT);
+    g_value_set_object(&params[0], privates->object);
+    for (i = 0; i < argumentCount; i++)
+        seed_value_to_gvalue(ctx, arguments[i], query.param_types[i],
+                             &params[i + 1], exception);
 
-  if (query.return_type != G_TYPE_NONE)
-    g_value_init (&ret_value, query.return_type);
-  g_signal_emitv (params, signal_id, 0, &ret_value);
+    if (query.return_type != G_TYPE_NONE)
+        g_value_init(&ret_value, query.return_type);
+    g_signal_emitv(params, signal_id, 0, &ret_value);
 
-  for (i = 0; i < argumentCount; i++)
-    g_value_unset (&params[i]);
-  g_free (params);
+    for (i = 0; i < argumentCount; i++)
+        g_value_unset(&params[i]);
+    g_free(params);
 
-  ret = seed_value_from_gvalue (ctx, &ret_value, exception);
+    ret = seed_value_from_gvalue(ctx, &ret_value, exception);
 
-  if (query.return_type != G_TYPE_NONE)
-    g_value_unset (&ret_value);
+    if (query.return_type != G_TYPE_NONE)
+        g_value_unset(&ret_value);
 
-  return ret;
+    return ret;
 }
 
 static JSValueRef
-seed_gobject_signal_disconnect (JSContextRef ctx,
-				JSObjectRef function,
-				JSObjectRef thisObject,
-				size_t argumentCount,
-				const JSValueRef arguments[],
-				JSValueRef * exception)
+seed_gobject_signal_disconnect(JSContextRef ctx,
+                               JSObjectRef function,
+                               JSObjectRef thisObject,
+                               size_t argumentCount,
+                               const JSValueRef arguments[],
+                               JSValueRef* exception)
 {
-  gulong id;
-  if (argumentCount != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal disconnection expects 1 argument"
-			   " got %zd", argumentCount);
-      return JSValueMakeUndefined (ctx);
+    gulong id;
+    if (argumentCount != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal disconnection expects 1 argument"
+                            " got %zd",
+                            argumentCount);
+        return JSValueMakeUndefined(ctx);
     }
-  id = seed_value_to_ulong (ctx, arguments[0], exception);
-  g_signal_handler_disconnect (JSObjectGetPrivate (thisObject), id);
+    id = seed_value_to_ulong(ctx, arguments[0], exception);
+    g_signal_handler_disconnect(JSObjectGetPrivate(thisObject), id);
 
-  return JSValueMakeUndefined (ctx);
+    return JSValueMakeUndefined(ctx);
 }
 
 static JSValueRef
-seed_gobject_signal_connect_on_property (JSContextRef ctx,
-					 JSObjectRef function,
-					 JSObjectRef thisObject,
-					 size_t argumentCount,
-					 const JSValueRef arguments[],
-					 JSValueRef * exception)
+seed_gobject_signal_connect_on_property(JSContextRef ctx,
+                                        JSObjectRef function,
+                                        JSObjectRef thisObject,
+                                        size_t argumentCount,
+                                        const JSValueRef arguments[],
+                                        JSValueRef* exception)
 {
-  gulong id = 0;
-  JSObjectRef this_obj;
-  signal_privates *privates;
-
-  privates = (signal_privates *) JSObjectGetPrivate (thisObject);
-  if (!privates)
-    g_error ("Signal constructed with invalid parameters"
-	     "in namespace import \n");
-
-  this_obj =
-    (JSObjectRef) seed_value_from_object (ctx, privates->object, exception);
-
-  if ((argumentCount > 2) || (argumentCount == 0))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal connection expected"
-			   " 1, or 2 arguments. Got " "%zd", argumentCount);
-
-      return JSValueMakeNull (ctx);
+    gulong id = 0;
+    JSObjectRef this_obj;
+    signal_privates* privates;
+
+    privates = (signal_privates*) JSObjectGetPrivate(thisObject);
+    if (!privates)
+        g_error("Signal constructed with invalid parameters"
+                "in namespace import \n");
+
+    this_obj
+      = (JSObjectRef) seed_value_from_object(ctx, privates->object, exception);
+
+    if ((argumentCount > 2) || (argumentCount == 0)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal connection expected"
+                            " 1, or 2 arguments. Got "
+                            "%zd",
+                            argumentCount);
+
+        return JSValueMakeNull(ctx);
     }
 
-  if (JSValueIsNull (ctx, arguments[0]) ||
-      !JSValueIsObject (ctx, arguments[0]) ||
-      !JSObjectIsFunction (ctx, (JSObjectRef) arguments[0]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Signal connection requires a function"
-			   " as first argument");
-      return JSValueMakeNull (ctx);
+    if (JSValueIsNull(ctx, arguments[0]) || !JSValueIsObject(ctx, arguments[0])
+        || !JSObjectIsFunction(ctx, (JSObjectRef) arguments[0])) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Signal connection requires a function"
+                            " as first argument");
+        return JSValueMakeNull(ctx);
     }
 
-  if (argumentCount == 1)
-    {
-      id = seed_gobject_signal_connect (ctx, privates->signal_name,
-					privates->object,
-					(JSObjectRef) arguments[0], this_obj,
-					NULL);
-
-    }
-  else if (argumentCount == 2)
-    {
-      id = seed_gobject_signal_connect (ctx, privates->signal_name,
-					privates->object,
-					(JSObjectRef) arguments[0],
-					this_obj, (JSObjectRef) arguments[1]);
+    if (argumentCount == 1) {
+        id = seed_gobject_signal_connect(ctx, privates->signal_name,
+                                         privates->object,
+                                         (JSObjectRef) arguments[0], this_obj,
+                                         NULL);
+
+    } else if (argumentCount == 2) {
+        id = seed_gobject_signal_connect(ctx, privates->signal_name,
+                                         privates->object,
+                                         (JSObjectRef) arguments[0], this_obj,
+                                         (JSObjectRef) arguments[1]);
     }
 
-  return seed_value_from_ulong (ctx, id, exception);
+    return seed_value_from_ulong(ctx, id, exception);
 }
 
-JSStaticFunction signal_static_functions[] = {
-  {"connect", seed_gobject_signal_connect_on_property, 0}
-  ,
-  {"emit", seed_gobject_signal_emit, 0}
-  ,
-  {0, 0, 0}
-};
+JSStaticFunction signal_static_functions[]
+  = { { "connect", seed_gobject_signal_connect_on_property, 0 },
+      { "emit", seed_gobject_signal_emit, 0 },
+      { 0, 0, 0 } };
 
-JSStaticFunction signal_holder_static_functions[] = {
-  {"connect", seed_gobject_signal_connect_by_name, 0}
-  ,
-  {"disconnect", seed_gobject_signal_disconnect, 0}
-  ,
-  {0, 0, 0}
-};
+JSStaticFunction signal_holder_static_functions[]
+  = { { "connect", seed_gobject_signal_connect_by_name, 0 },
+      { "disconnect", seed_gobject_signal_disconnect, 0 },
+      { 0, 0, 0 } };
 
 JSClassDefinition gobject_signal_def = {
-  0,				/* Version, always 0 */
-  kJSClassAttributeNoAutomaticPrototype,
-  "gobject_signal",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  signal_static_functions,	/* Static Functions */
-  NULL,
-  seed_signal_finalize,		/* Finalize */
-  NULL,				/* Has Property */
-  NULL,				/* Get Property */
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype,
+    "gobject_signal",        /* Class Name */
+    NULL,                    /* Parent Class */
+    NULL,                    /* Static Values */
+    signal_static_functions, /* Static Functions */
+    NULL,
+    seed_signal_finalize, /* Finalize */
+    NULL,                 /* Has Property */
+    NULL,                 /* Get Property */
+    NULL,                 /* Set Property */
+    NULL,                 /* Delete Property */
+    NULL,                 /* Get Property Names */
+    NULL,                 /* Call As Function */
+    NULL,                 /* Call As Constructor */
+    NULL,                 /* Has Instance */
+    NULL                  /* Convert To Type */
 };
 
 static JSValueRef
-seed_signal_holder_get_property (JSContextRef ctx,
-				 JSObjectRef object,
-				 JSStringRef property_name,
-				 JSValueRef * exception)
+seed_signal_holder_get_property(JSContextRef ctx,
+                                JSObjectRef object,
+                                JSStringRef property_name,
+                                JSValueRef* exception)
 {
-  GObject *gobj = JSObjectGetPrivate (object);
-  signal_privates *priv;
-  guint length = JSStringGetMaximumUTF8CStringSize (property_name);
-  gchar *signal_name = g_malloc (length * sizeof (gchar));
-  JSObjectRef signal_ref;
-
-  JSStringGetUTF8CString (property_name, signal_name, length);
-
-  if (!
-      (g_strcmp0 (signal_name, "connect")
-       && g_strcmp0 (signal_name, "disconnect")))
-    {
-      g_free (signal_name);
-      return NULL;
+    GObject* gobj = JSObjectGetPrivate(object);
+    signal_privates* priv;
+    guint length = JSStringGetMaximumUTF8CStringSize(property_name);
+    gchar* signal_name = g_malloc(length * sizeof(gchar));
+    JSObjectRef signal_ref;
+
+    JSStringGetUTF8CString(property_name, signal_name, length);
+
+    if (!(g_strcmp0(signal_name, "connect")
+          && g_strcmp0(signal_name, "disconnect"))) {
+        g_free(signal_name);
+        return NULL;
     }
 
-  if (!g_str_has_prefix (signal_name, "notify::") &&
-      !g_signal_lookup (signal_name, G_OBJECT_TYPE (gobj)))
-    {
-      seed_make_exception (ctx, exception, "InvalidSignalName",
-			   "Failed to connect to %s. "
-			   "Invalid signal name.", signal_name);
-      g_free (signal_name);
-      return NULL;
+    if (!g_str_has_prefix(signal_name, "notify::")
+        && !g_signal_lookup(signal_name, G_OBJECT_TYPE(gobj))) {
+        seed_make_exception(ctx, exception, "InvalidSignalName",
+                            "Failed to connect to %s. "
+                            "Invalid signal name.",
+                            signal_name);
+        g_free(signal_name);
+        return NULL;
     }
 
-  priv = g_slice_alloc (sizeof (signal_privates));
+    priv = g_slice_alloc(sizeof(signal_privates));
 
-  priv->object = gobj;
-  priv->signal_name = signal_name;
+    priv->object = gobj;
+    priv->signal_name = signal_name;
 
-  signal_ref = JSObjectMake (ctx, gobject_signal_class, priv);
+    signal_ref = JSObjectMake(ctx, gobject_signal_class, priv);
 
-  return signal_ref;
+    return signal_ref;
 }
 
-JSClassDefinition *
-seed_get_signal_class (void)
+JSClassDefinition*
+seed_get_signal_class(void)
 {
-  JSClassDefinition signal_holder = kJSClassDefinitionEmpty;
+    JSClassDefinition signal_holder = kJSClassDefinitionEmpty;
 
-  signal_holder.className = "gobject_signals";
-  signal_holder.getProperty = seed_signal_holder_get_property;
-  signal_holder.staticFunctions = signal_holder_static_functions;
-  signal_holder_class = JSClassCreate (&signal_holder);
-  JSClassRetain (signal_holder_class);
+    signal_holder.className = "gobject_signals";
+    signal_holder.getProperty = seed_signal_holder_get_property;
+    signal_holder.staticFunctions = signal_holder_static_functions;
+    signal_holder_class = JSClassCreate(&signal_holder);
+    JSClassRetain(signal_holder_class);
 
-  return &gobject_signal_def;
+    return &gobject_signal_def;
 }
diff --git a/libseed/seed-signals.h b/libseed/seed-signals.h
index ab7eaea..1ce4e04 100644
--- a/libseed/seed-signals.h
+++ b/libseed/seed-signals.h
@@ -22,25 +22,32 @@
 
 #include "seed-private.h"
 
-void seed_signal_marshal_func (GClosure * closure,
-			       GValue * return_value,
-			       guint n_param_values,
-			       const GValue * param_values,
-			       gpointer invocation_hint,
-			       gpointer marshall_data);
-
-void seed_add_signals_to_object (JSContextRef ctx,
-				 JSObjectRef object_ref, GObject * obj);
-
-gulong seed_gobject_signal_connect (JSContextRef ctx,
-				    const gchar * signal_name,
-				    GObject * on_obj,
-				    JSObjectRef func,
-				    JSObjectRef this_obj,
-				    JSObjectRef user_data);
-
-
-JSClassDefinition *seed_get_signal_class (void);
+void seed_signal_marshal_func(GClosure* closure,
+                              GValue* return_value,
+                              guint n_param_values,
+                              const GValue* param_values,
+                              gpointer invocation_hint,
+                              gpointer marshall_data);
+
+void seed_add_signals_to_object(JSContextRef ctx,
+                                JSObjectRef object_ref,
+                                GObject* obj);
+
+gulong seed_gobject_signal_connect(JSContextRef ctx,
+                                   const gchar* signal_name,
+                                   GObject* on_obj,
+                                   JSObjectRef func,
+                                   JSObjectRef this_obj,
+                                   JSObjectRef user_data);
+
+JSValueRef seed_gobject_signal_connect_by_name(JSContextRef ctx,
+                                               JSObjectRef function,
+                                               JSObjectRef thisObject,
+                                               size_t argumentCount,
+                                               const JSValueRef arguments[],
+                                               JSValueRef* exception);
+
+JSClassDefinition* seed_get_signal_class(void);
 extern JSClassRef gobject_signal_class;
 
 #endif
diff --git a/libseed/seed-structs.c b/libseed/seed-structs.c
index 793e754..0982e36 100644
--- a/libseed/seed-structs.c
+++ b/libseed/seed-structs.c
@@ -25,781 +25,752 @@ JSClassRef seed_boxed_class = 0;
 
 typedef struct _seed_struct_privates
 {
-  gpointer pointer;
-  GIBaseInfo *info;
+    gpointer pointer;
+    GIBaseInfo* info;
 
-  gboolean free_pointer;
-  gboolean slice_alloc;
-  gsize size;
+    gboolean free_pointer;
+    gboolean slice_alloc;
+    gsize size;
 } seed_struct_privates;
 
-GHashTable *struct_prototype_hash = NULL;
-GHashTable *union_prototype_hash = NULL;
+GHashTable* struct_prototype_hash = NULL;
+GHashTable* union_prototype_hash = NULL;
 
 static void
-seed_pointer_finalize (JSObjectRef object)
+seed_pointer_finalize(JSObjectRef object)
 {
-  seed_struct_privates *priv =
-    (seed_struct_privates *) JSObjectGetPrivate (object);
-
-  SEED_NOTE (STRUCTS, "Finalizing seed_pointer object %p. with "
-	     "priv->free_pointer = %d with type: %s, size: %zu",
-	     priv->pointer,
-	     priv->free_pointer,
-	     priv->info ? g_base_info_get_name (priv->info) : "[generic]",
-	     priv->size);
-
-  if (priv->free_pointer)
-    {
-      if (priv->slice_alloc)
-	g_slice_free1 (priv->size, priv->pointer);
-      else
-	g_free (priv->pointer);
+    seed_struct_privates* priv
+      = (seed_struct_privates*) JSObjectGetPrivate(object);
+
+    SEED_NOTE(STRUCTS, "Finalizing seed_pointer object %p. with "
+                       "priv->free_pointer = %d with type: %s, size: %zu",
+              priv->pointer, priv->free_pointer,
+              priv->info ? g_base_info_get_name(priv->info) : "[generic]",
+              priv->size);
+
+    if (priv->free_pointer) {
+        if (priv->slice_alloc)
+            g_slice_free1(priv->size, priv->pointer);
+        else
+            g_free(priv->pointer);
     }
-  if (priv->info)
-    g_base_info_unref (priv->info);
+    if (priv->info)
+        g_base_info_unref(priv->info);
 
-  g_slice_free1 (sizeof (seed_struct_privates), priv);
+    g_slice_free1(sizeof(seed_struct_privates), priv);
 }
 
 static void
-seed_boxed_finalize (JSObjectRef object)
+seed_boxed_finalize(JSObjectRef object)
 {
-  seed_struct_privates *priv =
-    (seed_struct_privates *) JSObjectGetPrivate (object);
-  GType type;
-  GIRegisteredTypeInfo *info =
-    (GIRegisteredTypeInfo *) g_base_info_get_type (priv->info);
+    seed_struct_privates* priv
+      = (seed_struct_privates*) JSObjectGetPrivate(object);
+    GType type;
+    GIRegisteredTypeInfo* info
+      = (GIRegisteredTypeInfo*) g_base_info_get_type(priv->info);
 
-  SEED_NOTE (STRUCTS, "Finalizing boxed object of type %s \n",
-	     g_base_info_get_name (priv->info));
+    SEED_NOTE(STRUCTS, "Finalizing boxed object of type %s \n",
+              g_base_info_get_name(priv->info));
 
-  type = g_registered_type_info_get_g_type (info);
-  g_base_info_unref ((GIBaseInfo *) info);
-
-  g_boxed_free (type, priv->pointer);
+    type = g_registered_type_info_get_g_type(info);
+    g_base_info_unref((GIBaseInfo*) info);
 
+    g_boxed_free(type, priv->pointer);
 }
 
-GIFieldInfo *
-seed_union_find_field (GIUnionInfo * info, gchar * field_name)
+GIFieldInfo*
+seed_union_find_field(GIUnionInfo* info, gchar* field_name)
 {
-  gint n, i;
-  GIFieldInfo *field;
-
-  n = g_union_info_get_n_fields (info);
-  for (i = 0; i < n; i++)
-    {
-      const gchar *name;
-
-      field = g_union_info_get_field (info, i);
-      name = g_base_info_get_name ((GIBaseInfo *) field);
-      if (!g_strcmp0 (name, field_name))
-	return field;
-      else
-	g_base_info_unref ((GIBaseInfo *) field);
+    gint n, i;
+    GIFieldInfo* field;
+
+    n = g_union_info_get_n_fields(info);
+    for (i = 0; i < n; i++) {
+        const gchar* name;
+
+        field = g_union_info_get_field(info, i);
+        name = g_base_info_get_name((GIBaseInfo*) field);
+        if (!g_strcmp0(name, field_name))
+            return field;
+        else
+            g_base_info_unref((GIBaseInfo*) field);
     }
 
-  return NULL;
+    return NULL;
 }
 
-GIFieldInfo *
-seed_struct_find_field (GIStructInfo * info, gchar * field_name)
+GIFieldInfo*
+seed_struct_find_field(GIStructInfo* info, gchar* field_name)
 {
-  gint n, i;
-  const gchar *name;
-  GIFieldInfo *field;
-
-  n = g_struct_info_get_n_fields (info);
-  for (i = 0; i < n; i++)
-    {
-
-      field = g_struct_info_get_field (info, i);
-      name = g_base_info_get_name ((GIBaseInfo *) field);
-      if (!g_strcmp0 (name, field_name))
-	return field;
-      else
-	g_base_info_unref ((GIBaseInfo *) field);
+    gint n, i;
+    const gchar* name;
+    GIFieldInfo* field;
+
+    n = g_struct_info_get_n_fields(info);
+    for (i = 0; i < n; i++) {
+
+        field = g_struct_info_get_field(info, i);
+        name = g_base_info_get_name((GIBaseInfo*) field);
+        if (!g_strcmp0(name, field_name))
+            return field;
+        else
+            g_base_info_unref((GIBaseInfo*) field);
     }
 
-  return NULL;
+    return NULL;
 }
 
 JSValueRef
-seed_field_get_value (JSContextRef ctx,
-		      gpointer object,
-		      GIFieldInfo * field, JSValueRef * exception)
+seed_field_get_value(JSContextRef ctx,
+                     gpointer object,
+                     GIFieldInfo* field,
+                     JSValueRef* exception)
 {
-  GITypeInfo *field_type;
-  GIBaseInfo *interface;
-  GArgument field_value;
-  JSValueRef ret = JSValueMakeNull (ctx);
-  gint offset;
-
-  field_type = g_field_info_get_type (field);
-  if (!g_field_info_get_field (field, object, &field_value))
-    {
-      GITypeTag tag;
-
-      tag = g_type_info_get_tag (field_type);
-      if (tag == GI_TYPE_TAG_INTERFACE)
-	{
-	  interface = g_type_info_get_interface (field_type);
-	  offset = g_field_info_get_offset (field);
-
-	  g_base_info_unref ((GIBaseInfo *) field_type);
-	  switch (g_base_info_get_type (interface))
-	    {
-	    case GI_INFO_TYPE_STRUCT:
-	      ret = seed_make_struct (ctx, (object + offset), interface);
-	      break;
-	    case GI_INFO_TYPE_UNION:
-	      ret = seed_make_union (ctx, (object + offset), interface);
-	      break;
-	    case GI_INFO_TYPE_BOXED:
-	      ret = seed_make_boxed (ctx, (object + offset), interface);
-	      break;
-	    default:
-	      break;
-	    }
-	  g_base_info_unref (interface);
-
-	  return ret;
-	}
-
-      return JSValueMakeNull (ctx);
+    GITypeInfo* field_type;
+    GIBaseInfo* interface;
+    GArgument field_value;
+    JSValueRef ret = JSValueMakeNull(ctx);
+    gint offset;
+
+    field_type = g_field_info_get_type(field);
+    if (!g_field_info_get_field(field, object, &field_value)) {
+        GITypeTag tag;
+
+        tag = g_type_info_get_tag(field_type);
+        if (tag == GI_TYPE_TAG_INTERFACE) {
+            interface = g_type_info_get_interface(field_type);
+            offset = g_field_info_get_offset(field);
+
+            g_base_info_unref((GIBaseInfo*) field_type);
+            switch (g_base_info_get_type(interface)) {
+                case GI_INFO_TYPE_STRUCT:
+                    ret = seed_make_struct(ctx, (object + offset), interface);
+                    break;
+                case GI_INFO_TYPE_UNION:
+                    ret = seed_make_union(ctx, (object + offset), interface);
+                    break;
+                case GI_INFO_TYPE_BOXED:
+                    ret = seed_make_boxed(ctx, (object + offset), interface);
+                    break;
+                default:
+                    break;
+            }
+            g_base_info_unref(interface);
+
+            return ret;
+        }
+
+        return JSValueMakeNull(ctx);
     }
 
-  // Maybe need to release argument.
-  ret = seed_value_from_gi_argument (ctx, &field_value, field_type, exception);
-  if (field_type)
-    g_base_info_unref ((GIBaseInfo *) field_type);
-  return ret;
+    // Maybe need to release argument.
+    ret = seed_value_from_gi_argument(ctx, &field_value, field_type, exception);
+    if (field_type)
+        g_base_info_unref((GIBaseInfo*) field_type);
+    return ret;
 }
 
 static JSValueRef
-seed_union_get_property (JSContextRef context,
-			 JSObjectRef object,
-			 JSStringRef property_name, JSValueRef * exception)
+seed_union_get_property(JSContextRef context,
+                        JSObjectRef object,
+                        JSStringRef property_name,
+                        JSValueRef* exception)
 {
-  gchar *cproperty_name;
-  gsize length;
-  seed_struct_privates *priv = JSObjectGetPrivate (object);
-  GIFieldInfo *field = 0;
-  JSValueRef ret;
-
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  SEED_NOTE (STRUCTS, "Getting property on union of type: %s "
-	     "with name %s \n",
-	     g_base_info_get_name (priv->info), cproperty_name);
-
-  field = seed_union_find_field ((GIUnionInfo *) priv->info, cproperty_name);
-  if (!field)
-    {
-      return 0;
+    gchar* cproperty_name;
+    gsize length;
+    seed_struct_privates* priv = JSObjectGetPrivate(object);
+    GIFieldInfo* field = 0;
+    JSValueRef ret;
+
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    SEED_NOTE(STRUCTS, "Getting property on union of type: %s "
+                       "with name %s \n",
+              g_base_info_get_name(priv->info), cproperty_name);
+
+    field = seed_union_find_field((GIUnionInfo*) priv->info, cproperty_name);
+    if (!field) {
+        return 0;
     }
 
-  ret = seed_field_get_value (context, priv->pointer, field, exception);
+    ret = seed_field_get_value(context, priv->pointer, field, exception);
 
-  g_base_info_unref ((GIBaseInfo *) field);
+    g_base_info_unref((GIBaseInfo*) field);
 
-  return ret;
+    return ret;
 }
 
 static bool
-seed_union_set_property (JSContextRef context,
-			 JSObjectRef object,
-			 JSStringRef property_name,
-			 JSValueRef value, JSValueRef * exception)
+seed_union_set_property(JSContextRef context,
+                        JSObjectRef object,
+                        JSStringRef property_name,
+                        JSValueRef value,
+                        JSValueRef* exception)
 {
-  gsize length;
-  GArgument field_value;
-  GIFieldInfo *field;
-  gchar *cproperty_name;
-  GITypeInfo *field_type;
-  seed_struct_privates *priv =
-    (seed_struct_privates *) JSObjectGetPrivate (object);
-  gboolean ret;
-
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  SEED_NOTE (STRUCTS, "Setting property on union of type: %s  "
-	     "with name %s \n",
-	     g_base_info_get_name (priv->info), cproperty_name);
-
-  field = seed_union_find_field ((GIUnionInfo *) priv->info, cproperty_name);
-
-  if (!field)
-    {
-      return FALSE;
+    gsize length;
+    GArgument field_value;
+    GIFieldInfo* field;
+    gchar* cproperty_name;
+    GITypeInfo* field_type;
+    seed_struct_privates* priv
+      = (seed_struct_privates*) JSObjectGetPrivate(object);
+    gboolean ret;
+
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    SEED_NOTE(STRUCTS, "Setting property on union of type: %s  "
+                       "with name %s \n",
+              g_base_info_get_name(priv->info), cproperty_name);
+
+    field = seed_union_find_field((GIUnionInfo*) priv->info, cproperty_name);
+
+    if (!field) {
+        return FALSE;
     }
 
-  field_type = g_field_info_get_type (field);
+    field_type = g_field_info_get_type(field);
+
+    seed_value_to_gi_argument(context, value, field_type, GI_TRANSFER_NOTHING,
+                              &field_value, exception);
 
-  seed_value_to_gi_argument (context, value, field_type, &field_value, exception);
-  ret = g_field_info_set_field (field, priv->pointer, &field_value);
+    ret = g_field_info_set_field(field, priv->pointer, &field_value);
+    if (!ret)
+        g_warning("Setting property failed on union of type: %s  "
+                  "with name %s \n",
+                  g_base_info_get_name(priv->info), cproperty_name);
 
-  g_base_info_unref ((GIBaseInfo *) field_type);
-  g_base_info_unref ((GIBaseInfo *) field);
+    g_base_info_unref((GIBaseInfo*) field_type);
+    g_base_info_unref((GIBaseInfo*) field);
 
-  return TRUE;
+    return TRUE;
 }
 
 static bool
-seed_struct_set_property (JSContextRef context,
-			  JSObjectRef object,
-			  JSStringRef property_name,
-			  JSValueRef value, JSValueRef * exception)
+seed_struct_set_property(JSContextRef context,
+                         JSObjectRef object,
+                         JSStringRef property_name,
+                         JSValueRef value,
+                         JSValueRef* exception)
 {
-  gsize length;
-  GArgument field_value;
-  GIFieldInfo *field;
-  gchar *cproperty_name;
-  GITypeInfo *field_type;
-  seed_struct_privates *priv =
-    (seed_struct_privates *) JSObjectGetPrivate (object);
-  gboolean ret;
-
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  SEED_NOTE (STRUCTS, "Setting property on struct of type: %s  "
-	     "with name %s \n",
-	     g_base_info_get_name (priv->info), cproperty_name);
-
-  field =
-    seed_struct_find_field ((GIStructInfo *) priv->info, cproperty_name);
-
-  if (!field)
-    {
-      return FALSE;
+    gsize length;
+    GArgument field_value;
+    GIFieldInfo* field;
+    gchar* cproperty_name;
+    GITypeInfo* field_type;
+    seed_struct_privates* priv
+      = (seed_struct_privates*) JSObjectGetPrivate(object);
+    gboolean ret;
+
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    SEED_NOTE(STRUCTS, "Setting property on struct of type: %s  "
+                       "with name %s \n",
+              g_base_info_get_name(priv->info), cproperty_name);
+
+    field = seed_struct_find_field((GIStructInfo*) priv->info, cproperty_name);
+
+    if (!field) {
+        return FALSE;
     }
 
-  field_type = g_field_info_get_type (field);
+    field_type = g_field_info_get_type(field);
+
+    seed_value_to_gi_argument(context, value, field_type, GI_TRANSFER_NOTHING,
+                              &field_value, exception);
+    ret = g_field_info_set_field(field, priv->pointer, &field_value);
 
-  seed_value_to_gi_argument (context, value, field_type, &field_value, exception);
-  ret = g_field_info_set_field (field, priv->pointer, &field_value);
+    if (!ret)
+        g_warning("Setting property failed on struct of type: %s  "
+                  "with name %s \n",
+                  g_base_info_get_name(priv->info), cproperty_name);
 
-  if (!ret) 
-    g_warning("Setting property failed on struct of type: %s  "
-			"with name %s \n",
-			g_base_info_get_name (priv->info), cproperty_name);
-  
-  g_base_info_unref ((GIBaseInfo *) field_type);
-  g_base_info_unref ((GIBaseInfo *) field);
+    g_base_info_unref((GIBaseInfo*) field_type);
+    g_base_info_unref((GIBaseInfo*) field);
 
-  return TRUE;
+    return TRUE;
 }
 
 static JSValueRef
-seed_struct_get_property (JSContextRef context,
-			  JSObjectRef object,
-			  JSStringRef property_name, JSValueRef * exception)
+seed_struct_get_property(JSContextRef context,
+                         JSObjectRef object,
+                         JSStringRef property_name,
+                         JSValueRef* exception)
 {
-  gchar *cproperty_name;
-  gsize length;
-  seed_struct_privates *priv = JSObjectGetPrivate (object);
-  GIFieldInfo *field = NULL;
-  JSValueRef ret;
-
-  length = JSStringGetMaximumUTF8CStringSize (property_name);
-  cproperty_name = g_alloca (length * sizeof (gchar));
-  JSStringGetUTF8CString (property_name, cproperty_name, length);
-
-  SEED_NOTE (STRUCTS, "Getting property on struct of type: %s  "
-	     "with name %s \n",
-	     g_base_info_get_name (priv->info), cproperty_name);
-
-  // for a gvalue, it has a special property 'value' (read-only)
-  GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *) priv->info);
-
-  if (g_type_is_a (gtype, G_TYPE_VALUE) && !g_strcmp0 (cproperty_name, "value")) 
-    {
-      return seed_value_from_gvalue ( context, ( GValue *) priv->pointer,  exception);
- 
+    gchar* cproperty_name;
+    gsize length;
+    seed_struct_privates* priv = JSObjectGetPrivate(object);
+    GIFieldInfo* field = NULL;
+    JSValueRef ret;
+
+    length = JSStringGetMaximumUTF8CStringSize(property_name);
+    cproperty_name = g_alloca(length * sizeof(gchar));
+    JSStringGetUTF8CString(property_name, cproperty_name, length);
+
+    SEED_NOTE(STRUCTS, "Getting property on struct of type: %s  "
+                       "with name %s \n",
+              g_base_info_get_name(priv->info), cproperty_name);
+
+    // for a gvalue, it has a special property 'value' (read-only)
+    GType gtype
+      = g_registered_type_info_get_g_type((GIRegisteredTypeInfo*) priv->info);
+
+    if (g_type_is_a(gtype, G_TYPE_VALUE)
+        && !g_strcmp0(cproperty_name, "value")) {
+        return seed_value_from_gvalue(context, (GValue*) priv->pointer,
+                                      exception);
     }
 
-  field =
-    seed_struct_find_field ((GIStructInfo *) priv->info, cproperty_name);
+    field = seed_struct_find_field((GIStructInfo*) priv->info, cproperty_name);
 
-  if (!field)
-    {
-      return NULL;
+    if (!field) {
+        return NULL;
     }
 
-  ret = seed_field_get_value (context, priv->pointer, field, exception);
+    ret = seed_field_get_value(context, priv->pointer, field, exception);
 
-  g_base_info_unref ((GIBaseInfo *) field);
+    g_base_info_unref((GIBaseInfo*) field);
 
-  return ret;
+    return ret;
 }
 
 static void
-seed_enumerate_structlike_properties (JSContextRef ctx,
-				      JSObjectRef object,
-				      JSPropertyNameAccumulatorRef
-				      propertyNames)
+seed_enumerate_structlike_properties(JSContextRef ctx,
+                                     JSObjectRef object,
+                                     JSPropertyNameAccumulatorRef propertyNames)
 {
-  GIFieldInfo *field;
-  gint i, n;
-  guchar type = 0;
-  seed_struct_privates *priv =
-    (seed_struct_privates *) JSObjectGetPrivate (object);
-  GIBaseInfo *info = priv->info;
-
-  if (!info)
-    return;
-
-  if (JSValueIsObjectOfClass (ctx, object, seed_struct_class))
-    type = 1;
-  else if (JSValueIsObjectOfClass (ctx, object, seed_union_class))
-    type = 2;
-  else
-    g_assert_not_reached ();
-
-  (type == 1) ?
-    (n = g_struct_info_get_n_fields ((GIStructInfo *) info)) :
-    (n = g_union_info_get_n_fields ((GIUnionInfo *) info));
-
-  for (i = 0; i < n; i++)
-    {
-      JSStringRef jname;
-
-      (type == 1) ?
-	(field = g_struct_info_get_field ((GIStructInfo *) info, i)) :
-	(field = g_union_info_get_field ((GIUnionInfo *) info, i));
-
-      jname =
-	JSStringCreateWithUTF8CString (g_base_info_get_name
-				       ((GIBaseInfo *) field));
-
-      g_base_info_unref ((GIBaseInfo *) field);
-      JSPropertyNameAccumulatorAddName (propertyNames, jname);
-
-      JSStringRelease (jname);
+    GIFieldInfo* field;
+    gint i, n;
+    guchar type = 0;
+    seed_struct_privates* priv
+      = (seed_struct_privates*) JSObjectGetPrivate(object);
+    GIBaseInfo* info = priv->info;
+
+    if (!info)
+        return;
+
+    if (JSValueIsObjectOfClass(ctx, object, seed_struct_class))
+        type = 1;
+    else if (JSValueIsObjectOfClass(ctx, object, seed_union_class))
+        type = 2;
+    else
+        g_assert_not_reached();
+
+    (type == 1) ? (n = g_struct_info_get_n_fields((GIStructInfo*) info))
+                : (n = g_union_info_get_n_fields((GIUnionInfo*) info));
+
+    for (i = 0; i < n; i++) {
+        JSStringRef jname;
+
+        (type == 1) ? (field = g_struct_info_get_field((GIStructInfo*) info, i))
+                    : (field = g_union_info_get_field((GIUnionInfo*) info, i));
+
+        jname = JSStringCreateWithUTF8CString(
+          g_base_info_get_name((GIBaseInfo*) field));
+
+        g_base_info_unref((GIBaseInfo*) field);
+        JSPropertyNameAccumulatorAddName(propertyNames, jname);
+
+        JSStringRelease(jname);
     }
 }
 
 JSClassDefinition seed_pointer_def = {
-  0,				/* Version, always 0 */
-  0,
-  "seed_pointer",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  seed_pointer_finalize,
-  NULL,				/* Has Property */
-  0,
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0,                    /* Version, always 0 */
+    0,    "seed_pointer", /* Class Name */
+    NULL,                 /* Parent Class */
+    NULL,                 /* Static Values */
+    NULL,                 /* Static Functions */
+    NULL, seed_pointer_finalize,
+    NULL,       /* Has Property */
+    0,    NULL, /* Set Property */
+    NULL,       /* Delete Property */
+    NULL, NULL, /* Call As Function */
+    NULL,       /* Call As Constructor */
+    NULL,       /* Has Instance */
+    NULL        /* Convert To Type */
 };
 
 JSClassDefinition seed_struct_def = {
-  0,				/* Version, always 0 */
-  kJSClassAttributeNoAutomaticPrototype,
-  "seed_struct",		/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  NULL,
-  NULL,				/* Has Property */
-  seed_struct_get_property,
-  seed_struct_set_property,	/* Set Property */
-  NULL,				/* Delete Property */
-  seed_enumerate_structlike_properties,	/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype,
+    "seed_struct", /* Class Name */
+    NULL,          /* Parent Class */
+    NULL,          /* Static Values */
+    NULL,          /* Static Functions */
+    NULL,
+    NULL,
+    NULL, /* Has Property */
+    seed_struct_get_property,
+    seed_struct_set_property,             /* Set Property */
+    NULL,                                 /* Delete Property */
+    seed_enumerate_structlike_properties, /* Get Property Names */
+    NULL,                                 /* Call As Function */
+    NULL,                                 /* Call As Constructor */
+    NULL,                                 /* Has Instance */
+    NULL                                  /* Convert To Type */
 };
 
 JSClassDefinition seed_union_def = {
-  0,				/* Version, always 0 */
-  kJSClassAttributeNoAutomaticPrototype,
-  "seed_union",			/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  NULL,
-  NULL,				/* Has Property */
-  seed_union_get_property,
-  seed_union_set_property,	/* Set Property */
-  NULL,				/* Delete Property */
-  seed_enumerate_structlike_properties,	/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype,
+    "seed_union", /* Class Name */
+    NULL,         /* Parent Class */
+    NULL,         /* Static Values */
+    NULL,         /* Static Functions */
+    NULL,
+    NULL,
+    NULL, /* Has Property */
+    seed_union_get_property,
+    seed_union_set_property,              /* Set Property */
+    NULL,                                 /* Delete Property */
+    seed_enumerate_structlike_properties, /* Get Property Names */
+    NULL,                                 /* Call As Function */
+    NULL,                                 /* Call As Constructor */
+    NULL,                                 /* Has Instance */
+    NULL                                  /* Convert To Type */
 };
 
 JSClassDefinition seed_boxed_def = {
-  0,				/* Version, always 0 */
-  kJSClassAttributeNoAutomaticPrototype,
-  "seed_boxed",			/* Class Name */
-  NULL,				/* Parent Class */
-  NULL,				/* Static Values */
-  NULL,				/* Static Functions */
-  NULL,
-  seed_boxed_finalize,
-  NULL,				/* Has Property */
-  NULL,
-  NULL,				/* Set Property */
-  NULL,				/* Delete Property */
-  NULL,				/* Get Property Names */
-  NULL,				/* Call As Function */
-  NULL,				/* Call As Constructor */
-  NULL,				/* Has Instance */
-  NULL				/* Convert To Type */
+    0, /* Version, always 0 */
+    kJSClassAttributeNoAutomaticPrototype,
+    "seed_boxed", /* Class Name */
+    NULL,         /* Parent Class */
+    NULL,         /* Static Values */
+    NULL,         /* Static Functions */
+    NULL,
+    seed_boxed_finalize,
+    NULL, /* Has Property */
+    NULL,
+    NULL, /* Set Property */
+    NULL, /* Delete Property */
+    NULL, /* Get Property Names */
+    NULL, /* Call As Function */
+    NULL, /* Call As Constructor */
+    NULL, /* Has Instance */
+    NULL  /* Convert To Type */
 };
 
 gpointer
-seed_pointer_get_pointer (JSContextRef ctx, JSValueRef pointer)
+seed_pointer_get_pointer(JSContextRef ctx, JSValueRef pointer)
 {
-  if (JSValueIsObjectOfClass (ctx, pointer, seed_pointer_class))
-    {
-      seed_struct_privates *priv = JSObjectGetPrivate ((JSObjectRef) pointer);
-      return priv->pointer;
+    if (JSValueIsObjectOfClass(ctx, pointer, seed_pointer_class)) {
+        seed_struct_privates* priv = JSObjectGetPrivate((JSObjectRef) pointer);
+        return priv->pointer;
     }
-  return NULL;
+    return NULL;
 }
 
 void
-seed_pointer_set_free (JSContextRef ctx,
-		       JSValueRef pointer, gboolean free_pointer)
+seed_pointer_set_free(JSContextRef ctx,
+                      JSValueRef pointer,
+                      gboolean free_pointer)
 {
-  if (JSValueIsObjectOfClass (ctx, pointer, seed_pointer_class))
-    {
-      seed_struct_privates *priv = JSObjectGetPrivate ((JSObjectRef) pointer);
-      priv->free_pointer = free_pointer;
+    if (JSValueIsObjectOfClass(ctx, pointer, seed_pointer_class)) {
+        seed_struct_privates* priv = JSObjectGetPrivate((JSObjectRef) pointer);
+        priv->free_pointer = free_pointer;
     }
 }
 
 static void
-seed_pointer_set_slice (JSContextRef ctx,
-			JSValueRef pointer, gboolean free_pointer, gsize size)
+seed_pointer_set_slice(JSContextRef ctx,
+                       JSValueRef pointer,
+                       gboolean free_pointer,
+                       gsize size)
 {
-  seed_struct_privates *priv = JSObjectGetPrivate ((JSObjectRef) pointer);
-  priv->slice_alloc = free_pointer;
-  priv->size = size;
+    seed_struct_privates* priv = JSObjectGetPrivate((JSObjectRef) pointer);
+    priv->slice_alloc = free_pointer;
+    priv->size = size;
 }
 
 JSObjectRef
-seed_make_pointer (JSContextRef ctx, gpointer pointer)
+seed_make_pointer(JSContextRef ctx, gpointer pointer)
 {
-  seed_struct_privates *priv = g_slice_alloc (sizeof (seed_struct_privates));
-  priv->pointer = pointer;
-  priv->info = 0;
-  priv->free_pointer = FALSE;
+    seed_struct_privates* priv = g_slice_alloc(sizeof(seed_struct_privates));
+    priv->pointer = pointer;
+    priv->info = 0;
+    priv->free_pointer = FALSE;
 
-  return JSObjectMake (ctx, seed_pointer_class, priv);
+    return JSObjectMake(ctx, seed_pointer_class, priv);
 }
 
 JSObjectRef
-seed_union_prototype (JSContextRef ctx, GIBaseInfo * info)
+seed_union_prototype(JSContextRef ctx, GIBaseInfo* info)
 {
-  JSObjectRef proto;
-  const gchar *namespace, *name;
-  gchar *key;
-  gint n_methods, i;
-  GIFunctionInfo *finfo;
-
-  name = g_base_info_get_name (info);
-  namespace = g_base_info_get_namespace (info);
-  key = g_strjoin (NULL, namespace, name, NULL);
-
-  proto = (JSObjectRef) g_hash_table_lookup (union_prototype_hash, key);
-  
-  if (!proto)
-    {
-      proto = JSObjectMake (ctx, 0, 0);
-      JSValueProtect (eng->context, proto);
-
-      n_methods = g_union_info_get_n_methods ((GIUnionInfo *) info);
-      for (i = 0; i < n_methods; i++)
-	{
-	  finfo = g_union_info_get_method ((GIUnionInfo *) info, i);
-
-	  seed_gobject_define_property_from_function_info (ctx,
-							   (GIFunctionInfo *)
-							   finfo, proto,
-							   TRUE);
-
-	  g_base_info_unref ((GIBaseInfo *) finfo);
-	}
-
-      g_hash_table_insert (union_prototype_hash, key, proto);
-    }
-  else
-    {
-      g_free (key);
+    JSObjectRef proto;
+    const gchar* namespace, *name;
+    gchar* key;
+    gint n_methods, i;
+    GIFunctionInfo* finfo;
+
+    name = g_base_info_get_name(info);
+    namespace = g_base_info_get_namespace(info);
+    key = g_strjoin(NULL, namespace, name, NULL);
+
+    proto = (JSObjectRef) g_hash_table_lookup(union_prototype_hash, key);
+
+    if (!proto) {
+        proto = JSObjectMake(ctx, 0, 0);
+        JSValueProtect(eng->context, proto);
+
+        n_methods = g_union_info_get_n_methods((GIUnionInfo*) info);
+        for (i = 0; i < n_methods; i++) {
+            finfo = g_union_info_get_method((GIUnionInfo*) info, i);
+
+            seed_gobject_define_property_from_function_info(
+              ctx, (GIFunctionInfo*) finfo, proto, TRUE);
+
+            g_base_info_unref((GIBaseInfo*) finfo);
+        }
+
+        g_hash_table_insert(union_prototype_hash, key, proto);
+    } else {
+        g_free(key);
     }
 
-  return proto;
+    return proto;
 }
 
 JSObjectRef
-seed_make_union (JSContextRef ctx, gpointer younion, GIBaseInfo * info)
+seed_make_union(JSContextRef ctx, gpointer younion, GIBaseInfo* info)
 {
-  JSObjectRef object;
+    JSObjectRef object;
 
-  if (younion == NULL)
-    {
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    if (younion == NULL) {
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
 
-  seed_struct_privates *priv = g_slice_alloc (sizeof (seed_struct_privates));
+    seed_struct_privates* priv = g_slice_alloc(sizeof(seed_struct_privates));
 
-  priv->pointer = younion;
-  priv->info = info ? g_base_info_ref (info) : 0;
-  priv->free_pointer = FALSE;
+    priv->pointer = younion;
+    priv->info = info ? g_base_info_ref(info) : 0;
+    priv->free_pointer = FALSE;
 
-  object = JSObjectMake (ctx, seed_union_class, priv);
+    object = JSObjectMake(ctx, seed_union_class, priv);
 
-  if (info)
-    {
-      JSObjectRef proto = seed_union_prototype (ctx, info);
-      if (proto)
-	JSObjectSetPrototype (ctx, object, proto);
-      else
-	g_assert_not_reached ();
+    if (info) {
+        JSObjectRef proto = seed_union_prototype(ctx, info);
+        if (proto)
+            JSObjectSetPrototype(ctx, object, proto);
+        else
+            g_assert_not_reached();
     }
 
-  return object;
+    return object;
 }
 
 JSObjectRef
-seed_make_boxed (JSContextRef ctx, gpointer boxed, GIBaseInfo * info)
+seed_make_boxed(JSContextRef ctx, gpointer boxed, GIBaseInfo* info)
 {
-  JSObjectRef object;
-  seed_struct_privates *priv = g_slice_alloc (sizeof (seed_struct_privates));
+    JSObjectRef object;
+    seed_struct_privates* priv = g_slice_alloc(sizeof(seed_struct_privates));
 
-  priv->info = info ? g_base_info_ref (info) : 0;
-  priv->pointer = boxed;
-  // Boxed finalize handler handles freeing.
-  priv->free_pointer = FALSE;
+    priv->info = info ? g_base_info_ref(info) : 0;
+    priv->pointer = boxed;
+    // Boxed finalize handler handles freeing.
+    priv->free_pointer = FALSE;
 
-  object = JSObjectMake (ctx, seed_boxed_class, priv);
+    object = JSObjectMake(ctx, seed_boxed_class, priv);
 
-  // FIXME: Instance methods?
+    // FIXME: Instance methods?
 
-  return object;
+    return object;
 }
 
 JSObjectRef
-seed_struct_prototype (JSContextRef ctx, GIBaseInfo * info)
+seed_struct_prototype(JSContextRef ctx, GIBaseInfo* info)
 {
-  JSObjectRef proto;
-  const gchar *namespace, *name;
-  gchar *key;
-  gint n_methods, i;
+    JSObjectRef proto;
+    const gchar* namespace, *name;
+    gchar* key;
+    gint n_methods, i;
 
-  name = g_base_info_get_name (info);
-  namespace = g_base_info_get_namespace (info);
-  key = g_strjoin (NULL, namespace, name, NULL);
+    name = g_base_info_get_name(info);
+    namespace = g_base_info_get_namespace(info);
+    key = g_strjoin(NULL, namespace, name, NULL);
 
-  proto = (JSObjectRef) g_hash_table_lookup (struct_prototype_hash, key);
+    proto = (JSObjectRef) g_hash_table_lookup(struct_prototype_hash, key);
 
-  if (!proto)
-    {
-      proto = JSObjectMake (ctx, 0, 0);
-      JSValueProtect (eng->context, proto);
+    if (!proto) {
+        proto = JSObjectMake(ctx, 0, 0);
+        JSValueProtect(eng->context, proto);
 
-      n_methods = g_struct_info_get_n_methods ((GIStructInfo *) info);
-      for (i = 0; i < n_methods; i++)
-	{
-	  GIFunctionInfo *finfo;
+        n_methods = g_struct_info_get_n_methods((GIStructInfo*) info);
+        for (i = 0; i < n_methods; i++) {
+            GIFunctionInfo* finfo;
 
-	  finfo = g_struct_info_get_method ((GIStructInfo *) info, i);
+            finfo = g_struct_info_get_method((GIStructInfo*) info, i);
 
-	  seed_gobject_define_property_from_function_info (ctx,
-							   (GIFunctionInfo *)
-							   finfo, proto,
-							   TRUE);
+            seed_gobject_define_property_from_function_info(
+              ctx, (GIFunctionInfo*) finfo, proto, TRUE);
 
-	  g_base_info_unref ((GIBaseInfo *) finfo);
-	}
+            g_base_info_unref((GIBaseInfo*) finfo);
+        }
 
-      g_hash_table_insert (struct_prototype_hash, key, proto);
-    }
-  else
-    {
-      g_free (key);
+        g_hash_table_insert(struct_prototype_hash, key, proto);
+    } else {
+        g_free(key);
     }
 
-  return proto;
+    return proto;
 }
 
 JSObjectRef
-seed_make_struct (JSContextRef ctx, gpointer strukt, GIBaseInfo * info)
+seed_make_struct(JSContextRef ctx, gpointer strukt, GIBaseInfo* info)
 {
-  JSObjectRef object, proto;
+    JSObjectRef object, proto;
 
-  if (strukt == NULL)
-    {
-      return (JSObjectRef) JSValueMakeNull (ctx);
+    if (strukt == NULL) {
+        return (JSObjectRef) JSValueMakeNull(ctx);
     }
 
-  seed_struct_privates *priv = g_slice_alloc (sizeof (seed_struct_privates));
-
-  priv->info = info ? g_base_info_ref (info) : 0;
-  priv->pointer = strukt;
-  priv->free_pointer = FALSE;
-
-  object = JSObjectMake (ctx, seed_struct_class, priv);
-  // Examine cases where struct is being used without info.
-  if (info)
-    {
-      proto = seed_struct_prototype (ctx, info);
-      if (proto)
-	JSObjectSetPrototype (ctx, object, proto);
-      else
-	g_assert_not_reached ();
+    seed_struct_privates* priv = g_slice_alloc(sizeof(seed_struct_privates));
+
+    priv->info = info ? g_base_info_ref(info) : 0;
+    priv->pointer = strukt;
+    priv->free_pointer = FALSE;
+
+    object = JSObjectMake(ctx, seed_struct_class, priv);
+    // Examine cases where struct is being used without info.
+    if (info) {
+        proto = seed_struct_prototype(ctx, info);
+        if (proto)
+            JSObjectSetPrototype(ctx, object, proto);
+        else
+            g_assert_not_reached();
     }
 
-  return object;
+    return object;
 }
 
 void
-seed_structs_init (void)
+seed_structs_init(void)
 {
-  seed_pointer_class = JSClassCreate (&seed_pointer_def);
-  seed_struct_def.parentClass = seed_pointer_class;
-  seed_struct_class = JSClassCreate (&seed_struct_def);
-  seed_union_def.parentClass = seed_pointer_class;
-  seed_union_class = JSClassCreate (&seed_union_def);
-  seed_boxed_def.parentClass = seed_struct_class;
-  seed_boxed_class = JSClassCreate (&seed_boxed_def);
-
-  struct_prototype_hash = g_hash_table_new (g_str_hash, g_str_equal);
-  union_prototype_hash = g_hash_table_new (g_str_hash, g_str_equal);
+    seed_pointer_class = JSClassCreate(&seed_pointer_def);
+    seed_struct_def.parentClass = seed_pointer_class;
+    seed_struct_class = JSClassCreate(&seed_struct_def);
+    seed_union_def.parentClass = seed_pointer_class;
+    seed_union_class = JSClassCreate(&seed_union_def);
+    seed_boxed_def.parentClass = seed_struct_class;
+    seed_boxed_class = JSClassCreate(&seed_boxed_def);
+
+    struct_prototype_hash = g_hash_table_new(g_str_hash, g_str_equal);
+    union_prototype_hash = g_hash_table_new(g_str_hash, g_str_equal);
 }
 
 JSObjectRef
-seed_construct_struct_type_with_parameters (JSContextRef ctx,
-					    GIBaseInfo * info,
-					    JSObjectRef parameters,
-					    JSValueRef * exception)
+seed_construct_struct_type_with_parameters(JSContextRef ctx,
+                                           GIBaseInfo* info,
+                                           JSObjectRef parameters,
+                                           JSValueRef* exception)
 {
-  gsize size = 0;
-  gpointer object;
-  GIInfoType type = g_base_info_get_type (info);
-  JSObjectRef ret;
-  gboolean set_ret;
-  gint nparams, i = 0;
-  gsize length;
-  GIFieldInfo *field = 0;
-  JSPropertyNameArrayRef jsprops;
-  JSStringRef jsprop_name;
-  JSValueRef jsprop_value;
-  GArgument field_value;
-  gchar *prop_name;
-  GITypeInfo *field_type;
-
-  if (type == GI_INFO_TYPE_STRUCT)
-    {
-      GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *) info);
-      if (g_type_is_a (gtype, G_TYPE_VALUE)) 
-        {
-          GValue *gval = g_slice_alloc0 (sizeof (GValue));
-          if (!parameters) 
-            {
-              seed_make_exception (ctx, exception, "ArgumentError",  "Missing Type in GValue constructor");
-              return (JSObjectRef) JSValueMakeNull (ctx);
+    gsize size = 0;
+    gpointer object;
+    GIInfoType type = g_base_info_get_type(info);
+    JSObjectRef ret;
+    gboolean set_ret;
+    gint nparams, i = 0;
+    gsize length;
+    GIFieldInfo* field = 0;
+    JSPropertyNameArrayRef jsprops;
+    JSStringRef jsprop_name;
+    JSValueRef jsprop_value;
+    GArgument field_value;
+    gchar* prop_name;
+    GITypeInfo* field_type;
+
+    if (type == GI_INFO_TYPE_STRUCT) {
+        GType gtype
+          = g_registered_type_info_get_g_type((GIRegisteredTypeInfo*) info);
+        if (g_type_is_a(gtype, G_TYPE_VALUE)) {
+            GValue* gval = g_slice_alloc0(sizeof(GValue));
+            if (!parameters) {
+                seed_make_exception(ctx, exception, "ArgumentError",
+                                    "Missing Type in GValue constructor");
+                return (JSObjectRef) JSValueMakeNull(ctx);
             }
-          SEED_NOTE (CONSTRUCTION, "Created a GValue  struct");
-          seed_value_to_gvalue (ctx,   parameters , 0,  gval, exception);
-          ret = seed_make_struct (ctx, (gpointer)gval, info);
-          return ret;
+            SEED_NOTE(CONSTRUCTION, "Created a GValue  struct");
+            seed_value_to_gvalue(ctx, parameters, 0, gval, exception);
+            ret = seed_make_struct(ctx, (gpointer) gval, info);
+            return ret;
         }
 
-      size = g_struct_info_get_size ((GIStructInfo *) info);
-    }
-  else
-    {
-      size = g_union_info_get_size ((GIUnionInfo *) info);
+        size = g_struct_info_get_size((GIStructInfo*) info);
+    } else {
+        size = g_union_info_get_size((GIUnionInfo*) info);
     }
-  if (!size)
-    {
-      g_critical ("Struct/union of type: %s has size 0 in introspection data. Please check GIR",
-		  g_base_info_get_name (info));
-      g_assert(size);
+    if (!size) {
+        g_critical("Struct/union of type: %s has size 0 in introspection data. "
+                   "Please check GIR",
+                   g_base_info_get_name(info));
+        g_assert(size);
     }
-  object = g_slice_alloc0 (size);
+    object = g_slice_alloc0(size);
 
-  SEED_NOTE (CONSTRUCTION,
-	     "Constructing struct/union of type: %s. Size: %zu \n",
-	     g_base_info_get_name (info), size);
+    SEED_NOTE(CONSTRUCTION,
+              "Constructing struct/union of type: %s. Size: %zu \n",
+              g_base_info_get_name(info), size);
 
-  if (type == GI_INFO_TYPE_STRUCT)
-    ret = seed_make_struct (ctx, object, info);
-  else
-    ret = seed_make_union (ctx, object, info);
+    if (type == GI_INFO_TYPE_STRUCT)
+        ret = seed_make_struct(ctx, object, info);
+    else
+        ret = seed_make_union(ctx, object, info);
 
-  seed_pointer_set_free (ctx, ret, TRUE);
-  seed_pointer_set_slice (ctx, ret, TRUE, size);
+    seed_pointer_set_free(ctx, ret, TRUE);
+    seed_pointer_set_slice(ctx, ret, TRUE, size);
 
-  if (!parameters)
-    return ret;
+    if (!parameters)
+        return ret;
+
+    jsprops = JSObjectCopyPropertyNames(ctx, (JSObjectRef) parameters);
+    nparams = JSPropertyNameArrayGetCount(jsprops);
 
-  jsprops = JSObjectCopyPropertyNames (ctx, (JSObjectRef) parameters);
-  nparams = JSPropertyNameArrayGetCount (jsprops);
-
-  while (i < nparams)
-    {
-      jsprop_name = JSPropertyNameArrayGetNameAtIndex (jsprops, i);
-
-      length = JSStringGetMaximumUTF8CStringSize (jsprop_name);
-      prop_name = g_alloca (length * sizeof (gchar));
-      JSStringGetUTF8CString (jsprop_name, prop_name, length);
-
-      if (type == GI_INFO_TYPE_STRUCT)
-	field = seed_struct_find_field ((GIStructInfo *) info, prop_name);
-      else
-	field = seed_union_find_field ((GIUnionInfo *) info, prop_name);
-      if (!field)
-	{
-	  seed_make_exception (ctx, exception, "PropertyError",
-			       "Invalid property for construction: %s",
-			       prop_name);
-
-	  JSPropertyNameArrayRelease (jsprops);
-	  return (JSObjectRef) JSValueMakeNull (ctx);
-	}
-      field_type = g_field_info_get_type (field);
-
-      jsprop_value = JSObjectGetProperty (ctx,
-					  (JSObjectRef) parameters,
-					  jsprop_name, NULL);
-
-      seed_value_to_gi_argument (ctx, jsprop_value, field_type, &field_value,
-				 exception);
-      set_ret = g_field_info_set_field (field, object, &field_value);
-
-	  if (!set_ret) 
-		g_warning("Constructor setting property failed on struct of type: %s "
-			"with name %s \n",
-			g_base_info_get_name (info), prop_name);
-  
-      g_base_info_unref ((GIBaseInfo *) field_type);
-      g_base_info_unref ((GIBaseInfo *) field);
-
-      i++;
+    while (i < nparams) {
+        jsprop_name = JSPropertyNameArrayGetNameAtIndex(jsprops, i);
+
+        length = JSStringGetMaximumUTF8CStringSize(jsprop_name);
+        prop_name = g_alloca(length * sizeof(gchar));
+        JSStringGetUTF8CString(jsprop_name, prop_name, length);
+
+        if (type == GI_INFO_TYPE_STRUCT)
+            field = seed_struct_find_field((GIStructInfo*) info, prop_name);
+        else
+            field = seed_union_find_field((GIUnionInfo*) info, prop_name);
+        if (!field) {
+            seed_make_exception(ctx, exception, "PropertyError",
+                                "Invalid property for construction: %s",
+                                prop_name);
+
+            JSPropertyNameArrayRelease(jsprops);
+            return (JSObjectRef) JSValueMakeNull(ctx);
+        }
+        field_type = g_field_info_get_type(field);
+
+        jsprop_value = JSObjectGetProperty(ctx, (JSObjectRef) parameters,
+                                           jsprop_name, NULL);
+
+        seed_value_to_gi_argument(ctx, jsprop_value, field_type,
+                                  GI_TRANSFER_NOTHING, &field_value, exception);
+
+        set_ret = g_field_info_set_field(field, object, &field_value);
+
+        if (!set_ret)
+            g_warning(
+              "Constructor setting property failed on struct of type: %s "
+              "with name %s \n",
+              g_base_info_get_name(info), prop_name);
+
+        g_base_info_unref((GIBaseInfo*) field_type);
+        g_base_info_unref((GIBaseInfo*) field);
+
+        i++;
     }
-  JSPropertyNameArrayRelease (jsprops);
+    JSPropertyNameArrayRelease(jsprops);
 
-  return ret;
+    return ret;
 }
diff --git a/libseed/seed-structs.h b/libseed/seed-structs.h
index 92f85e9..33ad639 100644
--- a/libseed/seed-structs.h
+++ b/libseed/seed-structs.h
@@ -21,36 +21,37 @@
 extern JSClassRef seed_struct_class;
 extern JSClassRef seed_union_class;
 
-JSObjectRef seed_make_union (JSContextRef ctx, gpointer younion,
-			     GIBaseInfo * info);
-JSObjectRef seed_make_struct (JSContextRef ctx, gpointer strukt,
-			      GIBaseInfo * info);
-JSObjectRef seed_make_boxed (JSContextRef ctx,
-			     gpointer boxed, GIBaseInfo * info);
-
-JSObjectRef seed_make_pointer (JSContextRef ctx, gpointer pointer);
-
-JSValueRef
-seed_field_get_value (JSContextRef ctx,
-		      gpointer object,
-		      GIFieldInfo * field, JSValueRef * exception);
-
-gpointer seed_pointer_get_pointer (JSContextRef ctx, JSValueRef strukt);
-void seed_pointer_set_free (JSContextRef ctx,
-			    JSValueRef pointer, gboolean free_pointer);
-
-GIFieldInfo *seed_struct_find_field (GIStructInfo * info, gchar * field_name);
-GIFieldInfo *seed_union_find_field (GIUnionInfo * info, gchar * field_name);
-
-JSObjectRef
-seed_construct_struct_type_with_parameters (JSContextRef ctx,
-					    GIBaseInfo * info,
-					    JSObjectRef parameters,
-					    JSValueRef * exception);
-
-JSObjectRef seed_union_prototype (JSContextRef ctx, GIBaseInfo * info);
-JSObjectRef seed_struct_prototype (JSContextRef ctx, GIBaseInfo * info);
-
-void seed_structs_init ();
+JSObjectRef seed_make_union(JSContextRef ctx,
+                            gpointer younion,
+                            GIBaseInfo* info);
+JSObjectRef seed_make_struct(JSContextRef ctx,
+                             gpointer strukt,
+                             GIBaseInfo* info);
+JSObjectRef seed_make_boxed(JSContextRef ctx, gpointer boxed, GIBaseInfo* info);
+
+JSObjectRef seed_make_pointer(JSContextRef ctx, gpointer pointer);
+
+JSValueRef seed_field_get_value(JSContextRef ctx,
+                                gpointer object,
+                                GIFieldInfo* field,
+                                JSValueRef* exception);
+
+gpointer seed_pointer_get_pointer(JSContextRef ctx, JSValueRef strukt);
+void seed_pointer_set_free(JSContextRef ctx,
+                           JSValueRef pointer,
+                           gboolean free_pointer);
+
+GIFieldInfo* seed_struct_find_field(GIStructInfo* info, gchar* field_name);
+GIFieldInfo* seed_union_find_field(GIUnionInfo* info, gchar* field_name);
+
+JSObjectRef seed_construct_struct_type_with_parameters(JSContextRef ctx,
+                                                       GIBaseInfo* info,
+                                                       JSObjectRef parameters,
+                                                       JSValueRef* exception);
+
+JSObjectRef seed_union_prototype(JSContextRef ctx, GIBaseInfo* info);
+JSObjectRef seed_struct_prototype(JSContextRef ctx, GIBaseInfo* info);
+
+void seed_structs_init();
 
 #endif
diff --git a/libseed/seed-types.c b/libseed/seed-types.c
index 5f17d9b..722f265 100644
--- a/libseed/seed-types.c
+++ b/libseed/seed-types.c
@@ -26,1634 +26,1661 @@ JSClassRef gobject_method_class;
 JSClassRef gobject_constructor_class;
 JSClassRef seed_callback_class;
 JSClassRef gobject_init_method_class;
-SeedEngine *eng;
+SeedEngine* eng;
 
 static gboolean
-seed_value_is_gobject (JSContextRef ctx, JSValueRef value)
+seed_value_is_gobject(JSContextRef ctx, JSValueRef value)
 {
-  if (!JSValueIsObject (ctx, value) || JSValueIsNull (ctx, value))
-    return FALSE;
+    if (!JSValueIsObject(ctx, value) || JSValueIsNull(ctx, value))
+        return FALSE;
 
-  return JSValueIsObjectOfClass (ctx, value, gobject_class);
+    return JSValueIsObjectOfClass(ctx, value, gobject_class);
 }
 
 void
-seed_toggle_ref (gpointer data, GObject * object, gboolean is_last_ref)
+seed_toggle_ref(gpointer data, GObject* object, gboolean is_last_ref)
 {
-  JSValueRef wrapper;
+    JSValueRef wrapper;
 
-  if (!g_object_get_data (object, "js-ref"))
-    return;
+    if (!g_object_get_qdata(object, js_ref_quark))
+        return;
 
-  wrapper = (JSValueRef) data;
+    wrapper = (JSValueRef) data;
 
-  if (is_last_ref)
-    {
-      JSValueUnprotect (eng->context, wrapper);
-    }
-  else
-    {
-      JSValueProtect (eng->context, wrapper);
+    if (is_last_ref) {
+        JSValueUnprotect(eng->context, wrapper);
+    } else {
+        JSValueProtect(eng->context, wrapper);
     }
 }
 
 static void
-seed_gobject_destroyed (gpointer object)
+seed_gobject_destroyed(gpointer object)
 {
-  JSValueUnprotect (eng->context, (JSValueRef) object);
-  JSObjectSetPrivate ((JSObjectRef) object, 0);
+    JSValueUnprotect(eng->context, (JSValueRef) object);
+    JSObjectSetPrivate((JSObjectRef) object, 0);
 }
 
 JSObjectRef
-seed_make_wrapper_for_type (JSContextRef ctx, GType type)
+seed_make_wrapper_for_type(JSContextRef ctx, GType type)
 {
-  JSClassRef class;
-  JSObjectRef ret;
-  JSValueRef prototype;
+    JSClassRef class;
+    JSObjectRef ret;
+    JSValueRef prototype;
 
-  class = seed_gobject_get_class_for_gtype (ctx, type);
+    class = seed_gobject_get_class_for_gtype(ctx, type);
 
-  while (!class && (type = g_type_parent (type)))
-    class = seed_gobject_get_class_for_gtype (ctx, type);
+    while (!class && (type = g_type_parent(type)))
+        class = seed_gobject_get_class_for_gtype(ctx, type);
 
-  prototype = seed_gobject_get_prototype_for_gtype (type);
-  ret = JSObjectMake (ctx, class, NULL);
-  if (prototype)
-    JSObjectSetPrototype (ctx, ret, prototype);
-  else
-    g_assert_not_reached ();
+    prototype = seed_gobject_get_prototype_for_gtype(type);
+    ret = JSObjectMake(ctx, class, NULL);
+    if (prototype)
+        JSObjectSetPrototype(ctx, ret, prototype);
+    else
+        g_assert_not_reached();
 
-  return ret;
+    return ret;
 }
 
 static JSValueRef
-seed_wrap_object (JSContextRef ctx, GObject * object)
+seed_wrap_object(JSContextRef ctx, GObject* object)
 {
-  JSValueRef user_data;
-  JSObjectRef js_ref;
-  GType type;
+    JSValueRef user_data;
+    JSObjectRef js_ref;
+    GType type;
 
-  type = G_OBJECT_TYPE (object);
+    type = G_OBJECT_TYPE(object);
 
-  user_data = (JSValueRef) g_object_get_qdata (object, js_ref_quark);
+    user_data = (JSValueRef) g_object_get_qdata(object, js_ref_quark);
 
-  if (user_data)
-    return user_data;
+    if (user_data)
+        return user_data;
 
-  if (pthread_getspecific(seed_next_gobject_wrapper_key))
-    js_ref = pthread_getspecific(seed_next_gobject_wrapper_key);
-  else
-    js_ref = seed_make_wrapper_for_type (ctx, type);
+    if (pthread_getspecific(seed_next_gobject_wrapper_key))
+        js_ref = pthread_getspecific(seed_next_gobject_wrapper_key);
+    else
+        js_ref = seed_make_wrapper_for_type(ctx, type);
 
-  JSObjectSetPrivate (js_ref, object);
+    JSObjectSetPrivate(js_ref, object);
 
-  g_object_set_qdata_full (object, js_ref_quark, (gpointer) js_ref,
-			   seed_gobject_destroyed);
+    g_object_set_qdata_full(object, js_ref_quark, (gpointer) js_ref,
+                            seed_gobject_destroyed);
 
-  JSValueProtect (eng->context, js_ref);
-  g_object_add_toggle_ref (object, seed_toggle_ref, (gpointer) js_ref);
+    JSValueProtect(eng->context, js_ref);
+    g_object_add_toggle_ref(object, seed_toggle_ref, (gpointer) js_ref);
 
-  seed_add_signals_to_object (ctx, js_ref, object);
+    seed_add_signals_to_object(ctx, js_ref, object);
 
-  pthread_setspecific(seed_next_gobject_wrapper_key, NULL);
+    pthread_setspecific(seed_next_gobject_wrapper_key, NULL);
 
-  return js_ref;
+    return js_ref;
 }
 
 static gboolean
-seed_release_arg (GITransfer transfer,
-		  GITypeInfo * type_info, GITypeTag type_tag, GArgument * arg)
+seed_release_arg(GITransfer transfer,
+                 GITypeInfo* type_info,
+                 GITypeTag type_tag,
+                 GArgument* arg)
 {
-  GType gtype;
-  GITypeInfo *param_type;
-  GIBaseInfo *interface_info;
-  GValue *gval;
-
-  switch (type_tag)
-    {
-    case GI_TYPE_TAG_UTF8:
-    case GI_TYPE_TAG_FILENAME:
-      g_free (arg->v_string);
-      break;
-    case GI_TYPE_TAG_ARRAY:
-      if (arg->v_pointer)
-	{
-	  param_type = g_type_info_get_param_type (type_info, 0);
-
-	  switch (g_type_info_get_tag (param_type))
-	    {
-	    case GI_TYPE_TAG_UTF8:
-	      if (transfer == GI_TRANSFER_EVERYTHING)
-		g_strfreev (arg->v_pointer);
-	      else if (transfer == GI_TRANSFER_CONTAINER)
-		g_free (arg->v_pointer);
-	      break;
-	    case GI_TYPE_TAG_GTYPE:
-	    case GI_TYPE_TAG_FLOAT:
-	    case GI_TYPE_TAG_UINT8:
-            case GI_TYPE_TAG_UINT32:
-	      g_free (arg->v_pointer);
-	      break;
-	    case GI_TYPE_TAG_INTERFACE:
-	      break;
-	    default:
-	      g_assert_not_reached ();
-	    }
-
-	  g_base_info_unref ((GIBaseInfo *) param_type);
-	}
-      break;
-    case GI_TYPE_TAG_GHASH:
-      {
-        GITypeInfo *val_param_info;
-        GHashTableIter iter;
-        GArgument value;
-
-        val_param_info = g_type_info_get_param_type (type_info, 1);
-        g_assert(val_param_info != NULL);
-
-        /* release the hashtable's values */
-        g_hash_table_iter_init (&iter, arg->v_pointer);
-        while (g_hash_table_iter_next (&iter, NULL, &value.v_pointer))
-          {
-            seed_release_arg (GI_TRANSFER_EVERYTHING, val_param_info,
-                              g_type_info_get_tag (val_param_info), &value);
-          }
-
-        /* release the hashtable's keys and the hashtable itself */
-        g_hash_table_destroy (arg->v_pointer);
-	break;
-      }
-    case GI_TYPE_TAG_INTERFACE:
-      {
-	if (arg->v_pointer)
-	  {
-	    interface_info = g_type_info_get_interface (type_info);
-
-	    GIInfoType interface_type = g_base_info_get_type (interface_info);
-	    if (interface_type == GI_INFO_TYPE_CALLBACK)
-	      {
-	        /* FIXME: - callback returns are not handled yet */
-	        g_base_info_unref (interface_info);
-	        break;
-	      }
-
-	    gtype =
-	      g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *)
-						 interface_info);
-
-	    if (g_type_is_a (gtype, G_TYPE_OBJECT)
-		|| g_type_is_a (gtype, G_TYPE_INTERFACE))
-	      {
-		SEED_NOTE (MISC,
-			   "Unreffing object of type: %s in"
-			   "argument release. Reference count: %d\n",
-			   g_type_name (G_OBJECT_TYPE
-					(G_OBJECT (arg->v_pointer))),
-			   G_OBJECT (arg->v_pointer)->ref_count);
-		g_object_unref (G_OBJECT (arg->v_pointer));
-	      }
-	    else if (g_type_is_a (gtype, G_TYPE_VALUE))
-	      {
-		gval = (GValue *) arg->v_pointer;
-		// Free/unref the GValue's contents.
-		g_value_unset (gval);
-		// Free the GValue.
-		g_slice_free1 (sizeof (GValue), gval);
-	      }
-	    else if (g_type_is_a (gtype, G_TYPE_CLOSURE))
-	      {
-		g_closure_unref (arg->v_pointer);
-	      }
-
-	    g_base_info_unref (interface_info);
-	  }
-	break;
-      }
-    default:
-      break;
-
+    GType gtype;
+    GITypeInfo* param_type;
+    GIBaseInfo* interface_info;
+    GValue* gval;
+
+    switch (type_tag) {
+        case GI_TYPE_TAG_UTF8:
+        case GI_TYPE_TAG_FILENAME:
+            g_free(arg->v_string);
+            break;
+        case GI_TYPE_TAG_ARRAY:
+            if (arg->v_pointer) {
+                param_type = g_type_info_get_param_type(type_info, 0);
+
+                switch (g_type_info_get_tag(param_type)) {
+                    case GI_TYPE_TAG_UTF8:
+                        if (transfer == GI_TRANSFER_EVERYTHING)
+                            g_strfreev(arg->v_pointer);
+                        else if (transfer == GI_TRANSFER_CONTAINER)
+                            g_free(arg->v_pointer);
+                        break;
+                    case GI_TYPE_TAG_GTYPE:
+                    case GI_TYPE_TAG_FLOAT:
+                    case GI_TYPE_TAG_UINT8:
+                    case GI_TYPE_TAG_INT32:
+                    case GI_TYPE_TAG_UINT32:
+                        g_free(arg->v_pointer);
+                        break;
+                    case GI_TYPE_TAG_INTERFACE:
+                        break;
+                    default:
+                        g_assert_not_reached();
+                }
+
+                g_base_info_unref((GIBaseInfo*) param_type);
+            }
+            break;
+        case GI_TYPE_TAG_GHASH: {
+            GITypeInfo* val_param_info;
+            GHashTableIter iter;
+            GArgument value;
+
+            val_param_info = g_type_info_get_param_type(type_info, 1);
+            g_assert(val_param_info != NULL);
+
+            /* release the hashtable's values */
+            g_hash_table_iter_init(&iter, arg->v_pointer);
+            while (g_hash_table_iter_next(&iter, NULL, &value.v_pointer)) {
+                seed_release_arg(GI_TRANSFER_EVERYTHING, val_param_info,
+                                 g_type_info_get_tag(val_param_info), &value);
+            }
+
+            /* release the hashtable's keys and the hashtable itself */
+            g_hash_table_destroy(arg->v_pointer);
+            break;
+        }
+        case GI_TYPE_TAG_INTERFACE: {
+            if (arg->v_pointer) {
+                interface_info = g_type_info_get_interface(type_info);
+
+                GIInfoType interface_type
+                  = g_base_info_get_type(interface_info);
+                if (interface_type == GI_INFO_TYPE_CALLBACK) {
+                    /* FIXME: - callback returns are not handled yet */
+                    g_base_info_unref(interface_info);
+                    break;
+                }
+
+                gtype = g_registered_type_info_get_g_type(
+                  (GIRegisteredTypeInfo*) interface_info);
+
+                if (g_type_is_a(gtype, G_TYPE_OBJECT)
+                    || g_type_is_a(gtype, G_TYPE_INTERFACE)) {
+                    SEED_NOTE(MISC, "Unreffing object of type: %s in"
+                                    "argument release. Reference count: %d\n",
+                              g_type_name(
+                                G_OBJECT_TYPE(G_OBJECT(arg->v_pointer))),
+                              G_OBJECT(arg->v_pointer)->ref_count);
+                    g_object_unref(G_OBJECT(arg->v_pointer));
+                } else if (g_type_is_a(gtype, G_TYPE_VALUE)) {
+                    gval = (GValue*) arg->v_pointer;
+                    // Free/unref the GValue's contents.
+                    g_value_unset(gval);
+                    // Free the GValue.
+                    g_slice_free1(sizeof(GValue), gval);
+                } else if (g_type_is_a(gtype, G_TYPE_CLOSURE)) {
+                    g_closure_unref(arg->v_pointer);
+                }
+
+                g_base_info_unref(interface_info);
+            }
+            break;
+        }
+        default:
+            break;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_gi_release_arg (GITransfer transfer,
-		     GITypeInfo * type_info, GArgument * arg)
+seed_gi_release_arg(GITransfer transfer, GITypeInfo* type_info, GArgument* arg)
 {
-  GITypeTag type_tag;
+    GITypeTag type_tag;
 
-  if (transfer == GI_TRANSFER_NOTHING)
-    return TRUE;
+    if (transfer == GI_TRANSFER_NOTHING)
+        return TRUE;
 
-  type_tag = g_type_info_get_tag ((GITypeInfo *) type_info);
+    type_tag = g_type_info_get_tag((GITypeInfo*) type_info);
 
-  return seed_release_arg (transfer, type_info, type_tag, arg);
+    return seed_release_arg(transfer, type_info, type_tag, arg);
 }
 
 gboolean
-seed_gi_release_in_arg (GITransfer transfer,
-			GITypeInfo * type_info, GArgument * arg)
+seed_gi_release_in_arg(GITransfer transfer,
+                       GITypeInfo* type_info,
+                       GArgument* arg)
 {
-  GITypeTag type_tag;
+    GITypeTag type_tag;
 
-  if (transfer == GI_TRANSFER_EVERYTHING)
-    return TRUE;
+    if (transfer == GI_TRANSFER_EVERYTHING)
+        return TRUE;
+
+    type_tag = g_type_info_get_tag((GITypeInfo*) type_info);
 
-  type_tag = g_type_info_get_tag ((GITypeInfo *) type_info);
-
-  switch (type_tag)
-    {
-      // TODO: FIXME: Leaaaks?
-    case GI_TYPE_TAG_INTERFACE:
-      {
-	// TODO: FIXME: Need some safe way to look for GClosure.
-	break;
-      }
-    case GI_TYPE_TAG_UTF8:
-    case GI_TYPE_TAG_FILENAME:
-    case GI_TYPE_TAG_ARRAY:
-    case GI_TYPE_TAG_GHASH:
-      return seed_release_arg (GI_TRANSFER_EVERYTHING,
-			       type_info, type_tag, arg);
-    default:
-      break;
+    switch (type_tag) {
+        // TODO: FIXME: Leaaaks?
+        case GI_TYPE_TAG_INTERFACE: {
+            // TODO: FIXME: Need some safe way to look for GClosure.
+            break;
+        }
+        case GI_TYPE_TAG_UTF8:
+        case GI_TYPE_TAG_FILENAME:
+        case GI_TYPE_TAG_ARRAY:
+        case GI_TYPE_TAG_GHASH:
+            return seed_release_arg(GI_TRANSFER_EVERYTHING, type_info, type_tag,
+                                    arg);
+        default:
+            break;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 static JSValueRef
-seed_gi_make_jsarray (JSContextRef ctx,
-		      void *array,
-		      GITypeInfo * param_type, JSValueRef * exception)
+seed_gi_make_jsarray(JSContextRef ctx,
+                     void* array,
+                     GITypeInfo* param_type,
+                     JSValueRef* exception)
 {
-  GITypeTag element_type;
-  JSValueRef *elements;
-  guint length, i;
-  gchar **str_array = (gchar **) array;
-  JSValueRef ret = JSValueMakeNull (ctx);
+    GITypeTag element_type;
+    JSValueRef* elements;
+    guint length, i;
+    gchar** str_array = (gchar**) array;
+    JSValueRef ret = JSValueMakeNull(ctx);
+
+    element_type = g_type_info_get_tag(param_type);
 
-  element_type = g_type_info_get_tag (param_type);
+    if (element_type == GI_TYPE_TAG_UTF8) {
 
-  if (element_type == GI_TYPE_TAG_UTF8)
-    {
+        length = g_strv_length(str_array);
+        if (!length)
+            return ret;
+
+        elements = g_alloca(sizeof(JSValueRef) * length);
+        for (i = 0; i < length; ++i) {
+            elements[i] = seed_value_from_string(ctx, str_array[i], exception);
+        }
 
-      length = g_strv_length (str_array);
-      if (!length)
-	return ret;
+        ret = (JSValueRef) JSObjectMakeArray(ctx, length, elements, exception);
+    }
+
+    if (element_type == GI_TYPE_TAG_GTYPE) {
+        GType* ptr = (GType*) array;
+        length = 0;
+        while (ptr[length])
+            length++;
+
+        elements = g_alloca(sizeof(JSValueRef) * length);
+
+        for (i = 0; i < length; ++i)
+            elements[i] = seed_value_from_long(ctx, ptr[i], exception);
+
+        return (JSValueRef) JSObjectMakeArray(ctx, length, elements, exception);
+    }
+
+    return ret;
+}
 
-      elements = g_alloca (sizeof (JSValueRef) * length);
-      for (i = 0; i < length; ++i)
-	{
-	  elements[i] = seed_value_from_string (ctx, str_array[i], exception);
-	}
+JSValueRef
+seed_array_from_zero_terminated_c_array(JSContextRef ctx,
+                                        gpointer pointer,
+                                        GITypeInfo* param_info,
+                                        JSValueRef* exception)
+{
+    JSObjectRef ret;
+    GITypeTag element_type;
+    GArgument arg;
+    guint i;
+
+    element_type = g_type_info_get_tag(param_info);
+
+    // Special case handling array(guint8), which happens to be a string
+    // in most cases
+    if (element_type == GI_TYPE_TAG_UINT8) {
+        // TODO: this is pretty simple and probably incomplete.
+        // GJS makes possible the return of an array, supporting
+        // all types. We're only supporting strings ATM.
+        ret = seed_value_from_string(ctx, pointer, exception);
+        return ret;
+    }
 
-      ret = (JSValueRef) JSObjectMakeArray (ctx, length, elements, exception);
+    ret = JSObjectMakeArray(ctx, NULL, NULL, NULL);
+
+#define ITERATE(type)                                                          \
+    do {                                                                       \
+        g##type* array = (g##type*) pointer;                                   \
+        for (i = 0; array[i]; i++) {                                           \
+            arg.v_##type = array[i];                                           \
+            JSValueRef val                                                     \
+              = seed_value_from_gi_argument(ctx, &arg, param_info, exception); \
+            seed_object_set_property_at_index(ctx, ret, i, val, exception);    \
+        }                                                                      \
+    } while (0);
+
+    switch (element_type) {
+        /* We handle GI_TYPE_TAG_UINT8 above. */
+        case GI_TYPE_TAG_INT8:
+            ITERATE(int8);
+            break;
+        case GI_TYPE_TAG_UINT16:
+            ITERATE(uint16);
+            break;
+        case GI_TYPE_TAG_INT16:
+            ITERATE(int16);
+            break;
+        case GI_TYPE_TAG_UINT32:
+            ITERATE(uint32);
+            break;
+        case GI_TYPE_TAG_INT32:
+            ITERATE(int32);
+            break;
+        case GI_TYPE_TAG_UINT64:
+            ITERATE(uint64);
+            break;
+        case GI_TYPE_TAG_INT64:
+            ITERATE(int64);
+            break;
+        case GI_TYPE_TAG_FLOAT:
+            ITERATE(float);
+            break;
+        case GI_TYPE_TAG_DOUBLE:
+            ITERATE(double);
+            break;
+        case GI_TYPE_TAG_GTYPE:
+        case GI_TYPE_TAG_UTF8:
+        case GI_TYPE_TAG_FILENAME:
+        case GI_TYPE_TAG_ARRAY:
+        case GI_TYPE_TAG_INTERFACE:
+        case GI_TYPE_TAG_GLIST:
+        case GI_TYPE_TAG_GSLIST:
+        case GI_TYPE_TAG_GHASH:
+        case GI_TYPE_TAG_ERROR:
+            ITERATE(pointer);
+            break;
+        default:
+            seed_make_exception(ctx, exception, "Argumenterror",
+                                "Unknown element-type %d", element_type);
     }
 
-  if (element_type == GI_TYPE_TAG_GTYPE)
-    {
-      GType* ptr = (GType*)array;
-      length = 0;
-      while (ptr[length])  length++;
-    
-      elements = g_alloca (sizeof (JSValueRef) * length);
+#undef ITERATE
 
-      for (i = 0; i < length; ++i)
-          elements[i] = seed_value_from_long (ctx, ptr[i], exception);
-        
-      return (JSValueRef) JSObjectMakeArray (ctx, length, elements, exception);
+    return ret;
+}
 
+static gboolean
+seed_gi_make_array_from_string(JSContextRef ctx,
+                               JSStringRef js_string,
+                               GITypeInfo* param_type,
+                               guint length,
+                               void** array_p,
+                               guint* out_array_length,
+                               JSValueRef* exception)
+{
+    GITypeTag element_type;
+    element_type = g_type_info_get_tag(param_type);
+
+    // This could be handled by the case where the value is an object,
+    // however, getting length from a string crashs inside JSC. So,
+    // we're now proper handling strings here
+    gchar* buffer = g_malloc(length * sizeof(gchar));
+    guint real_size = JSStringGetUTF8CString(js_string, buffer, length);
+
+    switch (element_type) {
+        case GI_TYPE_TAG_INT8:
+        case GI_TYPE_TAG_UINT8: {
+            *array_p = buffer;
+
+            // So, GJS doesn't computer the \0 at the end of line.
+            // it does make sense, as converting a string to an array
+            // we don't want the EOS. However, I couldn't find a way to do it
+            // with
+            // JSC, so I'm basically reducing one byte.
+            if (out_array_length)
+                *out_array_length = real_size - 1;
+            break;
+        }
+        case GI_TYPE_TAG_INT16:
+        case GI_TYPE_TAG_UINT16:
+        // TODO: implement utf16 support
+        default: {
+            seed_make_exception(ctx, exception, "ArgumentError",
+                                "Cannot convert string to array of '%s'",
+                                g_type_tag_to_string(element_type));
+            return FALSE;
+        }
     }
 
-  return ret;
+    return TRUE;
 }
 
 static gboolean
-seed_gi_make_array (JSContextRef ctx,
-		    JSValueRef array,
-		    guint length,
-		    GITypeInfo * param_type,
-		    void **array_p, JSValueRef * exception)
+seed_gi_make_array(JSContextRef ctx,
+                   JSValueRef array,
+                   guint length,
+                   GITypeInfo* param_type,
+                   void** array_p,
+                   JSValueRef* exception)
 {
-  GITypeTag element_type;
-  JSValueRef elem;
-  guint i;
-
-  element_type = g_type_info_get_tag (param_type);
-
-  switch (element_type)
-    {
-    case GI_TYPE_TAG_UTF8:
-      {
-	gchar **strresult = g_new0 (gchar *, length + 1);
-
-	for (i = 0; i < length; i++)
-	  {
-	    elem = JSObjectGetPropertyAtIndex (ctx,
-					       (JSObjectRef) array,
-					       i, exception);
-	    strresult[i] = seed_value_to_string (ctx, elem, exception);
-	  }
-
-	*array_p = strresult;
-      }
-      break;
-    case GI_TYPE_TAG_GTYPE:
-      {
-	GType *typeresult;
-
-	typeresult = g_new0 (GType, length + 1);
-
-	for (i = 0; i < length; i++)
-	  {
-	    elem = JSObjectGetPropertyAtIndex (ctx,
-					       (JSObjectRef) array,
-					       i, exception);
-	    typeresult[i] = seed_value_to_int (ctx, elem, exception);
-	  }
-
-	*array_p = typeresult;
-      }
-      break;
-    case GI_TYPE_TAG_FLOAT:
-      {
-	gfloat *floatresult;
-
-	floatresult = g_new0 (gfloat, length + 1);
-
-	for (i = 0; i < length; i++)
-	  {
-	    elem = JSObjectGetPropertyAtIndex (ctx,
-					       (JSObjectRef) array,
-					       i, exception);
-	    floatresult[i] = seed_value_to_float (ctx, elem, exception);
-	  }
-
-	*array_p = floatresult;
-      }
-      break;
-    case GI_TYPE_TAG_DOUBLE:
-      {
-	gdouble *dblresult;
-
-	dblresult = g_new0 (gdouble, length + 1);
-
-	for (i = 0; i < length; i++)
-	  {
-	    elem = JSObjectGetPropertyAtIndex (ctx,
-					       (JSObjectRef) array,
-					       i, exception);
-	    dblresult[i] = seed_value_to_double (ctx, elem, exception);
-	  }
-
-	*array_p = dblresult;
-      }
-      break;
+    GITypeTag element_type;
+    JSValueRef elem;
+    guint i;
+
+    element_type = g_type_info_get_tag(param_type);
+
+    switch (element_type) {
+        case GI_TYPE_TAG_UTF8: {
+            gchar** strresult = g_new0(gchar*, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                strresult[i] = seed_value_to_string(ctx, elem, exception);
+            }
+
+            *array_p = strresult;
+        } break;
+        case GI_TYPE_TAG_GTYPE: {
+            GType* typeresult;
+
+            typeresult = g_new0(GType, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                typeresult[i] = seed_value_to_int(ctx, elem, exception);
+            }
+
+            *array_p = typeresult;
+        } break;
+        case GI_TYPE_TAG_FLOAT: {
+            gfloat* floatresult;
+
+            floatresult = g_new0(gfloat, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                floatresult[i] = seed_value_to_float(ctx, elem, exception);
+            }
+
+            *array_p = floatresult;
+        } break;
+        case GI_TYPE_TAG_DOUBLE: {
+            gdouble* dblresult;
+
+            dblresult = g_new0(gdouble, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                dblresult[i] = seed_value_to_double(ctx, elem, exception);
+            }
+
+            *array_p = dblresult;
+        } break;
 
 #if GOBJECT_INTROSPECTION_VERSION < 0x000900
-    case GI_TYPE_TAG_INT:
+        case GI_TYPE_TAG_INT:
 #endif
-    case GI_TYPE_TAG_INT32:
-      {
-	gint *intresult;
-
-	intresult = g_new0 (gint, length + 1);
-
-	for (i = 0; i < length; i++)
-	  {
-	    elem = JSObjectGetPropertyAtIndex (ctx,
-					       (JSObjectRef) array,
-					       i, exception);
-	    intresult[i] = seed_value_to_int (ctx, elem, exception);
-	  }
-
-	*array_p = intresult;
-      }
-      break;
-    case GI_TYPE_TAG_UINT8:
-      {
-	guint8 *guint8result;
-
-	guint8result = g_new0 (guint8, length + 1);
-
-	for (i = 0; i < length; i++)
-	  {
-	    elem = JSObjectGetPropertyAtIndex (ctx,
-					       (JSObjectRef) array,
-					       i, exception);
-	    guint8result[i] = seed_value_to_uchar (ctx, elem, exception);
-	  }
-
-	*array_p = guint8result;
-      }
-      break;
-    case GI_TYPE_TAG_INTERFACE:
-      {
-	GIBaseInfo *interface = g_type_info_get_interface (param_type);
-	GIInfoType interface_type = g_base_info_get_type (interface);
-	if (interface_type == GI_INFO_TYPE_OBJECT
-	    || interface_type == GI_INFO_TYPE_INTERFACE
-	    || interface_type == GI_INFO_TYPE_STRUCT)
-	  {
-	    GType type =
-	      g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *)
-						 interface);
-	    if (g_type_is_a (type, G_TYPE_VALUE))
-	      {
-		GValue *gvalresult;
-
-		// TODO:FIXME: Robb. Valgrind thinks there's a leak here,
-		//             at least while running Same Seed.
-		gvalresult = g_new0 (GValue, length + 1);
-
-		for (i = 0; i < length; i++)
-		  {
-		    elem = JSObjectGetPropertyAtIndex (ctx,
-						       (JSObjectRef) array,
-						       i, exception);
-		    seed_value_to_gvalue (ctx, elem,
-					  (GType) 0,
-					  &gvalresult[i], exception);
-		  }
-		*array_p = gvalresult;
-
-		g_base_info_unref (interface);
-		break;
-	      }
-	  }
-
-	g_base_info_unref (interface);
-      }
-    case GI_TYPE_TAG_UINT32:
-      {
-        guint32 *uintresult;
-
-        uintresult = g_new0 (guint32, length + 1);
-
-        for (i = 0; i < length; i++)
-          {
-            elem = JSObjectGetPropertyAtIndex (ctx,
-                                               (JSObjectRef) array,
-                                               i, exception);
-	    uintresult[i] = seed_value_to_uint (ctx, elem, exception);
-          }
-        *array_p = uintresult;
-      }
-      break;
-    default:
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Unhandled array element type");
-      return FALSE;
+        case GI_TYPE_TAG_INT32: {
+            gint* intresult;
+
+            intresult = g_new0(gint, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                intresult[i] = seed_value_to_int(ctx, elem, exception);
+            }
+
+            *array_p = intresult;
+        } break;
+        case GI_TYPE_TAG_UINT8: {
+            guint8* guint8result;
+
+            guint8result = g_new0(guint8, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                guint8result[i] = seed_value_to_uchar(ctx, elem, exception);
+            }
+
+            *array_p = guint8result;
+        } break;
+        case GI_TYPE_TAG_INTERFACE: {
+            GIBaseInfo* interface = g_type_info_get_interface(param_type);
+            GIInfoType interface_type = g_base_info_get_type(interface);
+            if (interface_type == GI_INFO_TYPE_OBJECT
+                || interface_type == GI_INFO_TYPE_INTERFACE
+                || interface_type == GI_INFO_TYPE_STRUCT) {
+                GType type = g_registered_type_info_get_g_type(
+                  (GIRegisteredTypeInfo*) interface);
+                if (g_type_is_a(type, G_TYPE_VALUE)) {
+                    GValue* gvalresult;
+
+                    // TODO:FIXME: Robb. Valgrind thinks there's a leak here,
+                    //             at least while running Same Seed.
+                    gvalresult = g_new0(GValue, length + 1);
+
+                    for (i = 0; i < length; i++) {
+                        elem
+                          = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array,
+                                                       i, exception);
+                        seed_value_to_gvalue(ctx, elem, (GType) 0,
+                                             &gvalresult[i], exception);
+                    }
+                    *array_p = gvalresult;
+
+                    g_base_info_unref(interface);
+                    break;
+                }
+            }
+
+            g_base_info_unref(interface);
+        }
+        case GI_TYPE_TAG_UINT32: {
+            guint32* uintresult;
+
+            uintresult = g_new0(guint32, length + 1);
+
+            for (i = 0; i < length; i++) {
+                elem = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) array, i,
+                                                  exception);
+                uintresult[i] = seed_value_to_uint(ctx, elem, exception);
+            }
+            *array_p = uintresult;
+        } break;
+        default:
+            seed_make_exception(ctx, exception, "ArgumentError",
+                                "Unhandled array element type");
+            return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_value_to_gi_argument (JSContextRef ctx,
-			   JSValueRef value,
-			   GITypeInfo * type_info,
-			   GArgument * arg,
-			   JSValueRef * exception)
+seed_value_to_gi_argument_with_out_length(JSContextRef ctx,
+                                          JSValueRef value,
+                                          GITypeInfo* type_info,
+                                          GITransfer transfer,
+                                          GArgument* arg,
+                                          guint* out_array_length,
+                                          JSValueRef* exception)
 {
-  GITypeTag gi_tag = g_type_info_get_tag (type_info);
-
-  // FIXME: Some types are not "nullable", also need to check if argument
-  // can be null before doing this.
-  if (!value || JSValueIsNull (ctx, value))
-    {
-      arg->v_pointer = 0;
-      return 1;
-    }
+    GITypeTag gi_tag = g_type_info_get_tag(type_info);
 
-  switch (gi_tag)
-    {
-    case GI_TYPE_TAG_VOID:
-      
-      if (g_type_info_is_pointer (type_info))
-      {
-        GObject *gobject;
-        if (JSValueIsString (ctx, value)) 
-          {
-          /* 
-            things like gio.outputstream.write use void pointers 
-            might need a few other types here.. 
-            not very well memory managed. - should be solved by bytearrays when
-            introspection implements it.  
-          */
-          arg->v_string = seed_value_to_string (ctx, value, exception); 
-          break;
-        }
-        /* gtk_statusicon_position_menu / gtk_menu_popup use the userdata for the Gobject */
-        gobject = seed_value_to_object (ctx, value, exception);
-        if (!gobject)
-          return FALSE;
+    // FIXME: Some types are not "nullable", also need to check if argument
+    // can be null before doing this.
+    if (!value || JSValueIsNull(ctx, value)) {
+        arg->v_pointer = 0;
+        return 1;
+    }
 
-        arg->v_pointer = gobject;
-      }
-      break;
+    switch (gi_tag) {
+        case GI_TYPE_TAG_VOID:
+
+            if (g_type_info_is_pointer(type_info)) {
+                GObject* gobject;
+                if (JSValueIsString(ctx, value)) {
+                    /*
+                      things like gio.outputstream.write use void pointers
+                      might need a few other types here..
+                      not very well memory managed. - should be solved by
+                      bytearrays when
+                      introspection implements it.
+                    */
+                    arg->v_string = seed_value_to_string(ctx, value, exception);
+                    break;
+                }
+                /* gtk_statusicon_position_menu / gtk_menu_popup use the
+                 * userdata for the Gobject */
+                gobject = seed_value_to_object(ctx, value, exception);
+                if (!gobject)
+                    return FALSE;
+
+                arg->v_pointer = gobject;
+            }
+            break;
 
 #if GOBJECT_INTROSPECTION_VERSION < 0x000900
-    case GI_TYPE_TAG_LONG:
-      arg->v_long = seed_value_to_long (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_ULONG:
-      arg->v_ulong = seed_value_to_ulong (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_INT:
-      arg->v_int = seed_value_to_int (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_UINT:
-      arg->v_uint = seed_value_to_uint (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_SIZE:
-      arg->v_size = seed_value_to_size (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_SSIZE:
-      arg->v_ssize = seed_value_to_ssize (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_TIME_T:
-      arg->v_long = seed_value_to_time_t (ctx, value, exception);
-      break;
+        case GI_TYPE_TAG_LONG:
+            arg->v_long = seed_value_to_long(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_ULONG:
+            arg->v_ulong = seed_value_to_ulong(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_INT:
+            arg->v_int = seed_value_to_int(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_UINT:
+            arg->v_uint = seed_value_to_uint(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_SIZE:
+            arg->v_size = seed_value_to_size(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_SSIZE:
+            arg->v_ssize = seed_value_to_ssize(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_TIME_T:
+            arg->v_long = seed_value_to_time_t(ctx, value, exception);
+            break;
 #endif
 
-    case GI_TYPE_TAG_BOOLEAN:
-      arg->v_boolean = seed_value_to_boolean (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_INT8:
-      arg->v_int8 = seed_value_to_char (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_UINT8:
-      arg->v_uint8 = seed_value_to_uchar (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_INT16:
-      arg->v_int16 = seed_value_to_int (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_UINT16:
-      arg->v_uint16 = seed_value_to_uint (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_INT32:
-      arg->v_int32 = seed_value_to_int (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_UINT32:
-      arg->v_uint32 = seed_value_to_uint (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_INT64:
-      arg->v_int64 = seed_value_to_int64 (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_UINT64:
-      arg->v_uint64 = seed_value_to_uint64 (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_FLOAT:
-      arg->v_float = seed_value_to_float (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_DOUBLE:
-      arg->v_double = seed_value_to_double (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_UTF8:
-      arg->v_string = seed_value_to_string (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_FILENAME:
-      arg->v_string = seed_value_to_filename (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_GTYPE:
-      arg->v_int = seed_value_to_int (ctx, value, exception);
-      break;
-    case GI_TYPE_TAG_INTERFACE:
-      {
-	GIBaseInfo *interface;
-	GIInfoType interface_type;
-	GType required_gtype;
-	GObject *gobject;
-
-	interface = g_type_info_get_interface (type_info);
-	interface_type = g_base_info_get_type (interface);
-
-	arg->v_pointer = NULL;
-
-	if (interface_type == GI_INFO_TYPE_OBJECT ||
-	    interface_type == GI_INFO_TYPE_INTERFACE)
-	  {
-	    gobject = seed_value_to_object (ctx, value, exception);
-	    required_gtype =
-	      g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *)
-						 interface);
-
-	    // FIXME: Not clear if the g_type_is_a check is desired here.
-	    // Possibly 'breaks things' when we don't have introspection
-	    // data for some things in an interface hierarchy. Hasn't
-	    // provided any problems so far.
-	    if (!gobject
-		|| !g_type_is_a (G_OBJECT_TYPE (gobject), required_gtype))
-	      {
-		g_base_info_unref (interface);
-		return FALSE;
-	      }
-
-	    arg->v_pointer = gobject;
-	    g_base_info_unref (interface);
-	    break;
-	  }
-	else if (interface_type == GI_INFO_TYPE_ENUM ||
-		 interface_type == GI_INFO_TYPE_FLAGS)
-	  {
-	    // this might need fixing...
-            arg->v_long = seed_value_to_long (ctx, value, exception);
-	    if (!(interface_type == GI_INFO_TYPE_FLAGS)
-		&& !seed_validate_enum ((GIEnumInfo *) interface,
-					arg->v_long))
-	      {
-		seed_make_exception (ctx, exception, "EnumRange",
-				     "Enum value: %ld is out of range",
-				     arg->v_long);
-		g_base_info_unref (interface);
-
-		return FALSE;
-	      }
-
-	    g_base_info_unref (interface);
-	    break;
-	  }
-	else if (interface_type == GI_INFO_TYPE_STRUCT ||
-		 interface_type == GI_INFO_TYPE_UNION)
-	  {
-	    if (JSValueIsObjectOfClass (ctx, value, seed_struct_class))
-	      arg->v_pointer = seed_pointer_get_pointer (ctx, value);
-	    else if (JSValueIsObjectOfClass (ctx, value, seed_union_class))
-	      arg->v_pointer = seed_pointer_get_pointer (ctx, value);
-	    else
-	      {
-		GType type =
-		  g_registered_type_info_get_g_type ((GIRegisteredTypeInfo
-						      *) interface);
-		if (!type)
-		  {
-		    g_base_info_unref (interface);
-		    return FALSE;
-		  }
-		else if (type == G_TYPE_VALUE)
-		  {
-		    GValue *gval = g_slice_alloc0 (sizeof (GValue));
-		    seed_value_to_gvalue (ctx,
-					  value,
-					  (GType) NULL,
-					  gval, exception);
-		    arg->v_pointer = gval;
-
-		    g_base_info_unref (interface);
-		    break;
-		  }
-		// Automatically convert between functions and
-		// GClosures where expected.
-		else if (g_type_is_a (type, G_TYPE_CLOSURE))
-		  {
-		    if (JSObjectIsFunction (ctx, (JSObjectRef) value))
-		      {
-			arg->v_pointer =
-			  seed_closure_new (ctx, (JSObjectRef) value, NULL,
-					    NULL);
-		      }
-		  }
-		else
-		  {
-		    JSObjectRef strukt =
-		      seed_construct_struct_type_with_parameters (ctx,
-								  interface,
-								  (JSObjectRef) value,
-								  exception);
-		    arg->v_pointer = seed_pointer_get_pointer (ctx, strukt);
-		  }
-	      }
-	    g_base_info_unref (interface);
-	    break;
-	  }
-	else if (interface_type == GI_INFO_TYPE_CALLBACK)
-	  {
-	    if (JSValueIsNull (ctx, value))
-	      {
-		arg->v_pointer = NULL;
-		g_base_info_unref (interface);
-		break;
-	      }
-	    // Someone passes in a wrapper around a method where a
-	    // callback is expected, i.e Clutter.sine_inc_func, as an alpha
-	    // Have to dlsym the symbol to be able to do this.
-	    // NOTE: Some cases where dlsym(NULL, symbol) doesn't work depending
-	    // On how libseed is loaded.
-	    else if (JSValueIsObjectOfClass (ctx,
-					     value, gobject_method_class))
-	      {
-		GIFunctionInfo *info =
-		  JSObjectGetPrivate ((JSObjectRef) value);
-		const gchar *symbol = g_function_info_get_symbol (info);
-		gchar *error;
-		void *fp;
-
-		dlerror ();
-		fp = (void *) dlsym (0, symbol);
-		if ((error = dlerror ()) != NULL)
-		  {
-		    g_critical ("dlerror: %s \n", error);
-		  }
-		else
-		  {
-		    arg->v_pointer = fp;
-		    g_base_info_unref (interface);
-		    break;
-		  }
-	      }
-	    // Somewhat deprecated from when it was necessary to manually
-	    // create closure objects...
-	    else if (JSValueIsObjectOfClass (ctx,
-					     value,
-					     seed_native_callback_class))
-	      {
-		SeedNativeClosure *privates =
-		  (SeedNativeClosure *)
-		  JSObjectGetPrivate ((JSObjectRef) value);
-		arg->v_pointer = privates->closure;
-		g_base_info_unref (interface);
-		break;
-	      }
-	    // Automagically create closure around function passed in as
-	    // callback.
-	    else if (JSObjectIsFunction (ctx, (JSObjectRef) value))
-	      {
-		SeedNativeClosure *privates = seed_make_native_closure (ctx,
-									(GICallableInfo *) interface,
-									value);
-		arg->v_pointer = privates->closure;
-		g_base_info_unref (interface);
-		break;
-	      }
-
-	  }
-      }
-    case GI_TYPE_TAG_ARRAY:
-      {
-	if (JSValueIsNull (ctx, value))
-	  {
-	    arg->v_pointer = NULL;
-	    break;
-	  }
-	else if (!JSValueIsObject (ctx, value))
-	  {
-	    // TODO: FIXME: Is this right?
-	    return FALSE;
-	  }
-	else
-	  {
-	    GITypeInfo *param_type;
-	    //TODO: FIXME: Better array test like the cool one on reddit.
-	    guint length =
-	      seed_value_to_int (ctx, seed_object_get_property (ctx,
-								(JSObjectRef)
-								value,
-								"length"),
-				 exception);
-	    if (!length)
-	      {
-		arg->v_pointer = NULL;
-		break;
-	      }
-
-	    param_type = g_type_info_get_param_type (type_info, 0);
-	    if (!seed_gi_make_array (ctx, value, length, param_type,
-				     &arg->v_pointer, exception))
-	      {
-		g_base_info_unref ((GIBaseInfo *) param_type);
-		return FALSE;
-	      }
-	    g_base_info_unref ((GIBaseInfo *) param_type);
-	    break;
-	  }
-      }
-    case GI_TYPE_TAG_GHASH:
-      {
-        GITypeInfo *key_param_info, *val_param_info;
-        GHashTable *hash_table;
-
-        JSPropertyNameArrayRef jsprops = 0;
-        JSStringRef jsprop_name;
-        JSValueRef jsprop_value;
-        int i, nparams = 0;
-
-        if (!JSValueIsObject (ctx, value))
-          {
-            return FALSE;
-          }
+        case GI_TYPE_TAG_BOOLEAN:
+            arg->v_boolean = seed_value_to_boolean(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_INT8:
+            arg->v_int8 = seed_value_to_char(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_UINT8:
+            arg->v_uint8 = seed_value_to_uchar(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_INT16:
+            arg->v_int16 = seed_value_to_int(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_UINT16:
+            arg->v_uint16 = seed_value_to_uint(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_INT32:
+            arg->v_int32 = seed_value_to_int(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_UINT32:
+            arg->v_uint32 = seed_value_to_uint(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_INT64:
+            arg->v_int64 = seed_value_to_int64(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_UINT64:
+            arg->v_uint64 = seed_value_to_uint64(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_FLOAT:
+            arg->v_float = seed_value_to_float(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_DOUBLE:
+            arg->v_double = seed_value_to_double(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_UTF8:
+            arg->v_string = seed_value_to_string(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_FILENAME:
+            arg->v_string = seed_value_to_filename(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_GTYPE:
+            arg->v_int = seed_value_to_int(ctx, value, exception);
+            break;
+        case GI_TYPE_TAG_INTERFACE: {
+            GIBaseInfo* interface;
+            GIInfoType interface_type;
+            GType required_gtype;
+            GObject* gobject;
+
+            interface = g_type_info_get_interface(type_info);
+            interface_type = g_base_info_get_type(interface);
 
-        if (JSValueIsNull (ctx, value))
-          {
             arg->v_pointer = NULL;
-            break;
-          }
-
-        key_param_info = g_type_info_get_param_type (type_info, 0);
-        g_assert(key_param_info != NULL);
-        if (g_type_info_get_tag (key_param_info) != GI_TYPE_TAG_UTF8)
-          {
-            /* Functions requesting a hash table with non-string keys are
-             * not supported */
-            return FALSE;
-          }
-
-        val_param_info = g_type_info_get_param_type (type_info, 1);
-        g_assert(val_param_info != NULL);
-
-        jsprops = JSObjectCopyPropertyNames (ctx, (JSObjectRef) value);
-        nparams = JSPropertyNameArrayGetCount (jsprops);
-
-        /* keys are strings and the destructor is g_free
-         * values will be freed in seed_release_arg
-         */
-        hash_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-        for (i = 0; i < nparams; i++)
-          {
-            char *prop_name;
-            int length;
-            GArgument hash_arg;
-
-            jsprop_name = JSPropertyNameArrayGetNameAtIndex (jsprops, i);
-
-            length = JSStringGetMaximumUTF8CStringSize (jsprop_name);
-            prop_name = g_malloc (length * sizeof (gchar));
-            JSStringGetUTF8CString (jsprop_name, prop_name, length);
-
-            jsprop_value = JSObjectGetProperty (ctx,
-                                                (JSObjectRef) value,
-                                                jsprop_name, NULL);
-
-            if (!seed_value_to_gi_argument (ctx, jsprop_value,
-                                        val_param_info,
-                                        &hash_arg,
-                                        exception))
-              {
-                g_hash_table_destroy (hash_table);
-                g_base_info_unref ((GIBaseInfo *) val_param_info);
+
+            if (interface_type == GI_INFO_TYPE_OBJECT
+                || interface_type == GI_INFO_TYPE_INTERFACE) {
+                gobject = seed_value_to_object(ctx, value, exception);
+                required_gtype = g_registered_type_info_get_g_type(
+                  (GIRegisteredTypeInfo*) interface);
+
+                // FIXME: Not clear if the g_type_is_a check is desired here.
+                // Possibly 'breaks things' when we don't have introspection
+                // data for some things in an interface hierarchy. Hasn't
+                // provided any problems so far.
+                if (!gobject
+                    || !g_type_is_a(G_OBJECT_TYPE(gobject), required_gtype)) {
+                    g_base_info_unref(interface);
+                    return FALSE;
+                }
+
+                arg->v_pointer = gobject;
+                // FIXME: This has to be done for other types too
+                if (transfer == GI_TRANSFER_EVERYTHING)
+                    g_object_ref(gobject);
+                g_base_info_unref(interface);
+                break;
+            } else if (interface_type == GI_INFO_TYPE_ENUM
+                       || interface_type == GI_INFO_TYPE_FLAGS) {
+                // this might need fixing...
+                arg->v_long = seed_value_to_long(ctx, value, exception);
+                if (!(interface_type == GI_INFO_TYPE_FLAGS)
+                    && !seed_validate_enum((GIEnumInfo*) interface,
+                                           arg->v_long)) {
+                    seed_make_exception(ctx, exception, "EnumRange",
+                                        "Enum value: %ld is out of range",
+                                        arg->v_long);
+                    g_base_info_unref(interface);
+
+                    return FALSE;
+                }
+
+                g_base_info_unref(interface);
+                break;
+            } else if (interface_type == GI_INFO_TYPE_STRUCT
+                       || interface_type == GI_INFO_TYPE_UNION) {
+                if (JSValueIsObjectOfClass(ctx, value, seed_struct_class))
+                    arg->v_pointer = seed_pointer_get_pointer(ctx, value);
+                else if (JSValueIsObjectOfClass(ctx, value, seed_union_class))
+                    arg->v_pointer = seed_pointer_get_pointer(ctx, value);
+                else {
+                    GType type = g_registered_type_info_get_g_type(
+                      (GIRegisteredTypeInfo*) interface);
+                    if (!type) {
+                        g_base_info_unref(interface);
+                        return FALSE;
+                    } else if (type == G_TYPE_VALUE) {
+                        GValue* gval = g_slice_alloc0(sizeof(GValue));
+                        seed_value_to_gvalue(ctx, value, (GType) NULL, gval,
+                                             exception);
+                        arg->v_pointer = gval;
+
+                        g_base_info_unref(interface);
+                        break;
+                    }
+                    // Automatically convert between functions and
+                    // GClosures where expected.
+                    else if (g_type_is_a(type, G_TYPE_CLOSURE)) {
+                        if (JSObjectIsFunction(ctx, (JSObjectRef) value)) {
+                            arg->v_pointer
+                              = seed_closure_new(ctx, (JSObjectRef) value, NULL,
+                                                 NULL);
+                        }
+                    } else {
+                        JSObjectRef strukt
+                          = seed_construct_struct_type_with_parameters(
+                            ctx, interface, (JSObjectRef) value, exception);
+                        arg->v_pointer = seed_pointer_get_pointer(ctx, strukt);
+                    }
+                }
+                g_base_info_unref(interface);
+                break;
+            } else if (interface_type == GI_INFO_TYPE_CALLBACK) {
+                if (JSValueIsNull(ctx, value)) {
+                    arg->v_pointer = NULL;
+                    g_base_info_unref(interface);
+                    break;
+                }
+                // Someone passes in a wrapper around a method where a
+                // callback is expected, i.e Clutter.sine_inc_func, as an alpha
+                // Have to dlsym the symbol to be able to do this.
+                // NOTE: Some cases where dlsym(NULL, symbol) doesn't work
+                // depending
+                // On how libseed is loaded.
+                else if (JSValueIsObjectOfClass(ctx, value,
+                                                gobject_method_class)) {
+                    GIFunctionInfo* info
+                      = JSObjectGetPrivate((JSObjectRef) value);
+                    const gchar* symbol = g_function_info_get_symbol(info);
+                    gchar* error;
+                    void* fp;
+
+                    dlerror();
+                    fp = (void*) dlsym(0, symbol);
+                    if ((error = dlerror()) != NULL) {
+                        g_critical("dlerror: %s \n", error);
+                    } else {
+                        arg->v_pointer = fp;
+                        g_base_info_unref(interface);
+                        break;
+                    }
+                }
+                // Somewhat deprecated from when it was necessary to manually
+                // create closure objects...
+                else if (JSValueIsObjectOfClass(ctx, value,
+                                                seed_native_callback_class)) {
+                    SeedNativeClosure* privates
+                      = (SeedNativeClosure*) JSObjectGetPrivate(
+                        (JSObjectRef) value);
+                    arg->v_pointer = privates->closure;
+                    g_base_info_unref(interface);
+                    break;
+                }
+                // Automagically create closure around function passed in as
+                // callback.
+                else if (JSObjectIsFunction(ctx, (JSObjectRef) value)) {
+                    SeedNativeClosure* privates
+                      = seed_make_native_closure(ctx,
+                                                 (GICallableInfo*) interface,
+                                                 value);
+                    arg->v_pointer = privates->closure;
+                    g_base_info_unref(interface);
+                    break;
+                }
+            }
+        }
+        case GI_TYPE_TAG_ARRAY: {
+            if (JSValueIsNull(ctx, value)) {
+                arg->v_pointer = NULL;
+                break;
+            } else if (JSValueIsString(ctx, value)) {
+                GITypeInfo* param_type;
+                param_type = g_type_info_get_param_type(type_info, 0);
+
+                JSStringRef js_string
+                  = JSValueToStringCopy(ctx, value, exception);
+                size_t length = JSStringGetMaximumUTF8CStringSize(js_string);
+                if (!seed_gi_make_array_from_string(ctx, js_string, param_type,
+                                                    length, &arg->v_pointer,
+                                                    out_array_length,
+                                                    exception)) {
+                    g_base_info_unref((GIBaseInfo*) param_type);
+                    JSStringRelease(js_string);
+                    return FALSE;
+                }
+                JSStringRelease(js_string);
+                g_base_info_unref((GIBaseInfo*) param_type);
+                break;
+            } else if (!JSValueIsObject(ctx, value)) {
+                // TODO: FIXME: Is this right?
                 return FALSE;
-              }
+            } else {
+                GITypeInfo* param_type;
+                // TODO: FIXME: Better array test like the cool one on reddit.
+                guint length = seed_value_to_int(
+                  ctx,
+                  seed_object_get_property(ctx, (JSObjectRef) value, "length"),
+                  exception);
+                if (!length) {
+                    arg->v_pointer = NULL;
+                    break;
+                }
+
+                param_type = g_type_info_get_param_type(type_info, 0);
+                if (!seed_gi_make_array(ctx, value, length, param_type,
+                                        &arg->v_pointer, exception)) {
+                    g_base_info_unref((GIBaseInfo*) param_type);
+                    return FALSE;
+                }
+                if (out_array_length != NULL)
+                    *out_array_length = length;
+
+                g_base_info_unref((GIBaseInfo*) param_type);
+                break;
+            }
+        }
+        case GI_TYPE_TAG_GHASH: {
+            GITypeInfo *key_param_info, *val_param_info;
+            GHashTable* hash_table;
+
+            JSPropertyNameArrayRef jsprops = 0;
+            JSStringRef jsprop_name;
+            JSValueRef jsprop_value;
+            int i, nparams = 0;
+
+            if (!JSValueIsObject(ctx, value)) {
+                return FALSE;
+            }
+
+            if (JSValueIsNull(ctx, value)) {
+                arg->v_pointer = NULL;
+                break;
+            }
+
+            key_param_info = g_type_info_get_param_type(type_info, 0);
+            g_assert(key_param_info != NULL);
+            if (g_type_info_get_tag(key_param_info) != GI_TYPE_TAG_UTF8) {
+                /* Functions requesting a hash table with non-string keys are
+                 * not supported */
+                return FALSE;
+            }
+
+            val_param_info = g_type_info_get_param_type(type_info, 1);
+            g_assert(val_param_info != NULL);
 
-            g_hash_table_insert (hash_table,
-                                 prop_name,
-                                 hash_arg.v_pointer);
-          }
+            jsprops = JSObjectCopyPropertyNames(ctx, (JSObjectRef) value);
+            nparams = JSPropertyNameArrayGetCount(jsprops);
 
-        arg->v_pointer = hash_table;
+            /* keys are strings and the destructor is g_free
+             * values will be freed in seed_release_arg
+             */
+            hash_table
+              = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-        break;
-      }
-    default:
-      return FALSE;
+            for (i = 0; i < nparams; i++) {
+                char* prop_name;
+                int length;
+                GArgument hash_arg;
 
+                jsprop_name = JSPropertyNameArrayGetNameAtIndex(jsprops, i);
+
+                length = JSStringGetMaximumUTF8CStringSize(jsprop_name);
+                prop_name = g_malloc(length * sizeof(gchar));
+                JSStringGetUTF8CString(jsprop_name, prop_name, length);
+
+                jsprop_value = JSObjectGetProperty(ctx, (JSObjectRef) value,
+                                                   jsprop_name, NULL);
+
+                if (!seed_value_to_gi_argument(ctx, jsprop_value,
+                                               val_param_info,
+                                               GI_TRANSFER_NOTHING, &hash_arg,
+                                               exception)) {
+                    g_hash_table_destroy(hash_table);
+                    g_base_info_unref((GIBaseInfo*) val_param_info);
+                    return FALSE;
+                }
+
+                g_hash_table_insert(hash_table, prop_name, hash_arg.v_pointer);
+            }
+
+            arg->v_pointer = hash_table;
+
+            break;
+        }
+        default:
+            return FALSE;
     }
-  return TRUE;
+    return TRUE;
+}
 
+gboolean
+seed_value_to_gi_argument(JSContextRef ctx,
+                          JSValueRef value,
+                          GITypeInfo* type_info,
+                          GITransfer transfer,
+                          GArgument* arg,
+                          JSValueRef* exception)
+{
+    return seed_value_to_gi_argument_with_out_length(ctx, value, type_info,
+                                                     transfer, arg, NULL,
+                                                     exception);
 }
 
 JSValueRef
-seed_value_from_gi_argument (JSContextRef ctx,
-			     GArgument * arg,
-			     GITypeInfo * type_info,
-			     JSValueRef * exception)
+seed_value_from_gi_argument(JSContextRef ctx,
+                            GArgument* arg,
+                            GITypeInfo* type_info,
+                            JSValueRef* exception)
 {
-  
- return seed_value_from_gi_argument_full (
-                            ctx,
-			    arg,
-			    type_info,
-			    exception,
-			    0,
-                            g_type_info_get_tag (type_info) );
+
+    return seed_value_from_gi_argument_full(ctx, arg, type_info, exception, 0,
+                                            g_type_info_get_tag(type_info));
 }
-  
+
 JSValueRef
-seed_value_from_gi_argument_full (JSContextRef ctx,
-			     GArgument * arg,
-			     GITypeInfo * type_info,
-			     JSValueRef * exception,
-			     guint64 array_len,
-                             GITypeTag gi_tag
-                             )
+seed_value_from_gi_argument_full(JSContextRef ctx,
+                                 GArgument* arg,
+                                 GITypeInfo* type_info,
+                                 JSValueRef* exception,
+                                 guint64 array_len,
+                                 GITypeTag gi_tag)
 {
-  
-  //seed_value_from_gi_argument_with_length : g_type_tag_to_string(gi_tag)
-   SEED_NOTE (INVOCATION,
-            "seed_value_from_gi_argument_full: arg_type = %s ",
-            g_type_tag_to_string(gi_tag)
-            ); 
 
-  switch (gi_tag)
-    {
+    // seed_value_from_gi_argument_with_length : g_type_tag_to_string(gi_tag)
+    SEED_NOTE(INVOCATION, "seed_value_from_gi_argument_full: arg_type = %s ",
+              g_type_tag_to_string(gi_tag));
+
+    switch (gi_tag) {
 
 #if GOBJECT_INTROSPECTION_VERSION < 0x000900
-    case GI_TYPE_TAG_LONG:
-      return seed_value_from_long (ctx, arg->v_long, exception);
-    case GI_TYPE_TAG_ULONG:
-      return seed_value_from_ulong (ctx, arg->v_ulong, exception);
-    case GI_TYPE_TAG_INT:
-      return seed_value_from_int (ctx, arg->v_int32, exception);
-    case GI_TYPE_TAG_UINT:
-      return seed_value_from_uint (ctx, arg->v_uint32, exception);
-    case GI_TYPE_TAG_SSIZE:
-      return seed_value_from_ssize (ctx, arg->v_ssize, exception);
-    case GI_TYPE_TAG_SIZE:
-      return seed_value_from_size (ctx, arg->v_size, exception);
-    case GI_TYPE_TAG_TIME_T:
-      return seed_value_from_time_t (ctx, arg->v_long, exception);
+        case GI_TYPE_TAG_LONG:
+            return seed_value_from_long(ctx, arg->v_long, exception);
+        case GI_TYPE_TAG_ULONG:
+            return seed_value_from_ulong(ctx, arg->v_ulong, exception);
+        case GI_TYPE_TAG_INT:
+            return seed_value_from_int(ctx, arg->v_int32, exception);
+        case GI_TYPE_TAG_UINT:
+            return seed_value_from_uint(ctx, arg->v_uint32, exception);
+        case GI_TYPE_TAG_SSIZE:
+            return seed_value_from_ssize(ctx, arg->v_ssize, exception);
+        case GI_TYPE_TAG_SIZE:
+            return seed_value_from_size(ctx, arg->v_size, exception);
+        case GI_TYPE_TAG_TIME_T:
+            return seed_value_from_time_t(ctx, arg->v_long, exception);
 #endif
-    case GI_TYPE_TAG_VOID:
-      return JSValueMakeUndefined (ctx);
-    case GI_TYPE_TAG_BOOLEAN:
-      return seed_value_from_boolean (ctx, arg->v_boolean, exception);
-    case GI_TYPE_TAG_INT8:
-      return seed_value_from_char (ctx, arg->v_int8, exception);
-    case GI_TYPE_TAG_UINT8:
-      return seed_value_from_uchar (ctx, arg->v_uint8, exception);
-    case GI_TYPE_TAG_INT16:
-      return seed_value_from_int (ctx, arg->v_int16, exception);
-    case GI_TYPE_TAG_UINT16:
-      return seed_value_from_uint (ctx, arg->v_uint16, exception);
-    case GI_TYPE_TAG_INT32:
-      return seed_value_from_int (ctx, arg->v_int32, exception);
-    case GI_TYPE_TAG_UINT32:
-      return seed_value_from_uint (ctx, arg->v_uint32, exception);
-    case GI_TYPE_TAG_INT64:
-      return seed_value_from_int64 (ctx, arg->v_int64, exception);
-    case GI_TYPE_TAG_UINT64:
-      return seed_value_from_uint64 (ctx, arg->v_uint64, exception);
-    case GI_TYPE_TAG_FLOAT:
-      return seed_value_from_float (ctx, arg->v_float, exception);
-    case GI_TYPE_TAG_DOUBLE:
-      return seed_value_from_double (ctx, arg->v_double, exception);
-    case GI_TYPE_TAG_UTF8:
-      return seed_value_from_string (ctx, arg->v_string, exception);
-    case GI_TYPE_TAG_FILENAME:
-      return seed_value_from_filename (ctx, arg->v_string, exception);
-    case GI_TYPE_TAG_GTYPE:
-      return seed_value_from_int (ctx, arg->v_int, exception);
-    case GI_TYPE_TAG_ARRAY:
-      {
-
-        GIArrayType array_type;
-	GITypeInfo *array_type_info;
-	JSValueRef ret;
-
-	if (arg->v_pointer == NULL)
-	  return JSValueMakeNull (ctx);
-
-        array_type = g_type_info_get_array_type (type_info);
-
-	array_type_info = g_type_info_get_param_type (type_info, 0);
-	
-	
-
-        if (array_type == GI_ARRAY_TYPE_PTR_ARRAY)
-          {
-            JSObjectRef ret_ptr_array;
-            GPtrArray *ptr = arg->v_pointer;
-            GArgument larg;
-            int length = 0;
-            int i;
+        case GI_TYPE_TAG_VOID:
+            return JSValueMakeUndefined(ctx);
+        case GI_TYPE_TAG_BOOLEAN:
+            return seed_value_from_boolean(ctx, arg->v_boolean, exception);
+        case GI_TYPE_TAG_INT8:
+            return seed_value_from_char(ctx, arg->v_int8, exception);
+        case GI_TYPE_TAG_UINT8:
+            return seed_value_from_uchar(ctx, arg->v_uint8, exception);
+        case GI_TYPE_TAG_INT16:
+            return seed_value_from_int(ctx, arg->v_int16, exception);
+        case GI_TYPE_TAG_UINT16:
+            return seed_value_from_uint(ctx, arg->v_uint16, exception);
+        case GI_TYPE_TAG_INT32:
+            return seed_value_from_int(ctx, arg->v_int32, exception);
+        case GI_TYPE_TAG_UINT32:
+            return seed_value_from_uint(ctx, arg->v_uint32, exception);
+        case GI_TYPE_TAG_INT64:
+            return seed_value_from_int64(ctx, arg->v_int64, exception);
+        case GI_TYPE_TAG_UINT64:
+            return seed_value_from_uint64(ctx, arg->v_uint64, exception);
+        case GI_TYPE_TAG_FLOAT:
+            return seed_value_from_float(ctx, arg->v_float, exception);
+        case GI_TYPE_TAG_DOUBLE:
+            return seed_value_from_double(ctx, arg->v_double, exception);
+        case GI_TYPE_TAG_UTF8:
+            return seed_value_from_string(ctx, arg->v_string, exception);
+        case GI_TYPE_TAG_FILENAME:
+            return seed_value_from_filename(ctx, arg->v_string, exception);
+        case GI_TYPE_TAG_GTYPE:
+            return seed_value_from_int(ctx, arg->v_int, exception);
+        case GI_TYPE_TAG_ARRAY: {
+
+            GIArrayType array_type;
+            GITypeInfo* array_type_info;
+            JSValueRef ret;
 
-            length = ptr->len;
-            ret_ptr_array = JSObjectMakeArray (ctx, 0, NULL, exception);
+            if (arg->v_pointer == NULL)
+                return JSValueMakeNull(ctx);
 
-            for (i = 0; i < length; ++i) 
-              {
-                JSValueRef ival;
+            array_type = g_type_info_get_array_type(type_info);
 
-                larg.v_pointer =  g_ptr_array_index(ptr, i);
-                ival = (JSValueRef) seed_value_from_gi_argument (ctx, &larg,
-                                                                 array_type_info, exception);
-                if (!ival)
-                  ival = JSValueMakeNull (ctx);
-
-                JSObjectSetPropertyAtIndex (ctx, ret_ptr_array, i, ival, NULL);
-              }
-	    
-	    g_base_info_unref ((GIBaseInfo *) array_type_info);
-            
-	    return ret_ptr_array;
-          }
-	
-	// technically gir has arrays of bytes, eg.
-	// <array length="2" zero-terminated="0" c:type="gchar**"><type name="guint8"/>
-	// example : g_file_get_contents..
-	// we can treat this as a string.. - it's a bit flakey, we should really use
-	// Uint8Array - need to check the webkit API for this..
-	 
-	if  (
-	        !g_type_info_is_zero_terminated (type_info)
-	      && array_type == GI_ARRAY_TYPE_C
-	      && GI_TYPE_TAG_UINT8 == g_type_info_get_tag (array_type_info)
-	      && array_len > 0
-	    )
-	  {
-	    // got a stringy array..
-	    // we should check g_type_info_get_array_fixed_size
-	    // we are assuming that this is the array_len from the call..
-	    g_base_info_unref ((GIBaseInfo *) array_type_info);
-	    
-	    ret = seed_value_from_binary_string (ctx, arg->v_pointer, array_len, exception);
-	    // always free arg... what about when we do not own it...?
-	    //g_free(arg->v_pointer);
-	
-	    return ret;
- 
-	  }
-        
-
-	if (!g_type_info_is_zero_terminated (type_info))
-	  {
-	    g_base_info_unref ((GIBaseInfo *) array_type_info);
-	    break;
-	  }
- 
-	ret = seed_gi_make_jsarray (ctx, arg->v_pointer, array_type_info,
-				    exception);
-
-	g_base_info_unref ((GIBaseInfo *) array_type_info);
-
-	return ret;
-      }
-    case GI_TYPE_TAG_INTERFACE:
-      {
-	GIBaseInfo *interface;
-	GIInfoType interface_type;
-
-	interface = g_type_info_get_interface (type_info);
-	interface_type = g_base_info_get_type (interface);
-
-	if (interface_type == GI_INFO_TYPE_OBJECT ||
-	    interface_type == GI_INFO_TYPE_INTERFACE)
-	  {
-	    if (arg->v_pointer == 0)
-	      {
-		g_base_info_unref (interface);
-		return JSValueMakeNull (ctx);
-	      }
-	    g_base_info_unref (interface);
-	    return seed_value_from_object (ctx, arg->v_pointer, exception);
-	  }
-        else if (interface_type == GI_INFO_TYPE_ENUM)
-	  {
-            JSValueRef ret;
-            GITypeTag etype = g_enum_info_get_storage_type (interface); 
-	    
-            // needs GITypeInfo - we are sending it  GIBaseInfo
-            
-            ret =  seed_value_from_gi_argument_full (
-                            ctx,
-			    arg,
-			    type_info,
-			    exception,
-			    0,
-                            etype);
-            g_base_info_unref (interface);
-            return ret;
-	  }
-	else if ( interface_type == GI_INFO_TYPE_FLAGS)
-	  {
-             
-	    g_base_info_unref (interface);
-	    return seed_value_from_long (ctx, arg->v_long, exception);
-	  }
-	else if (interface_type == GI_INFO_TYPE_STRUCT)
-	  {
-	    JSValueRef strukt;
-
-	    strukt = seed_make_struct (ctx, arg->v_pointer, interface);
-	    g_base_info_unref (interface);
-
-	    return strukt;
-	  }
-	else if (interface_type == GI_INFO_TYPE_CALLBACK)
-	  { 
-	    /* FIXME: return values of type callback are not handled yet. */
-	    g_base_info_unref (interface);
-	    return FALSE;
-	  }
-	/* fall through - other types?? */
-	g_base_info_unref (interface);
-	return FALSE;
-      }
-
-    case GI_TYPE_TAG_GLIST:
-      {
-	GITypeInfo *list_type;
-	JSObjectRef ret;
-	GArgument larg;
-	gint i = 0;
-	GList *list = arg->v_pointer;
-
-	ret = JSObjectMakeArray (ctx, 0, NULL, exception);
-	list_type = g_type_info_get_param_type (type_info, 0);
-
-	for (; list != NULL; list = list->next)
-	  {
-	    JSValueRef ival;
-
-	    larg.v_pointer = list->data;
-	    ival =
-	      (JSValueRef) seed_value_from_gi_argument (ctx, &larg,
-							list_type, exception);
-	    if (!ival)
-	      ival = JSValueMakeNull (ctx);
-	    JSObjectSetPropertyAtIndex (ctx, ret, i, ival, NULL);
-	    i++;
-	  }
-	return ret;
-
-      }
-    case GI_TYPE_TAG_GSLIST:
-      {
-	GITypeInfo *list_type;
-	JSObjectRef ret;
-	JSValueRef ival;
-	GArgument larg;
-	guint i = 0;
-	GSList *list = arg->v_pointer;
-
-	ret = JSObjectMakeArray (ctx, 0, NULL, exception);
-	list_type = g_type_info_get_param_type (type_info, 0);
-
-	for (; list != NULL; list = list->next)
-	  {
-	    larg.v_pointer = list->data;
-	    ival =
-	      (JSValueRef) seed_value_from_gi_argument (ctx, &larg,
-							list_type, exception);
-	    if (!ival)
-	      ival = JSValueMakeNull (ctx);
-	    JSObjectSetPropertyAtIndex (ctx, ret, i, ival, NULL);
-	    i++;
-	  }
-	return ret;
-      }
-    case GI_TYPE_TAG_GHASH:
-      {
-        GITypeInfo *key_type;
-        GITypeTag key_type_tag;
-        GITypeInfo *value_type;
-        JSObjectRef ret;
-        GHashTable *hash_table;
-        GHashTableIter iter;
-        gpointer key, value;
-
-        key_type = g_type_info_get_param_type (type_info, 0);
-        key_type_tag = g_type_info_get_tag (key_type);
-
-        if ((key_type_tag != GI_TYPE_TAG_UTF8) &&
-            (key_type_tag != GI_TYPE_TAG_FILENAME))
-          {
-            char *error_message = g_strdup_printf ("Unable to make object from hash table indexed with values of type %s", g_type_tag_to_string (key_type_tag));
-            seed_make_exception (ctx, exception, "ArgumentError",
-                                 error_message);
-            g_free (error_message);
-            return JSValueMakeNull (ctx);
-          }
-
-        value_type = g_type_info_get_param_type (type_info, 1);
-
-        ret = JSObjectMake (ctx, NULL, NULL);
-
-        hash_table = arg->v_pointer;
-        g_hash_table_iter_init (&iter, hash_table);
-
-        while (g_hash_table_iter_next (&iter, &key, &value))
-          {
-            JSStringRef js_key;
-            GArgument value_arg;
-            JSValueRef value_jsval;
-
-            js_key = JSStringCreateWithUTF8CString ((const char*) key);
-
-            value_arg.v_string = value;
-            value_jsval = seed_value_from_gi_argument_full (ctx, &value_arg,
-                                                                 value_type, exception, 0, key_type_tag);
-
-            JSObjectSetProperty (ctx, ret, js_key, value_jsval, 0, NULL);
-          }
+            array_type_info = g_type_info_get_param_type(type_info, 0);
 
-        return ret;
-      }
-    case GI_TYPE_TAG_ERROR:
-      {
-        JSValueRef ret;
-        seed_make_exception_from_gerror (ctx, &ret, (GError*) arg->v_pointer);
-        return ret;
-      }
+            if (array_type == GI_ARRAY_TYPE_PTR_ARRAY) {
+                JSObjectRef ret_ptr_array;
+                GPtrArray* ptr = arg->v_pointer;
+                GArgument larg;
+                int length = 0;
+                int i;
 
-    default:
-      return FALSE;
+                length = ptr->len;
+                ret_ptr_array = JSObjectMakeArray(ctx, 0, NULL, exception);
 
-    }
-  return 0;
-}
+                for (i = 0; i < length; ++i) {
+                    JSValueRef ival;
 
-JSValueRef
-seed_value_from_gvalue_for_signal (JSContextRef ctx, GValue * gval,
-				   JSValueRef * exception,
-				   GSignalQuery *signal_query, gint arg_n)
-{
-  if (!G_IS_VALUE (gval))
-    {
-      return false;
-    }
-  switch (G_VALUE_TYPE (gval))
-    {
-    case G_TYPE_BOOLEAN:
-      return seed_value_from_boolean (ctx,
-				      g_value_get_boolean (gval), exception);
-    case G_TYPE_CHAR:
-      return seed_value_from_char (ctx, g_value_get_char (gval), exception);
-    case G_TYPE_UCHAR:
-      return seed_value_from_uchar (ctx, g_value_get_uchar (gval), exception);
-    case G_TYPE_INT:
-      return seed_value_from_int (ctx, g_value_get_int (gval), exception);
-    case G_TYPE_UINT:
-      return seed_value_from_uint (ctx, g_value_get_uint (gval), exception);
-    case G_TYPE_LONG:
-      return seed_value_from_long (ctx, g_value_get_long (gval), exception);
-    case G_TYPE_ULONG:
-      return seed_value_from_ulong (ctx, g_value_get_ulong (gval), exception);
-    case G_TYPE_INT64:
-      return seed_value_from_int64 (ctx, g_value_get_int64 (gval), exception);
-    case G_TYPE_UINT64:
-      return seed_value_from_uint64 (ctx, g_value_get_uint64 (gval),
-				     exception);
-    case G_TYPE_FLOAT:
-      return seed_value_from_float (ctx, g_value_get_float (gval), exception);
-    case G_TYPE_DOUBLE:
-      return seed_value_from_double (ctx, g_value_get_double (gval),
-				     exception);
-    case G_TYPE_STRING:
-      return seed_value_from_string (ctx, (gchar *)
-				     g_value_get_string (gval), exception);
-    case G_TYPE_POINTER:
-      if (signal_query)
-        {
-          JSValueRef res;
-          GArgument arg;
-          GIBaseInfo *obj;
-          GISignalInfo *signal_info;
-          GIArgInfo *arg_info;
-          GITypeInfo type_info;
+                    larg.v_pointer = g_ptr_array_index(ptr, i);
+                    ival = (JSValueRef) seed_value_from_gi_argument(
+                      ctx, &larg, array_type_info, exception);
+                    if (!ival)
+                        ival = JSValueMakeNull(ctx);
 
-          obj = g_irepository_find_by_gtype(NULL, signal_query->itype);
-          if (!obj)
-            return NULL;
+                    JSObjectSetPropertyAtIndex(ctx, ret_ptr_array, i, ival,
+                                               NULL);
+                }
 
-          signal_info = g_object_info_find_signal((GIObjectInfo *) obj,
-                            signal_query->signal_name);
+                g_base_info_unref((GIBaseInfo*) array_type_info);
 
-          if (!signal_info) {
-              g_base_info_unref((GIBaseInfo *) obj);
-              return NULL;
-          }
+                return ret_ptr_array;
+            } else if (array_type == GI_ARRAY_TYPE_C) {
 
-          arg_info = g_callable_info_get_arg(signal_info, arg_n - 1);
-          g_arg_info_load_type(arg_info, &type_info);
+                if (g_type_info_is_zero_terminated(type_info)) {
+                    GITypeInfo* param_info;
+                    param_info = g_type_info_get_param_type(type_info, 0);
+                    g_assert(param_info != NULL);
 
-          arg.v_pointer = g_value_get_pointer(gval);
+                    ret = seed_array_from_zero_terminated_c_array(
+                      ctx, arg->v_pointer, param_info, exception);
 
-          res = seed_value_from_gi_argument (ctx, &arg, &type_info, exception);
+                    g_base_info_unref((GIBaseInfo*) param_info);
+                    g_base_info_unref((GIBaseInfo*) array_type_info);
 
-          g_base_info_unref((GIBaseInfo*)arg_info);
-          g_base_info_unref((GIBaseInfo*)signal_info);
-          g_base_info_unref((GIBaseInfo*)obj);
+                    return ret;
+                }
+            }
 
-          return res;
+            // technically gir has arrays of bytes, eg.
+            // <array length="2" zero-terminated="0" c:type="gchar**"><type
+            // name="guint8"/>
+            // example : g_file_get_contents..
+            // we can treat this as a string.. - it's a bit flakey, we should
+            // really use
+            // Uint8Array - need to check the webkit API for this..
+
+            if (!g_type_info_is_zero_terminated(type_info)
+                && array_type == GI_ARRAY_TYPE_C
+                && GI_TYPE_TAG_UINT8 == g_type_info_get_tag(array_type_info)
+                && array_len > 0) {
+                // got a stringy array..
+                // we should check g_type_info_get_array_fixed_size
+                // we are assuming that this is the array_len from the call..
+                g_base_info_unref((GIBaseInfo*) array_type_info);
+
+                ret = seed_value_from_binary_string(ctx, arg->v_pointer,
+                                                    array_len, exception);
+                // always free arg... what about when we do not own it...?
+                // g_free(arg->v_pointer);
+
+                return ret;
+            }
+
+            if (!g_type_info_is_zero_terminated(type_info)) {
+                g_base_info_unref((GIBaseInfo*) array_type_info);
+                break;
+            }
+
+            ret = seed_gi_make_jsarray(ctx, arg->v_pointer, array_type_info,
+                                       exception);
+
+            g_base_info_unref((GIBaseInfo*) array_type_info);
+
+            return ret;
         }
-      else
-        {
-          return seed_make_pointer (ctx, g_value_get_pointer (gval));
+        case GI_TYPE_TAG_INTERFACE: {
+            GIBaseInfo* interface;
+            GIInfoType interface_type;
+
+            interface = g_type_info_get_interface(type_info);
+            interface_type = g_base_info_get_type(interface);
+
+            if (interface_type == GI_INFO_TYPE_OBJECT
+                || interface_type == GI_INFO_TYPE_INTERFACE) {
+                if (arg->v_pointer == 0) {
+                    g_base_info_unref(interface);
+                    return JSValueMakeNull(ctx);
+                }
+                g_base_info_unref(interface);
+                return seed_value_from_object(ctx, arg->v_pointer, exception);
+            } else if (interface_type == GI_INFO_TYPE_ENUM) {
+                JSValueRef ret;
+                GITypeTag etype = g_enum_info_get_storage_type(interface);
+
+                // needs GITypeInfo - we are sending it  GIBaseInfo
+
+                ret = seed_value_from_gi_argument_full(ctx, arg, type_info,
+                                                       exception, 0, etype);
+                g_base_info_unref(interface);
+                return ret;
+            } else if (interface_type == GI_INFO_TYPE_FLAGS) {
+
+                g_base_info_unref(interface);
+                return seed_value_from_long(ctx, arg->v_long, exception);
+            } else if (interface_type == GI_INFO_TYPE_STRUCT) {
+
+                // Trying to find out if this struct can be converted into
+                // GValue
+                // If it can be converted, just send the converted value back to
+                // JS context instead
+                // of the GValue itself.
+                GType gtype = g_registered_type_info_get_g_type(
+                  (GIRegisteredTypeInfo*) interface);
+                if (G_TYPE_IS_INSTANTIATABLE(gtype)
+                    || G_TYPE_IS_INTERFACE(gtype))
+                    gtype = G_TYPE_FROM_INSTANCE(arg->v_pointer);
+
+                SEED_NOTE(INVOCATION, "gtype of INTERFACE is %s",
+                          g_type_name(gtype));
+                if (g_type_is_a(gtype, G_TYPE_VALUE)) {
+                    JSValueRef ret;
+                    // We're using seed_value_from_gvalue_for_signal with NULL
+                    // signal handler
+                    // the current code will only handle basic types.
+                    if ((ret = seed_value_from_gvalue_for_signal(
+                           ctx, arg->v_pointer, exception, NULL, 0))) {
+                        g_base_info_unref(interface);
+                        return ret;
+                    }
+                }
+
+                JSValueRef strukt;
+
+                strukt = seed_make_struct(ctx, arg->v_pointer, interface);
+                g_base_info_unref(interface);
+
+                return strukt;
+            } else if (interface_type == GI_INFO_TYPE_CALLBACK) {
+                /* FIXME: return values of type callback are not handled yet. */
+                g_base_info_unref(interface);
+                return FALSE;
+            }
+            /* fall through - other types?? */
+            g_base_info_unref(interface);
+            return FALSE;
         }
-    case G_TYPE_PARAM:
-      // Might need to dup and make a boxed.
-      return seed_make_pointer (ctx, g_value_get_param (gval));
-    }
 
-  if (g_type_is_a (G_VALUE_TYPE (gval), G_TYPE_STRV))
-    {
-      return seed_value_from_strv(ctx, g_value_get_boxed (gval), exception);
+        case GI_TYPE_TAG_GLIST: {
+            GITypeInfo* list_type;
+            JSObjectRef ret;
+            GArgument larg;
+            gint i = 0;
+            GList* list = arg->v_pointer;
+
+            ret = JSObjectMakeArray(ctx, 0, NULL, exception);
+            list_type = g_type_info_get_param_type(type_info, 0);
+
+            for (; list != NULL; list = list->next) {
+                JSValueRef ival;
+
+                larg.v_pointer = list->data;
+                ival = (JSValueRef) seed_value_from_gi_argument(ctx, &larg,
+                                                                list_type,
+                                                                exception);
+                if (!ival)
+                    ival = JSValueMakeNull(ctx);
+                JSObjectSetPropertyAtIndex(ctx, ret, i, ival, NULL);
+                i++;
+            }
+            return ret;
+        }
+        case GI_TYPE_TAG_GSLIST: {
+            GITypeInfo* list_type;
+            JSObjectRef ret;
+            JSValueRef ival;
+            GArgument larg;
+            guint i = 0;
+            GSList* list = arg->v_pointer;
+
+            ret = JSObjectMakeArray(ctx, 0, NULL, exception);
+            list_type = g_type_info_get_param_type(type_info, 0);
+
+            for (; list != NULL; list = list->next) {
+                larg.v_pointer = list->data;
+                ival = (JSValueRef) seed_value_from_gi_argument(ctx, &larg,
+                                                                list_type,
+                                                                exception);
+                if (!ival)
+                    ival = JSValueMakeNull(ctx);
+                JSObjectSetPropertyAtIndex(ctx, ret, i, ival, NULL);
+                i++;
+            }
+            return ret;
+        }
+        case GI_TYPE_TAG_GHASH: {
+            GITypeInfo* key_type;
+            GITypeTag key_type_tag;
+            GITypeInfo* value_type;
+            JSObjectRef ret;
+            GHashTable* hash_table;
+            GHashTableIter iter;
+            gpointer key, value;
+
+            key_type = g_type_info_get_param_type(type_info, 0);
+            key_type_tag = g_type_info_get_tag(key_type);
+
+            if ((key_type_tag != GI_TYPE_TAG_UTF8)
+                && (key_type_tag != GI_TYPE_TAG_FILENAME)) {
+                seed_make_exception(ctx, exception, "ArgumentError",
+                                    "Unable to make object from hash table "
+                                    "indexed with values of type %s",
+                                    g_type_tag_to_string(key_type_tag));
+                return JSValueMakeNull(ctx);
+            }
+
+            hash_table = arg->v_pointer;
+            if (!hash_table) {
+                seed_make_exception(
+                  ctx, exception, "ArgumentError",
+                  "Unable to make hash table indexed with values of type %s",
+                  g_type_tag_to_string(key_type_tag));
+                return JSValueMakeNull(ctx);
+            }
+
+            value_type = g_type_info_get_param_type(type_info, 1);
+
+            ret = JSObjectMake(ctx, NULL, NULL);
+
+            g_hash_table_iter_init(&iter, hash_table);
+
+            while (g_hash_table_iter_next(&iter, &key, &value)) {
+                JSStringRef js_key;
+                GArgument value_arg;
+                JSValueRef value_jsval;
+
+                js_key = JSStringCreateWithUTF8CString((const char*) key);
+
+                value_arg.v_string = value;
+                value_jsval
+                  = seed_value_from_gi_argument_full(ctx, &value_arg,
+                                                     value_type, exception, 0,
+                                                     key_type_tag);
+
+                JSObjectSetProperty(ctx, ret, js_key, value_jsval, 0, NULL);
+            }
+
+            return ret;
+        }
+        case GI_TYPE_TAG_ERROR: {
+            JSValueRef ret;
+            seed_make_exception_from_gerror(ctx, &ret,
+                                            (GError*) arg->v_pointer);
+            return ret;
+        }
+
+        default:
+            return FALSE;
     }
+    return 0;
+}
 
+JSValueRef
+seed_value_from_gvalue_for_signal(JSContextRef ctx,
+                                  GValue* gval,
+                                  JSValueRef* exception,
+                                  GSignalQuery* signal_query,
+                                  gint arg_n)
+{
+    if (!G_IS_VALUE(gval)) {
+        return false;
+    }
+    switch (G_VALUE_TYPE(gval)) {
+        case G_TYPE_BOOLEAN:
+            return seed_value_from_boolean(ctx, g_value_get_boolean(gval),
+                                           exception);
+        case G_TYPE_CHAR:
+            return seed_value_from_char(ctx, g_value_get_schar(gval),
+                                        exception);
+        case G_TYPE_UCHAR:
+            return seed_value_from_uchar(ctx, g_value_get_uchar(gval),
+                                         exception);
+        case G_TYPE_INT:
+            return seed_value_from_int(ctx, g_value_get_int(gval), exception);
+        case G_TYPE_UINT:
+            return seed_value_from_uint(ctx, g_value_get_uint(gval), exception);
+        case G_TYPE_LONG:
+            return seed_value_from_long(ctx, g_value_get_long(gval), exception);
+        case G_TYPE_ULONG:
+            return seed_value_from_ulong(ctx, g_value_get_ulong(gval),
+                                         exception);
+        case G_TYPE_INT64:
+            return seed_value_from_int64(ctx, g_value_get_int64(gval),
+                                         exception);
+        case G_TYPE_UINT64:
+            return seed_value_from_uint64(ctx, g_value_get_uint64(gval),
+                                          exception);
+        case G_TYPE_FLOAT:
+            return seed_value_from_float(ctx, g_value_get_float(gval),
+                                         exception);
+        case G_TYPE_DOUBLE:
+            return seed_value_from_double(ctx, g_value_get_double(gval),
+                                          exception);
+        case G_TYPE_STRING:
+            return seed_value_from_string(ctx,
+                                          (gchar*) g_value_get_string(gval),
+                                          exception);
+        case G_TYPE_POINTER:
+            if (signal_query) {
+                JSValueRef res;
+                GArgument arg;
+                GIBaseInfo* obj;
+                GISignalInfo* signal_info;
+                GIArgInfo* arg_info;
+                GITypeInfo type_info;
+
+                obj = g_irepository_find_by_gtype(NULL, signal_query->itype);
+                if (!obj)
+                    return NULL;
+
+                signal_info
+                  = g_object_info_find_signal((GIObjectInfo*) obj,
+                                              signal_query->signal_name);
+
+                if (!signal_info) {
+                    g_base_info_unref((GIBaseInfo*) obj);
+                    return NULL;
+                }
+
+                arg_info = g_callable_info_get_arg(signal_info, arg_n - 1);
+                g_arg_info_load_type(arg_info, &type_info);
+
+                arg.v_pointer = g_value_get_pointer(gval);
+
+                res = seed_value_from_gi_argument(ctx, &arg, &type_info,
+                                                  exception);
+
+                g_base_info_unref((GIBaseInfo*) arg_info);
+                g_base_info_unref((GIBaseInfo*) signal_info);
+                g_base_info_unref((GIBaseInfo*) obj);
+
+                return res;
+            } else {
+                return seed_make_pointer(ctx, g_value_get_pointer(gval));
+            }
+        case G_TYPE_PARAM:
+            // Might need to dup and make a boxed.
+            return seed_make_pointer(ctx, g_value_get_param(gval));
+    }
 
-  if (g_type_is_a (G_VALUE_TYPE (gval), G_TYPE_ENUM) ||
-      g_type_is_a (G_VALUE_TYPE (gval), G_TYPE_FLAGS))
-    return seed_value_from_long (ctx, gval->data[0].v_long, exception);
-  else if (g_type_is_a (G_VALUE_TYPE (gval), G_TYPE_ENUM))
-    return seed_value_from_long (ctx, gval->data[0].v_long, exception);
-  else if (g_type_is_a (G_VALUE_TYPE (gval), G_TYPE_OBJECT))
-    {
-      GObject *obj = g_value_get_object (gval);
-      return seed_value_from_object (ctx, obj, exception);
+    if (g_type_is_a(G_VALUE_TYPE(gval), G_TYPE_STRV)) {
+        return seed_value_from_strv(ctx, (GStrv*) g_value_get_boxed(gval),
+                                    exception);
     }
-  else
-    {
-      GIBaseInfo *info;
-      GIInfoType type;
-
-      info = g_irepository_find_by_gtype (0, G_VALUE_TYPE (gval));
-      if (!info)
-	return FALSE;
-      type = g_base_info_get_type (info);
-
-      if (type == GI_INFO_TYPE_UNION)
-	{
-	  return seed_make_union (ctx, g_value_peek_pointer (gval), info);
-	}
-      else if (type == GI_INFO_TYPE_STRUCT)
-	{
-	  return seed_make_struct (ctx, g_value_peek_pointer (gval), info);
-	}
-      else if (type == GI_INFO_TYPE_BOXED)
-	{
-	  return seed_make_boxed (ctx, g_value_dup_boxed (gval), info);
-	}
 
+    if (g_type_is_a(G_VALUE_TYPE(gval), G_TYPE_ENUM)
+        || g_type_is_a(G_VALUE_TYPE(gval), G_TYPE_FLAGS))
+        return seed_value_from_long(ctx, gval->data[0].v_long, exception);
+    else if (g_type_is_a(G_VALUE_TYPE(gval), G_TYPE_ENUM))
+        return seed_value_from_long(ctx, gval->data[0].v_long, exception);
+    else if (g_type_is_a(G_VALUE_TYPE(gval), G_TYPE_OBJECT)) {
+        GObject* obj = g_value_get_object(gval);
+        return seed_value_from_object(ctx, obj, exception);
+    } else {
+        GIBaseInfo* info;
+        GIInfoType type;
+
+        info = g_irepository_find_by_gtype(0, G_VALUE_TYPE(gval));
+        if (!info)
+            return FALSE;
+        type = g_base_info_get_type(info);
+
+        if (type == GI_INFO_TYPE_UNION) {
+            return seed_make_union(ctx, g_value_peek_pointer(gval), info);
+        } else if (type == GI_INFO_TYPE_STRUCT) {
+            return seed_make_struct(ctx, g_value_peek_pointer(gval), info);
+        } else if (type == GI_INFO_TYPE_BOXED) {
+            return seed_make_boxed(ctx, g_value_dup_boxed(gval), info);
+        }
     }
 
-  return NULL;
+    return NULL;
 }
 
 JSValueRef
-seed_value_from_gvalue (JSContextRef ctx,
-			GValue * gval, JSValueRef * exception)
+seed_value_from_gvalue(JSContextRef ctx, GValue* gval, JSValueRef* exception)
 {
-  return seed_value_from_gvalue_for_signal(ctx, gval, exception, NULL, 0);
+    return seed_value_from_gvalue_for_signal(ctx, gval, exception, NULL, 0);
 }
 
 gboolean
-seed_value_to_gvalue (JSContextRef ctx,
-		      JSValueRef val,
-		      GType type, GValue * ret, JSValueRef * exception)
+seed_value_to_gvalue(JSContextRef ctx,
+                     JSValueRef val,
+                     GType type,
+                     GValue* ret,
+                     JSValueRef* exception)
 {
-  if (G_IS_VALUE (ret))
-    g_value_unset (ret);
-
- if (type == G_TYPE_STRV)
-    {
-      gchar **result;
-      JSValueRef jslen;
-      guint length, i;
-      
-      if (JSValueIsNull (ctx, val) || !JSValueIsObject (ctx, val))
-	return FALSE;
-      
-      jslen = seed_object_get_property (ctx, (JSObjectRef) val, "length");
-      length = seed_value_to_uint (ctx, jslen, exception);
-      
-      result = g_new0 (gchar *, length+1);
-      
-      for (i = 0; i < length; i++)
-	{
-	  result[i] = seed_value_to_string (ctx,
-					    JSObjectGetPropertyAtIndex (ctx,
-									(JSObjectRef)
-									val,
-									i,
-									exception),
-					    exception);
-	  
-	}
-      result[i] = 0;
-      
-      g_value_init (ret, G_TYPE_STRV);
-      g_value_take_boxed (ret, result);
-      
-	return TRUE;
-    }
-  else if (g_type_is_a (type, G_TYPE_ENUM) && JSValueIsNumber (ctx, val))
-    {
-      g_value_init (ret, type);
-      g_value_set_enum (ret, seed_value_to_long (ctx, val, exception));
-      return TRUE;
-    }
-  else if (g_type_is_a (type, G_TYPE_FLAGS) && JSValueIsNumber (ctx, val))
-    {
-      g_value_init (ret, type);
-      g_value_set_flags (ret, seed_value_to_long (ctx, val, exception));
-      return TRUE;
-    }
-  else if (g_type_is_a (type, G_TYPE_OBJECT)
-	   && (JSValueIsNull (ctx, val) || seed_value_is_gobject (ctx, val)))
-    {
-      GObject *o = seed_value_to_object (ctx,
-					 val, exception);
-
-      if (o == NULL || g_type_is_a (G_OBJECT_TYPE (o), type))
-	{
-	  g_value_init (ret, type);
-	  g_value_set_object (ret, o);
-
-	  return TRUE;
-	}
+    if (G_IS_VALUE(ret))
+        g_value_unset(ret);
+
+    if (type == G_TYPE_STRV) {
+        gchar** result;
+        JSValueRef jslen;
+        guint length, i;
+
+        if (JSValueIsNull(ctx, val) || !JSValueIsObject(ctx, val))
+            return FALSE;
+
+        jslen = seed_object_get_property(ctx, (JSObjectRef) val, "length");
+        length = seed_value_to_uint(ctx, jslen, exception);
+
+        result = g_new0(gchar*, length + 1);
+
+        for (i = 0; i < length; i++) {
+            result[i] = seed_value_to_string(
+              ctx,
+              JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) val, i, exception),
+              exception);
+        }
+        result[i] = 0;
+
+        g_value_init(ret, G_TYPE_STRV);
+        g_value_take_boxed(ret, result);
+
+        return TRUE;
+    } else if (g_type_is_a(type, G_TYPE_ENUM) && JSValueIsNumber(ctx, val)) {
+        g_value_init(ret, type);
+        g_value_set_enum(ret, seed_value_to_long(ctx, val, exception));
+        return TRUE;
+    } else if (g_type_is_a(type, G_TYPE_FLAGS) && JSValueIsNumber(ctx, val)) {
+        g_value_init(ret, type);
+        g_value_set_flags(ret, seed_value_to_long(ctx, val, exception));
+        return TRUE;
+    } else if (g_type_is_a(type, G_TYPE_OBJECT)
+               && (JSValueIsNull(ctx, val)
+                   || seed_value_is_gobject(ctx, val))) {
+        GObject* o = seed_value_to_object(ctx, val, exception);
+
+        if (o == NULL || g_type_is_a(G_OBJECT_TYPE(o), type)) {
+            g_value_init(ret, type);
+            g_value_set_object(ret, o);
+
+            return TRUE;
+        }
     }
-  /* Boxed handling is broken. Will be fixed in struct overhall. */
-  else if (g_type_is_a (type, G_TYPE_BOXED))
-    {
-      gpointer p = seed_pointer_get_pointer (ctx, val);
-      if (p)
-	{
-	  g_value_init (ret, type);
-	  g_value_set_boxed (ret, p);
-	  return TRUE;
-	}
-      else
-	{
-	  if (JSValueIsObject (ctx, val))
-	    {
-	      GIBaseInfo *info = g_irepository_find_by_gtype (0, type);
-	      JSObjectRef new_struct;
-	      if (!info)
-		return FALSE;
-
-	      new_struct =
-		seed_construct_struct_type_with_parameters (ctx,
-							    info,
-							    (JSObjectRef)
-							    val, exception);
-	      p = seed_pointer_get_pointer (ctx, new_struct);
-	      if (p)
-		{
-		  g_value_init (ret, type);
-		  g_value_set_boxed (ret, p);
-		  g_base_info_unref (info);
-		  return TRUE;
-		}
-	      g_base_info_unref (info);
-	    }
-	}
+    /* Boxed handling is broken. Will be fixed in struct overhall. */
+    else if (g_type_is_a(type, G_TYPE_BOXED)) {
+        gpointer p = seed_pointer_get_pointer(ctx, val);
+        if (p) {
+            g_value_init(ret, type);
+            g_value_set_boxed(ret, p);
+            return TRUE;
+        } else {
+            if (JSValueIsObject(ctx, val)) {
+                GIBaseInfo* info = g_irepository_find_by_gtype(0, type);
+                JSObjectRef new_struct;
+                if (!info)
+                    return FALSE;
+
+                new_struct = seed_construct_struct_type_with_parameters(
+                  ctx, info, (JSObjectRef) val, exception);
+                p = seed_pointer_get_pointer(ctx, new_struct);
+                if (p) {
+                    g_value_init(ret, type);
+                    g_value_set_boxed(ret, p);
+                    g_base_info_unref(info);
+                    return TRUE;
+                }
+                g_base_info_unref(info);
+            }
+        }
     }
 
-  switch (type)
-    {
-    case G_TYPE_BOOLEAN:
-      {
-	g_value_init (ret, G_TYPE_BOOLEAN);
-	g_value_set_boolean (ret, seed_value_to_boolean (ctx,
-							 val, exception));
-	return TRUE;
-      }
-    case G_TYPE_INT:
-    case G_TYPE_UINT:
-      {
-	g_value_init (ret, type);
-	if (type == G_TYPE_INT)
-	  g_value_set_int (ret, seed_value_to_int (ctx, val, exception));
-	else
-	  g_value_set_uint (ret, seed_value_to_uint (ctx, val, exception));
-	return TRUE;
-      }
-    case G_TYPE_CHAR:
-      {
-	g_value_init (ret, G_TYPE_CHAR);
-	g_value_set_char (ret, seed_value_to_char (ctx, val, exception));
-	return TRUE;
-      }
-    case G_TYPE_UCHAR:
-      {
-	g_value_init (ret, G_TYPE_UCHAR);
-	g_value_set_uchar (ret, seed_value_to_uchar (ctx, val, exception));
-	return TRUE;
-      }
-    case G_TYPE_LONG:
-    case G_TYPE_ULONG:
-    case G_TYPE_INT64:
-    case G_TYPE_UINT64:
-    case G_TYPE_FLOAT:
-    case G_TYPE_DOUBLE:
-      {
-	switch (type)
-	  {
-	  case G_TYPE_LONG:
-	    g_value_init (ret, G_TYPE_LONG);
-	    g_value_set_long (ret, seed_value_to_long (ctx, val, exception));
-	    break;
-	  case G_TYPE_ULONG:
-	    g_value_init (ret, G_TYPE_ULONG);
-	    g_value_set_ulong (ret, seed_value_to_ulong (ctx,
-							 val, exception));
-	    break;
-	  case G_TYPE_INT64:
-	    g_value_init (ret, G_TYPE_INT64);
-	    g_value_set_int64 (ret, seed_value_to_int64 (ctx,
-							 val, exception));
-	    break;
-	  case G_TYPE_UINT64:
-	    g_value_init (ret, G_TYPE_UINT64);
-	    g_value_set_uint64 (ret, seed_value_to_uint64 (ctx,
-							   val, exception));
-	    break;
-	  case G_TYPE_FLOAT:
-	    g_value_init (ret, G_TYPE_FLOAT);
-	    g_value_set_float (ret, seed_value_to_float (ctx,
-							 val, exception));
-	    break;
-	  case G_TYPE_DOUBLE:
-	    g_value_init (ret, G_TYPE_DOUBLE);
-	    g_value_set_double (ret, seed_value_to_double (ctx,
-							   val, exception));
-	    break;
-	  }
-	return TRUE;
-      }
-    case G_TYPE_STRING:
-      {
-	gchar *cval = seed_value_to_string (ctx, val, exception);
-
-	g_value_init (ret, G_TYPE_STRING);
-	g_value_take_string (ret, cval);
-
-	return TRUE;
-      }
-    default:
-      {
-	// TODO: FIXME: This whole undefined type area
-	// needs some heaaavy improvement.
-
-	if (type == 0 && seed_value_is_gobject(ctx, val))
-	  {
-	    GObject *o = seed_value_to_object (ctx, val, exception);
-
-	    g_value_init (ret, G_OBJECT_TYPE(o));
-	    g_value_set_object (ret, o);
-	    return TRUE;
-	  }
-	// Support [GObject.TYPE_INT, 3]
-	// TODO: FIXME: Might crash.
-	else if (type == 0 && JSValueIsObject (ctx, val))
-	  {
-	    // TODO: FIXME: Better array test like the cool one on reddit.
-	    guint length = seed_value_to_int (ctx,
-					      seed_object_get_property (ctx,
-									(JSObjectRef) val,
-									"length"),
-					      exception);
-
-	    if (length)
-	      {
-		type =
-		  seed_value_to_int (ctx,
-				     JSObjectGetPropertyAtIndex (ctx,
-								 (JSObjectRef)
-								 val, 0,
-								 exception),
-				     exception);
-		val =
-		  JSObjectGetPropertyAtIndex (ctx, (JSObjectRef) val, 1,
-					      exception);
-		if (type)	// Prevents recursion.
-		  {
-		    return seed_value_to_gvalue (ctx, val,
-						 type, ret, exception);
-		  }
-		// TODO: FIXME: Handle better?
-		else
-		  g_assert_not_reached ();
-	      }
-	  }
-	switch (JSValueGetType (ctx, val))
-	  {
-	  case kJSTypeBoolean:
-	    {
-	      g_value_init (ret, G_TYPE_BOOLEAN);
-	      g_value_set_boolean (ret,
-				   seed_value_to_boolean (ctx,
-							  val, exception));
-	      return TRUE;
-	    }
-	  case kJSTypeNumber:
-	    {
-	      g_value_init (ret, G_TYPE_DOUBLE);
-	      g_value_set_double (ret,
-				  seed_value_to_double (ctx, val, exception));
-	      return TRUE;
-	    }
-	  case kJSTypeString:
-	    {
-	      gchar *cv = seed_value_to_string (ctx, val,
-						exception);
-
-	      g_value_init (ret, G_TYPE_STRING);
-	      g_value_take_string (ret, cv);
-	      return TRUE;
-	    }
-	  default:
-	    break;
-	  }
-	break;
-      }
+    switch (type) {
+        case G_TYPE_BOOLEAN: {
+            g_value_init(ret, G_TYPE_BOOLEAN);
+            g_value_set_boolean(ret,
+                                seed_value_to_boolean(ctx, val, exception));
+            return TRUE;
+        }
+        case G_TYPE_INT:
+        case G_TYPE_UINT: {
+            g_value_init(ret, type);
+            if (type == G_TYPE_INT)
+                g_value_set_int(ret, seed_value_to_int(ctx, val, exception));
+            else
+                g_value_set_uint(ret, seed_value_to_uint(ctx, val, exception));
+            return TRUE;
+        }
+        case G_TYPE_CHAR: {
+            g_value_init(ret, G_TYPE_CHAR);
+            g_value_set_schar(ret, seed_value_to_char(ctx, val, exception));
+            return TRUE;
+        }
+        case G_TYPE_UCHAR: {
+            g_value_init(ret, G_TYPE_UCHAR);
+            g_value_set_uchar(ret, seed_value_to_uchar(ctx, val, exception));
+            return TRUE;
+        }
+        case G_TYPE_LONG:
+        case G_TYPE_ULONG:
+        case G_TYPE_INT64:
+        case G_TYPE_UINT64:
+        case G_TYPE_FLOAT:
+        case G_TYPE_DOUBLE: {
+            switch (type) {
+                case G_TYPE_LONG:
+                    g_value_init(ret, G_TYPE_LONG);
+                    g_value_set_long(ret,
+                                     seed_value_to_long(ctx, val, exception));
+                    break;
+                case G_TYPE_ULONG:
+                    g_value_init(ret, G_TYPE_ULONG);
+                    g_value_set_ulong(ret,
+                                      seed_value_to_ulong(ctx, val, exception));
+                    break;
+                case G_TYPE_INT64:
+                    g_value_init(ret, G_TYPE_INT64);
+                    g_value_set_int64(ret,
+                                      seed_value_to_int64(ctx, val, exception));
+                    break;
+                case G_TYPE_UINT64:
+                    g_value_init(ret, G_TYPE_UINT64);
+                    g_value_set_uint64(ret, seed_value_to_uint64(ctx, val,
+                                                                 exception));
+                    break;
+                case G_TYPE_FLOAT:
+                    g_value_init(ret, G_TYPE_FLOAT);
+                    g_value_set_float(ret,
+                                      seed_value_to_float(ctx, val, exception));
+                    break;
+                case G_TYPE_DOUBLE:
+                    g_value_init(ret, G_TYPE_DOUBLE);
+                    g_value_set_double(ret, seed_value_to_double(ctx, val,
+                                                                 exception));
+                    break;
+            }
+            return TRUE;
+        }
+        case G_TYPE_STRING: {
+            gchar* cval = seed_value_to_string(ctx, val, exception);
+
+            g_value_init(ret, G_TYPE_STRING);
+            g_value_take_string(ret, cval);
+
+            return TRUE;
+        }
+        default: {
+            // TODO: FIXME: This whole undefined type area
+            // needs some heaaavy improvement.
+
+            if (type == 0 && seed_value_is_gobject(ctx, val)) {
+                GObject* o = seed_value_to_object(ctx, val, exception);
+
+                g_value_init(ret, G_OBJECT_TYPE(o));
+                g_value_set_object(ret, o);
+                return TRUE;
+            }
+            // Support [GObject.TYPE_INT, 3]
+            // TODO: FIXME: Might crash.
+            else if (type == 0 && JSValueIsObject(ctx, val)) {
+                // TODO: FIXME: Better array test like the cool one on reddit.
+                guint length = seed_value_to_int(
+                  ctx,
+                  seed_object_get_property(ctx, (JSObjectRef) val, "length"),
+                  exception);
+
+                if (length) {
+                    type = seed_value_to_int(
+                      ctx, JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) val, 0,
+                                                      exception),
+                      exception);
+                    val = JSObjectGetPropertyAtIndex(ctx, (JSObjectRef) val, 1,
+                                                     exception);
+                    if (type) // Prevents recursion.
+                    {
+                        return seed_value_to_gvalue(ctx, val, type, ret,
+                                                    exception);
+                    }
+                    // TODO: FIXME: Handle better?
+                    else
+                        g_assert_not_reached();
+                }
+            }
+            switch (JSValueGetType(ctx, val)) {
+                case kJSTypeBoolean: {
+                    g_value_init(ret, G_TYPE_BOOLEAN);
+                    g_value_set_boolean(ret, seed_value_to_boolean(ctx, val,
+                                                                   exception));
+                    return TRUE;
+                }
+                case kJSTypeNumber: {
+                    g_value_init(ret, G_TYPE_DOUBLE);
+                    g_value_set_double(ret, seed_value_to_double(ctx, val,
+                                                                 exception));
+                    return TRUE;
+                }
+                case kJSTypeString: {
+                    gchar* cv = seed_value_to_string(ctx, val, exception);
+
+                    g_value_init(ret, G_TYPE_STRING);
+                    g_value_take_string(ret, cv);
+                    return TRUE;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
     }
 
-   return FALSE;
+    return FALSE;
 }
 
 /**
@@ -1665,18 +1692,15 @@ seed_value_to_gvalue (JSContextRef ctx,
  * Returns: The value of the property or the undefined value
  */
 JSValueRef
-seed_object_get_property (JSContextRef ctx,
-			  JSObjectRef val, const gchar * name)
+seed_object_get_property(JSContextRef ctx, JSObjectRef val, const gchar* name)
 {
 
-  JSStringRef jname = JSStringCreateWithUTF8CString (name);
-  JSValueRef ret = JSObjectGetProperty (ctx,
-					(JSObjectRef) val,
-					jname, NULL);
+    JSStringRef jname = JSStringCreateWithUTF8CString(name);
+    JSValueRef ret = JSObjectGetProperty(ctx, (JSObjectRef) val, jname, NULL);
 
-  JSStringRelease (jname);
+    JSStringRelease(jname);
 
-  return ret;
+    return ret;
 }
 
 /**
@@ -1689,21 +1713,22 @@ seed_object_get_property (JSContextRef ctx,
  * Returns: %TRUE on success, %FALSE otherwise.
  */
 gboolean
-seed_object_set_property (JSContextRef ctx, JSObjectRef object,
-			  const gchar * name, JSValueRef value)
+seed_object_set_property(JSContextRef ctx,
+                         JSObjectRef object,
+                         const gchar* name,
+                         JSValueRef value)
 {
-  JSStringRef jname = JSStringCreateWithUTF8CString (name);
-  JSValueRef exception = NULL;
+    JSStringRef jname = JSStringCreateWithUTF8CString(name);
+    JSValueRef exception = NULL;
 
-  if (value)
-    {
-      JSObjectSetProperty (ctx, (JSObjectRef) object, jname, value, 0,
-			   &exception);
+    if (value) {
+        JSObjectSetProperty(ctx, (JSObjectRef) object, jname, value, 0,
+                            &exception);
     }
 
-  JSStringRelease (jname);
+    JSStringRelease(jname);
 
-  return TRUE;
+    return TRUE;
 }
 
 /* TODO: Make some macros or something for making exceptions, code is littered
@@ -1723,22 +1748,19 @@ seed_object_set_property (JSContextRef ctx, JSObjectRef object,
  *
  */
 gboolean
-seed_value_to_boolean (JSContextRef ctx,
-		       JSValueRef val, JSValueRef * exception)
+seed_value_to_boolean(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsBoolean (ctx, val) && !JSValueIsNumber (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	{
-	  seed_make_exception (eng->context, exception, "ConversionError",
-			       "Can not convert Javascript value to boolean");
-	  return FALSE;
-	}
-
-      return FALSE;
+    if (!JSValueIsBoolean(ctx, val) && !JSValueIsNumber(ctx, val)) {
+        if (!JSValueIsNull(ctx, val)) {
+            seed_make_exception(eng->context, exception, "ConversionError",
+                                "Can not convert Javascript value to boolean");
+            return FALSE;
+        }
+
+        return FALSE;
     }
 
-  return JSValueToBoolean (ctx, val);
+    return JSValueToBoolean(ctx, val);
 }
 
 /**
@@ -1754,10 +1776,9 @@ seed_value_to_boolean (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_value_from_boolean (JSContextRef ctx,
-			 gboolean val, JSValueRef * exception)
+seed_value_from_boolean(JSContextRef ctx, gboolean val, JSValueRef* exception)
 {
-  return JSValueMakeBoolean (ctx, val);
+    return JSValueMakeBoolean(ctx, val);
 }
 
 /**
@@ -1773,20 +1794,18 @@ seed_value_from_boolean (JSContextRef ctx,
  *
  */
 guint
-seed_value_to_uint (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_uint(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	{
-	  seed_make_exception (ctx, exception, "ConversionError",
-			       "Can not convert Javascript value to"
-			       " boolean");
-	}
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val)) {
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " boolean");
+        }
+        return 0;
     }
 
-  return (guint) JSValueToNumber (ctx, val, NULL);
+    return (guint) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -1802,9 +1821,9 @@ seed_value_to_uint (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_uint (JSContextRef ctx, guint val, JSValueRef * exception)
+seed_value_from_uint(JSContextRef ctx, guint val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -1820,17 +1839,17 @@ seed_value_from_uint (JSContextRef ctx, guint val, JSValueRef * exception)
  *
  */
 gint
-seed_value_to_int (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_int(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " int");
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " int");
+        return 0;
     }
 
-  return (gint) JSValueToNumber (ctx, val, NULL);
+    return (gint) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -1846,9 +1865,9 @@ seed_value_to_int (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_int (JSContextRef ctx, gint val, JSValueRef * exception)
+seed_value_from_int(JSContextRef ctx, gint val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -1864,28 +1883,27 @@ seed_value_from_int (JSContextRef ctx, gint val, JSValueRef * exception)
  *
  */
 gchar
-seed_value_to_char (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_char(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  gint cv;
-
-  if (!JSValueIsNumber (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " gchar");
-      return 0;
+    gint cv;
+
+    if (!JSValueIsNumber(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " gchar");
+        return 0;
     }
 
-  cv = JSValueToNumber (ctx, val, NULL);
+    cv = JSValueToNumber(ctx, val, NULL);
 
-  if (cv < G_MININT8 || cv > G_MAXINT8)
-    {
-      seed_make_exception (ctx, exception, "ConversionError",
-			   "Javascript number out of range of gchar");
-      return 0;
+    if (cv < G_MININT8 || cv > G_MAXINT8) {
+        seed_make_exception(ctx, exception, "ConversionError",
+                            "Javascript number out of range of gchar");
+        return 0;
     }
 
-  return (gchar) cv;
+    return (gchar) cv;
 }
 
 /**
@@ -1901,9 +1919,9 @@ seed_value_to_char (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_char (JSContextRef ctx, gchar val, JSValueRef * exception)
+seed_value_from_char(JSContextRef ctx, gchar val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -1919,28 +1937,27 @@ seed_value_from_char (JSContextRef ctx, gchar val, JSValueRef * exception)
  *
  */
 guchar
-seed_value_to_uchar (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_uchar(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  guint cv;
-
-  if (!JSValueIsNumber (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " guchar");
-      return 0;
+    guint cv;
+
+    if (!JSValueIsNumber(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " guchar");
+        return 0;
     }
 
-  cv = JSValueToNumber (ctx, val, NULL);
+    cv = JSValueToNumber(ctx, val, NULL);
 
-  if (cv > G_MAXUINT8)
-    {
-      seed_make_exception (ctx, exception, "ConversionError",
-			   "Javascript number out of range of guchar");
-      return 0;
+    if (cv > G_MAXUINT8) {
+        seed_make_exception(ctx, exception, "ConversionError",
+                            "Javascript number out of range of guchar");
+        return 0;
     }
 
-  return (guchar) cv;
+    return (guchar) cv;
 }
 
 /**
@@ -1956,9 +1973,9 @@ seed_value_to_uchar (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_uchar (JSContextRef ctx, guchar val, JSValueRef * exception)
+seed_value_from_uchar(JSContextRef ctx, guchar val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -1974,17 +1991,17 @@ seed_value_from_uchar (JSContextRef ctx, guchar val, JSValueRef * exception)
  *
  */
 gshort
-seed_value_to_short (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_short(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " short");
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " short");
+        return 0;
     }
 
-  return (gshort) JSValueToNumber (ctx, val, NULL);
+    return (gshort) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2000,9 +2017,9 @@ seed_value_to_short (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_short (JSContextRef ctx, gshort val, JSValueRef * exception)
+seed_value_from_short(JSContextRef ctx, gshort val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2018,18 +2035,17 @@ seed_value_from_short (JSContextRef ctx, gshort val, JSValueRef * exception)
  *
  */
 gushort
-seed_value_to_ushort (JSContextRef ctx, JSValueRef val,
-		      JSValueRef * exception)
+seed_value_to_ushort(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " ushort");
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " ushort");
+        return 0;
     }
 
-  return (gushort) JSValueToNumber (ctx, val, NULL);
+    return (gushort) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2045,9 +2061,9 @@ seed_value_to_ushort (JSContextRef ctx, JSValueRef val,
  *
  */
 JSValueRef
-seed_value_from_ushort (JSContextRef ctx, gushort val, JSValueRef * exception)
+seed_value_from_ushort(JSContextRef ctx, gushort val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2063,35 +2079,35 @@ seed_value_from_ushort (JSContextRef ctx, gushort val, JSValueRef * exception)
  *
  */
 glong
-seed_value_to_long (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_long(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " long");
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " long");
+        return 0;
     }
 
-  return (glong) JSValueToNumber (ctx, val, NULL);
+    return (glong) JSValueToNumber(ctx, val, NULL);
 }
 
- /**
- * seed_value_from_long:
- * @ctx: A #SeedContext.
- * @val: The #glong to represent.
- * @exception: A reference to a #SeedValue in which to store any exceptions.
- *             Pass %NULL to ignore exceptions.
- *
- * Converts the given #glong into a #SeedValue.
- *
- * Return value: A #SeedValue which represents @val.
- *
- */
+/**
+* seed_value_from_long:
+* @ctx: A #SeedContext.
+* @val: The #glong to represent.
+* @exception: A reference to a #SeedValue in which to store any exceptions.
+*             Pass %NULL to ignore exceptions.
+*
+* Converts the given #glong into a #SeedValue.
+*
+* Return value: A #SeedValue which represents @val.
+*
+*/
 JSValueRef
-seed_value_from_long (JSContextRef ctx, glong val, JSValueRef * exception)
+seed_value_from_long(JSContextRef ctx, glong val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2107,18 +2123,18 @@ seed_value_from_long (JSContextRef ctx, glong val, JSValueRef * exception)
  *
  */
 gulong
-seed_value_to_ulong (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_ulong(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " ulong");
+    if (!JSValueIsNumber(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " ulong");
 
-      return 0;
+        return 0;
     }
 
-  return (gulong) JSValueToNumber (ctx, val, NULL);
+    return (gulong) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2134,9 +2150,9 @@ seed_value_to_ulong (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_ulong (JSContextRef ctx, gulong val, JSValueRef * exception)
+seed_value_from_ulong(JSContextRef ctx, gulong val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2152,18 +2168,18 @@ seed_value_from_ulong (JSContextRef ctx, gulong val, JSValueRef * exception)
  *
  */
 gint64
-seed_value_to_int64 (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_int64(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " gint64");
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " gint64");
 
-      return 0;
+        return 0;
     }
 
-  return (gint64) JSValueToNumber (ctx, val, NULL);
+    return (gint64) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2179,9 +2195,9 @@ seed_value_to_int64 (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_int64 (JSContextRef ctx, gint64 val, JSValueRef * exception)
+seed_value_from_int64(JSContextRef ctx, gint64 val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2197,20 +2213,18 @@ seed_value_from_int64 (JSContextRef ctx, gint64 val, JSValueRef * exception)
  *
  */
 guint64
-seed_value_to_uint64 (JSContextRef ctx,
-		      JSValueRef val, JSValueRef * exception)
+seed_value_to_uint64(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to"
-			     " guint64");
-
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " guint64");
+
+        return 0;
     }
 
-  return (guint64) JSValueToNumber (ctx, val, NULL);
+    return (guint64) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2226,9 +2240,9 @@ seed_value_to_uint64 (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_value_from_uint64 (JSContextRef ctx, guint64 val, JSValueRef * exception)
+seed_value_from_uint64(JSContextRef ctx, guint64 val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2244,17 +2258,17 @@ seed_value_from_uint64 (JSContextRef ctx, guint64 val, JSValueRef * exception)
  *
  */
 gfloat
-seed_value_to_float (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_float(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " gfloat");
-      return 0;
+    if (!JSValueIsNumber(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " gfloat");
+        return 0;
     }
 
-  return (gfloat) JSValueToNumber (ctx, val, NULL);
+    return (gfloat) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2270,9 +2284,9 @@ seed_value_to_float (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_float (JSContextRef ctx, gfloat val, JSValueRef * exception)
+seed_value_from_float(JSContextRef ctx, gfloat val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2288,18 +2302,17 @@ seed_value_from_float (JSContextRef ctx, gfloat val, JSValueRef * exception)
  *
  */
 gdouble
-seed_value_to_double (JSContextRef ctx,
-		      JSValueRef val, JSValueRef * exception)
+seed_value_to_double(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " double");
-      return 0;
+    if (!JSValueIsNumber(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " double");
+        return 0;
     }
 
-  return (gdouble) JSValueToNumber (ctx, val, NULL);
+    return (gdouble) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2315,9 +2328,9 @@ seed_value_to_double (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_value_from_double (JSContextRef ctx, gdouble val, JSValueRef * exception)
+seed_value_from_double(JSContextRef ctx, gdouble val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2333,17 +2346,17 @@ seed_value_from_double (JSContextRef ctx, gdouble val, JSValueRef * exception)
  *
  */
 gsize
-seed_value_to_size (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_size(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " gsize");
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " gsize");
+        return 0;
     }
 
-  return (gsize) JSValueToNumber (ctx, val, NULL);
+    return (gsize) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2359,9 +2372,9 @@ seed_value_to_size (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_size (JSContextRef ctx, gsize val, JSValueRef * exception)
+seed_value_from_size(JSContextRef ctx, gsize val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2377,17 +2390,17 @@ seed_value_from_size (JSContextRef ctx, gsize val, JSValueRef * exception)
  *
  */
 gssize
-seed_value_to_ssize (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
+seed_value_to_ssize(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  if (!JSValueIsNumber (ctx, val) && !JSValueIsBoolean (ctx, val))
-    {
-      if (!JSValueIsNull (ctx, val))
-	seed_make_exception (ctx, exception, "ConversionError",
-			     "Can not convert Javascript value to" " gssize");
-      return 0;
+    if (!JSValueIsNumber(ctx, val) && !JSValueIsBoolean(ctx, val)) {
+        if (!JSValueIsNull(ctx, val))
+            seed_make_exception(ctx, exception, "ConversionError",
+                                "Can not convert Javascript value to"
+                                " gssize");
+        return 0;
     }
 
-  return (gssize) JSValueToNumber (ctx, val, NULL);
+    return (gssize) JSValueToNumber(ctx, val, NULL);
 }
 
 /**
@@ -2403,9 +2416,9 @@ seed_value_to_ssize (JSContextRef ctx, JSValueRef val, JSValueRef * exception)
  *
  */
 JSValueRef
-seed_value_from_ssize (JSContextRef ctx, gssize val, JSValueRef * exception)
+seed_value_from_ssize(JSContextRef ctx, gssize val, JSValueRef* exception)
 {
-  return JSValueMakeNumber (ctx, (gdouble) val);
+    return JSValueMakeNumber(ctx, (gdouble) val);
 }
 
 /**
@@ -2422,7 +2435,7 @@ seed_value_from_ssize (JSContextRef ctx, gssize val, JSValueRef * exception)
  * "[undefined]"; if it represents JavaScript's null value, this returns
  * "[null]".
  *
- * If the #SeedValue is a number or a boolean, it is printed as a double, with 
+ * If the #SeedValue is a number or a boolean, it is printed as a double, with
  * the printf format string "%.15g".
  *
  * If the #SeedValue is an object, the string returned is that obtained by
@@ -2431,57 +2444,46 @@ seed_value_from_ssize (JSContextRef ctx, gssize val, JSValueRef * exception)
  * Return value: The #gchar* represented by @val.
  *
  */
-gchar *
-seed_value_to_string (JSContextRef ctx,
-		      JSValueRef val, JSValueRef * exception)
+gchar*
+seed_value_to_string(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  JSStringRef jsstr = NULL;
-  JSValueRef func;
-  gchar *buf = NULL;
-  gint length;
+    JSStringRef jsstr = NULL;
+    JSValueRef func;
+    gchar* buf = NULL;
+    gint length;
+
+    if (val == NULL)
+        return NULL;
+    else if (JSValueIsUndefined(ctx, val)) {
+        buf = g_strdup("[undefined]");
+    } else if (JSValueIsNull(ctx, val)) {
+        buf = g_strdup("[null]");
+    } else if (JSValueIsBoolean(ctx, val) || JSValueIsNumber(ctx, val)) {
+        buf = g_strdup_printf("%.15g", JSValueToNumber(ctx, val, NULL));
+    } else {
+        if (!JSValueIsString(ctx, val)) // In this case,
+        // it's an object
+        {
+            func = seed_object_get_property(ctx, (JSObjectRef) val, "toString");
 
-  if (val == NULL)
-    return NULL;
-  else if (JSValueIsUndefined (ctx, val))
-    {
-      buf = g_strdup ("[undefined]");
-    }
-  else if (JSValueIsNull (ctx, val))
-    {
-      buf = g_strdup ("[null]");
-    }
-  else if (JSValueIsBoolean (ctx, val) || JSValueIsNumber (ctx, val))
-    {
-      buf = g_strdup_printf ("%.15g", JSValueToNumber (ctx, val, NULL));
-    }
-  else
-    {
-      if (!JSValueIsString (ctx, val))	// In this case,
-	// it's an object
-	{
-	  func =
-	    seed_object_get_property (ctx, (JSObjectRef) val, "toString");
-	    
-	  if (!JSValueIsNull (ctx, func) &&
-	      JSValueIsObject (ctx, func) &&
-	      JSObjectIsFunction (ctx, (JSObjectRef) func))
-	    //str = ... we dump the return value!?!
-	      JSObjectCallAsFunction (ctx, (JSObjectRef) func,
-				      (JSObjectRef) val, 0, NULL, NULL);
-	}
-      
-      jsstr = JSValueToStringCopy (ctx, val, NULL);
-      length = JSStringGetMaximumUTF8CStringSize (jsstr);
-      if (length > 0)
-	{
-	  buf = g_malloc (length * sizeof (gchar));
-	  JSStringGetUTF8CString (jsstr, buf, length);
-	}
-      if (jsstr)
-	JSStringRelease (jsstr);
+            if (!JSValueIsNull(ctx, func) && JSValueIsObject(ctx, func)
+                && JSObjectIsFunction(ctx, (JSObjectRef) func))
+                // str = ... we dump the return value!?!
+                JSObjectCallAsFunction(ctx, (JSObjectRef) func,
+                                       (JSObjectRef) val, 0, NULL, NULL);
+        }
+
+        jsstr = JSValueToStringCopy(ctx, val, NULL);
+        length = JSStringGetMaximumUTF8CStringSize(jsstr);
+        if (length > 0) {
+            buf = g_malloc(length * sizeof(gchar));
+            JSStringGetUTF8CString(jsstr, buf, length);
+        }
+        if (jsstr)
+            JSStringRelease(jsstr);
     }
 
-  return buf;
+    return buf;
 }
 
 /**
@@ -2497,18 +2499,18 @@ seed_value_to_string (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_value_from_string (JSContextRef ctx,
-			const gchar * val, JSValueRef * exception)
+seed_value_from_string(JSContextRef ctx,
+                       const gchar* val,
+                       JSValueRef* exception)
 {
-  if (val == NULL)
-    return JSValueMakeNull (ctx);
-  else
-    {
-      JSStringRef jsstr = JSStringCreateWithUTF8CString (val);
-      JSValueRef valstr = JSValueMakeString (ctx, jsstr);
-      JSStringRelease (jsstr);
-
-      return valstr;
+    if (val == NULL)
+        return JSValueMakeNull(ctx);
+    else {
+        JSStringRef jsstr = JSStringCreateWithUTF8CString(val);
+        JSValueRef valstr = JSValueMakeString(ctx, jsstr);
+        JSStringRelease(jsstr);
+
+        return valstr;
     }
 }
 
@@ -2529,37 +2531,34 @@ seed_value_from_string (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_value_from_binary_string (JSContextRef ctx,
-			       const gchar * bytes,
-			       gint n_bytes, JSValueRef * exception)
+seed_value_from_binary_string(JSContextRef ctx,
+                              const gchar* bytes,
+                              gint n_bytes,
+                              JSValueRef* exception)
 {
-  JSStringRef jsstr;
-  JSValueRef valstr;
-  JSChar* jchar;
-  gint i;
-    
-    SEED_NOTE (INVOCATION, "Creating binary string of length %d ",
-                n_bytes);
-    
-  if (bytes == NULL)
-    {
-      return JSValueMakeNull (ctx);
+    JSStringRef jsstr;
+    JSValueRef valstr;
+    JSChar* jchar;
+    gint i;
+
+    SEED_NOTE(INVOCATION, "Creating binary string of length %d ", n_bytes);
+
+    if (bytes == NULL) {
+        return JSValueMakeNull(ctx);
     }
-  
-  jchar =  g_new0(JSChar, n_bytes); 
-  for(i =0;i < n_bytes; i++)
-    {
-      jchar[i] = bytes[i];
+
+    jchar = g_new0(JSChar, n_bytes);
+    for (i = 0; i < n_bytes; i++) {
+        jchar[i] = bytes[i];
     }
-  // this may leak...
-  
-  jsstr = JSStringCreateWithCharacters((const JSChar*)jchar, n_bytes);
-  valstr = JSValueMakeString (ctx, jsstr);
-  g_free(jchar);
-  JSStringRelease (jsstr);
-  
-  return valstr;
-  
+    // this may leak...
+
+    jsstr = JSStringCreateWithCharacters((const JSChar*) jchar, n_bytes);
+    valstr = JSValueMakeString(ctx, jsstr);
+    g_free(jchar);
+    JSStringRelease(jsstr);
+
+    return valstr;
 }
 
 /**
@@ -2569,31 +2568,29 @@ seed_value_from_binary_string (JSContextRef ctx,
  * @exception: A reference to a #SeedValue in which to store any exceptions.
  *             Pass %NULL to ignore exceptions.
  *
- * Converts the given #SeedValue into a #gchar*, properly converting to the 
+ * Converts the given #SeedValue into a #gchar*, properly converting to the
  * character set used for filenames on the local machine.
  *
  * Return value: The #gchar* represented by @val, or %NULL if an exception
  *               is raised during the conversion.
  *
  */
-gchar *
-seed_value_to_filename (JSContextRef ctx,
-			JSValueRef val, JSValueRef * exception)
+gchar*
+seed_value_to_filename(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  GError *e = NULL;
-  gchar *utf8 = seed_value_to_string (ctx, val, exception);
-  gchar *filename;
-
-  filename = g_filename_from_utf8 (utf8, -1, NULL, NULL, &e);
-  g_free (utf8);
-  if (e)
-    {
-      seed_make_exception_from_gerror (ctx, exception, e);
-      g_error_free (e);
-      return NULL;
+    GError* e = NULL;
+    gchar* utf8 = seed_value_to_string(ctx, val, exception);
+    gchar* filename;
+
+    filename = g_filename_from_utf8(utf8, -1, NULL, NULL, &e);
+    g_free(utf8);
+    if (e) {
+        seed_make_exception_from_gerror(ctx, exception, e);
+        g_error_free(e);
+        return NULL;
     }
 
-  return filename;
+    return filename;
 }
 
 /**
@@ -2603,37 +2600,36 @@ seed_value_to_filename (JSContextRef ctx,
  * @exception: A reference to a #SeedValue in which to store any exceptions.
  *             Pass %NULL to ignore exceptions.
  *
- * Converts the given #gchar* filename into a #SeedValue, respecting the 
+ * Converts the given #gchar* filename into a #SeedValue, respecting the
  * character set used for filenames on the local machine.
  *
  * Return value: A #SeedValue which represents @val.
  *
  */
 JSValueRef
-seed_value_from_filename (JSContextRef ctx,
-			  const gchar * val, JSValueRef * exception)
+seed_value_from_filename(JSContextRef ctx,
+                         const gchar* val,
+                         JSValueRef* exception)
 {
-  GError *e = NULL;
-  gchar *utf8;
-  
-  if (val == NULL)
-    return JSValueMakeNull (ctx);
-  else
-    {
-      utf8 = g_filename_to_utf8 (val, -1, NULL, NULL, &e);
-
-      if (e)
-        {
-          seed_make_exception_from_gerror (ctx, exception, e);
-          g_error_free (e);
-          return JSValueMakeNull (ctx);
+    GError* e = NULL;
+    gchar* utf8;
+
+    if (val == NULL)
+        return JSValueMakeNull(ctx);
+    else {
+        utf8 = g_filename_to_utf8(val, -1, NULL, NULL, &e);
+
+        if (e) {
+            seed_make_exception_from_gerror(ctx, exception, e);
+            g_error_free(e);
+            return JSValueMakeNull(ctx);
         }
 
-      JSValueRef valstr = seed_value_from_string (ctx, utf8, exception);
+        JSValueRef valstr = seed_value_from_string(ctx, utf8, exception);
 
-      g_free (utf8);
+        g_free(utf8);
 
-      return valstr;
+        return valstr;
     }
 }
 
@@ -2651,33 +2647,31 @@ seed_value_from_filename (JSContextRef ctx,
  *               is raised during the conversion.
  *
  */
-GObject *
-seed_value_to_object (JSContextRef ctx,
-		      JSValueRef val, JSValueRef * exception)
+GObject*
+seed_value_to_object(JSContextRef ctx, JSValueRef val, JSValueRef* exception)
 {
-  GObject *gobject;
-
-  /*
-   * Worth investigating if this is the best way to handle null. Some of
-   * the existing code depends on null Objects not throwing an exception
-   * however, needs testing at higher level if value can be null
-   * (through GI)
-   */
-
-  if (JSValueIsNull (ctx, val))
-    return NULL;
-  if (!seed_value_is_gobject (ctx, val))
-    {
-      seed_make_exception (ctx, exception, "ConversionError",
-			   "Attempt to convert from"
-			   " non GObject to GObject");
-      return NULL;
+    GObject* gobject;
+
+    /*
+     * Worth investigating if this is the best way to handle null. Some of
+     * the existing code depends on null Objects not throwing an exception
+     * however, needs testing at higher level if value can be null
+     * (through GI)
+     */
+
+    if (JSValueIsNull(ctx, val))
+        return NULL;
+    if (!seed_value_is_gobject(ctx, val)) {
+        seed_make_exception(ctx, exception, "ConversionError",
+                            "Attempt to convert from"
+                            " non GObject to GObject");
+        return NULL;
     }
 
-  gobject = (GObject *) JSObjectGetPrivate ((JSObjectRef) val);
-  g_assert (G_IS_OBJECT (gobject));
+    gobject = (GObject*) JSObjectGetPrivate((JSObjectRef) val);
+    g_assert(G_IS_OBJECT(gobject));
 
-  return gobject;
+    return gobject;
 }
 
 /**
@@ -2693,80 +2687,71 @@ seed_value_to_object (JSContextRef ctx,
  *
  */
 JSValueRef
-seed_value_from_object (JSContextRef ctx,
-			GObject * val, JSValueRef * exception)
+seed_value_from_object(JSContextRef ctx, GObject* val, JSValueRef* exception)
 {
-  if (val == NULL)
-    return JSValueMakeNull (ctx);
-  else
-    return seed_wrap_object (ctx, val);
+    if (val == NULL)
+        return JSValueMakeNull(ctx);
+    else
+        return seed_wrap_object(ctx, val);
 }
 
 gboolean
-seed_validate_enum (GIEnumInfo * info, long val)
+seed_validate_enum(GIEnumInfo* info, long val)
 {
-  gint n, i;
-  GIValueInfo *value_info;
-  gint value; // TODO: investigate glong/gint mismatch w/ g_value_info_get_value
-
-  n = g_enum_info_get_n_values (info);
-  for (i = 0; i < n; i++)
-    {
-      value_info = g_enum_info_get_value (info, i);
-      value = g_value_info_get_value (value_info);
-
-      g_base_info_unref ((GIBaseInfo *) value_info);
-      if (value == val)
-	return TRUE;
+    gint n, i;
+    GIValueInfo* value_info;
+    gint
+      value; // TODO: investigate glong/gint mismatch w/ g_value_info_get_value
+
+    n = g_enum_info_get_n_values(info);
+    for (i = 0; i < n; i++) {
+        value_info = g_enum_info_get_value(info, i);
+        value = g_value_info_get_value(value_info);
+
+        g_base_info_unref((GIBaseInfo*) value_info);
+        if (value == val)
+            return TRUE;
     }
 
-  return FALSE;
+    return FALSE;
 }
 
 JSValueRef
-seed_value_from_time_t (JSContextRef ctx, time_t time, JSValueRef * exception)
+seed_value_from_time_t(JSContextRef ctx, time_t time, JSValueRef* exception)
 {
-  JSValueRef args[1];
+    JSValueRef args[1];
 
-  args[0] = seed_value_from_double (ctx, ((gdouble) time) * 1000, exception);
-  return JSObjectMakeDate (ctx, 1, args, exception);
+    args[0] = seed_value_from_double(ctx, ((gdouble) time) * 1000, exception);
+    return JSObjectMakeDate(ctx, 1, args, exception);
 }
 
 time_t
-seed_value_to_time_t (JSContextRef ctx,
-		      JSValueRef value, JSValueRef * exception)
+seed_value_to_time_t(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
-  JSValueRef get_time_method;
-  JSValueRef jstime;
-  gdouble time;
-
-
-  if (JSValueIsNumber (ctx, value))
-    {
-      return (unsigned long) seed_value_to_long (ctx, value, exception);
-    }
-  else if (JSValueIsObject (ctx, value))
-    {
-      get_time_method = seed_object_get_property (ctx, (JSObjectRef) value,
-						  "getTime");
-      if (JSValueIsNull (ctx, get_time_method) ||
-	  !JSValueIsObject (ctx, get_time_method))
-	{
-	  goto out;
-	}
-      jstime = JSObjectCallAsFunction (ctx,
-				       (JSObjectRef) get_time_method,
-				       (JSObjectRef) value,
-				       0, NULL, exception);
-      time = seed_value_to_double (ctx, jstime, exception);
-      return (unsigned long) (time / 1000);
+    JSValueRef get_time_method;
+    JSValueRef jstime;
+    gdouble time;
+
+    if (JSValueIsNumber(ctx, value)) {
+        return (unsigned long) seed_value_to_long(ctx, value, exception);
+    } else if (JSValueIsObject(ctx, value)) {
+        get_time_method
+          = seed_object_get_property(ctx, (JSObjectRef) value, "getTime");
+        if (JSValueIsNull(ctx, get_time_method)
+            || !JSValueIsObject(ctx, get_time_method)) {
+            goto out;
+        }
+        jstime
+          = JSObjectCallAsFunction(ctx, (JSObjectRef) get_time_method,
+                                   (JSObjectRef) value, 0, NULL, exception);
+        time = seed_value_to_double(ctx, jstime, exception);
+        return (unsigned long) (time / 1000);
     }
 
 out:
-  seed_make_exception (ctx, exception,
-		       "TypeError",
-		       "Unable to convert JavaScript value to time_t");
-  return 0;
+    seed_make_exception(ctx, exception, "TypeError",
+                        "Unable to convert JavaScript value to time_t");
+    return 0;
 }
 
 /**
@@ -2782,20 +2767,18 @@ out:
  *
  */
 JSValueRef
-seed_value_from_strv (JSContextRef ctx,
-		      GStrv * val, JSValueRef * exception)
+seed_value_from_strv(JSContextRef ctx, GStrv* val, JSValueRef* exception)
 {
-      GArray *js_string_array = g_array_new (FALSE, FALSE, sizeof(gpointer));
-      for (; *val != NULL; val++)
-	{
-	  JSStringRef js_string = seed_value_from_string (ctx, *val, exception);
-	  js_string_array = g_array_append_val(js_string_array, js_string);
-	}
-      JSValueRef res = JSObjectMakeArray (ctx,
-					  js_string_array->len,
-					  (JSValueRef*)js_string_array->data,
-					  exception);
-      g_array_free (js_string_array, FALSE);
-
-      return res;
+    GArray* js_string_array = g_array_new(FALSE, FALSE, sizeof(gpointer));
+    for (; *val != NULL; val++) {
+        JSValueRef js_string
+          = seed_value_from_string(ctx, (char*) *val, exception);
+        js_string_array = g_array_append_val(js_string_array, js_string);
+    }
+    JSValueRef res
+      = JSObjectMakeArray(ctx, js_string_array->len,
+                          (JSValueRef*) js_string_array->data, exception);
+    g_array_free(js_string_array, FALSE);
+
+    return res;
 }
diff --git a/libseed/seed-types.h b/libseed/seed-types.h
index 1ffdac3..fe90ae0 100644
--- a/libseed/seed-types.h
+++ b/libseed/seed-types.h
@@ -24,146 +24,198 @@
 
 extern GQuark js_ref_quark;
 
-JSValueRef seed_value_from_gvalue (JSContextRef ctx,
-				   GValue * gval, JSValueRef * exception);
-
-JSValueRef seed_value_from_gvalue_for_signal (JSContextRef ctx,
-				   GValue * gval, JSValueRef * exception,
-				   GSignalQuery *signal_query, gint arg_n);
-
-gboolean seed_value_to_gvalue (JSContextRef ctx,
-			       JSValueRef val, GType type,
-			       GValue * gval, JSValueRef * exception);
-
-JSValueRef seed_object_get_property (JSContextRef ctx,
-				     JSObjectRef val, const gchar * name);
-
-gboolean seed_object_set_property (JSContextRef ctx, JSObjectRef object,
-				   const gchar * name, JSValueRef value);
-
-gboolean seed_value_to_gi_argument (JSContextRef ctx,
-				    JSValueRef value,
-				    GITypeInfo * type_info,
-				    GArgument * arg, JSValueRef * exception);
-
-JSValueRef seed_value_from_gi_argument (JSContextRef ctx,
-				        GArgument * arg,
-				        GITypeInfo * type_info,
-				        JSValueRef * exception);
-
-JSValueRef seed_value_from_gi_argument_full (JSContextRef ctx,
-				        GArgument * arg,
-				        GITypeInfo * type_info,
-				        JSValueRef * exception,
-                                        guint64 array_len,
-                                        GITypeTag gi_tag);
-gboolean seed_gi_release_arg (GITransfer transfer,
-			      GITypeInfo * type_info, GArgument * arg);
-
-gboolean seed_gi_release_in_arg (GITransfer transfer,
-				 GITypeInfo * type_info, GArgument * arg);
-
-gboolean seed_value_to_boolean (JSContextRef ctx,
-				JSValueRef val, JSValueRef * exception);
-
-JSValueRef seed_value_from_boolean (JSContextRef ctx,
-				    gboolean val, JSValueRef * exception);
-
-guint seed_value_to_uint (JSContextRef ctx,
-			  JSValueRef val, JSValueRef * exception);
-
-JSValueRef seed_value_from_uint (JSContextRef ctx,
-				 guint val, JSValueRef * exception);
-
-gint seed_value_to_int (JSContextRef ctx,
-			JSValueRef val, JSValueRef * exception);
-
-JSValueRef seed_value_from_int (JSContextRef ctx,
-				gint val, JSValueRef * exception);
-
-gchar seed_value_to_char (JSContextRef ctx,
-			  JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_char (JSContextRef ctx,
-				 gchar val, JSValueRef * exception);
-
-guchar seed_value_to_uchar (JSContextRef ctx,
-			    JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_uchar (JSContextRef ctx,
-				  guchar val, JSValueRef * exception);
-
-glong seed_value_to_long (JSContextRef ctx,
-			  JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_long (JSContextRef ctx,
-				 glong val, JSValueRef * exception);
-
-gulong seed_value_to_ulong (JSContextRef ctx,
-			    JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_ulong (JSContextRef ctx,
-				  gulong val, JSValueRef * exception);
-
-gint64 seed_value_to_int64 (JSContextRef ctx,
-			    JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_int64 (JSContextRef ctx,
-				  gint64 val, JSValueRef * exception);
-
-guint64 seed_value_to_uint64 (JSContextRef ctx,
-			      JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_uint64 (JSContextRef ctx,
-				   guint64 val, JSValueRef * exception);
-
-gfloat seed_value_to_float (JSContextRef ctx,
-			    JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_float (JSContextRef ctx,
-				  gfloat val, JSValueRef * exception);
-
-gdouble seed_value_to_double (JSContextRef ctx,
-			      JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_double (JSContextRef ctx,
-				   gdouble val, JSValueRef * exception);
-
-gsize seed_value_to_size (JSContextRef ctx,
-			  JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_size (JSContextRef ctx,
-				 gsize val, JSValueRef * exception);
-
-gssize seed_value_to_ssize (JSContextRef ctx,
-			    JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_ssize (JSContextRef ctx,
-				  gssize val, JSValueRef * exception);
-
-gchar *seed_value_to_filename (JSContextRef ctx,
-			       JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_filename (JSContextRef ctx,
-				     const gchar * filename,
-				     JSValueRef * exception);
-
-gchar *seed_value_to_string (JSContextRef ctx,
-			     JSValueRef val, JSValueRef * exception);
-
-JSValueRef seed_value_from_string (JSContextRef ctx,
-				   const gchar * val, JSValueRef * exception);
-
-time_t seed_value_to_time_t (JSContextRef ctx,
-			     JSValueRef val, JSValueRef * exception);
-
-JSValueRef seed_value_from_time_t (JSContextRef ctx,
-				   time_t time, JSValueRef * exception);
-
-GObject *seed_value_to_object (JSContextRef ctx,
-			       JSValueRef val, JSValueRef * exception);
-JSValueRef seed_value_from_object (JSContextRef ctx,
-				   GObject * val, JSValueRef * exception);
-JSValueRef seed_value_from_strv (JSContextRef ctx,
-				 GStrv * val, JSValueRef * exception);
-void seed_toggle_ref (gpointer data, GObject * object, gboolean is_last_ref);
-
-gboolean seed_validate_enum (GIEnumInfo * info, long val);
-
-JSValueRef
-seed_value_from_binary_string (JSContextRef ctx,
-			       const gchar * bytes,
-			       gint n_bytes, JSValueRef * exception);
-
-JSObjectRef seed_make_wrapper_for_type (JSContextRef ctx, GType type);
+JSValueRef seed_value_from_gvalue(JSContextRef ctx,
+                                  GValue* gval,
+                                  JSValueRef* exception);
+
+JSValueRef seed_value_from_gvalue_for_signal(JSContextRef ctx,
+                                             GValue* gval,
+                                             JSValueRef* exception,
+                                             GSignalQuery* signal_query,
+                                             gint arg_n);
+
+gboolean seed_value_to_gvalue(JSContextRef ctx,
+                              JSValueRef val,
+                              GType type,
+                              GValue* gval,
+                              JSValueRef* exception);
+
+JSValueRef seed_object_get_property(JSContextRef ctx,
+                                    JSObjectRef val,
+                                    const gchar* name);
+
+gboolean seed_object_set_property(JSContextRef ctx,
+                                  JSObjectRef object,
+                                  const gchar* name,
+                                  JSValueRef value);
+
+gboolean seed_value_to_gi_argument(JSContextRef ctx,
+                                   JSValueRef value,
+                                   GITypeInfo* type_info,
+                                   GITransfer transfer,
+                                   GArgument* arg,
+                                   JSValueRef* exception);
+
+gboolean seed_value_to_gi_argument_with_out_length(JSContextRef ctx,
+                                                   JSValueRef value,
+                                                   GITypeInfo* type_info,
+                                                   GITransfer transfer,
+                                                   GArgument* arg,
+                                                   guint* out_array_length,
+                                                   JSValueRef* exception);
+
+JSValueRef seed_value_from_gi_argument(JSContextRef ctx,
+                                       GArgument* arg,
+                                       GITypeInfo* type_info,
+                                       JSValueRef* exception);
+
+JSValueRef seed_value_from_gi_argument_full(JSContextRef ctx,
+                                            GArgument* arg,
+                                            GITypeInfo* type_info,
+                                            JSValueRef* exception,
+                                            guint64 array_len,
+                                            GITypeTag gi_tag);
+gboolean seed_gi_release_arg(GITransfer transfer,
+                             GITypeInfo* type_info,
+                             GArgument* arg);
+
+gboolean seed_gi_release_in_arg(GITransfer transfer,
+                                GITypeInfo* type_info,
+                                GArgument* arg);
+
+gboolean seed_value_to_boolean(JSContextRef ctx,
+                               JSValueRef val,
+                               JSValueRef* exception);
+
+JSValueRef seed_value_from_boolean(JSContextRef ctx,
+                                   gboolean val,
+                                   JSValueRef* exception);
+
+guint seed_value_to_uint(JSContextRef ctx,
+                         JSValueRef val,
+                         JSValueRef* exception);
+
+JSValueRef seed_value_from_uint(JSContextRef ctx,
+                                guint val,
+                                JSValueRef* exception);
+
+gint seed_value_to_int(JSContextRef ctx, JSValueRef val, JSValueRef* exception);
+
+JSValueRef seed_value_from_int(JSContextRef ctx,
+                               gint val,
+                               JSValueRef* exception);
+
+gchar seed_value_to_char(JSContextRef ctx,
+                         JSValueRef val,
+                         JSValueRef* exception);
+JSValueRef seed_value_from_char(JSContextRef ctx,
+                                gchar val,
+                                JSValueRef* exception);
+
+guchar seed_value_to_uchar(JSContextRef ctx,
+                           JSValueRef val,
+                           JSValueRef* exception);
+JSValueRef seed_value_from_uchar(JSContextRef ctx,
+                                 guchar val,
+                                 JSValueRef* exception);
+
+glong seed_value_to_long(JSContextRef ctx,
+                         JSValueRef val,
+                         JSValueRef* exception);
+JSValueRef seed_value_from_long(JSContextRef ctx,
+                                glong val,
+                                JSValueRef* exception);
+
+gulong seed_value_to_ulong(JSContextRef ctx,
+                           JSValueRef val,
+                           JSValueRef* exception);
+JSValueRef seed_value_from_ulong(JSContextRef ctx,
+                                 gulong val,
+                                 JSValueRef* exception);
+
+gint64 seed_value_to_int64(JSContextRef ctx,
+                           JSValueRef val,
+                           JSValueRef* exception);
+JSValueRef seed_value_from_int64(JSContextRef ctx,
+                                 gint64 val,
+                                 JSValueRef* exception);
+
+guint64 seed_value_to_uint64(JSContextRef ctx,
+                             JSValueRef val,
+                             JSValueRef* exception);
+JSValueRef seed_value_from_uint64(JSContextRef ctx,
+                                  guint64 val,
+                                  JSValueRef* exception);
+
+gfloat seed_value_to_float(JSContextRef ctx,
+                           JSValueRef val,
+                           JSValueRef* exception);
+JSValueRef seed_value_from_float(JSContextRef ctx,
+                                 gfloat val,
+                                 JSValueRef* exception);
+
+gdouble seed_value_to_double(JSContextRef ctx,
+                             JSValueRef val,
+                             JSValueRef* exception);
+JSValueRef seed_value_from_double(JSContextRef ctx,
+                                  gdouble val,
+                                  JSValueRef* exception);
+
+gsize seed_value_to_size(JSContextRef ctx,
+                         JSValueRef val,
+                         JSValueRef* exception);
+JSValueRef seed_value_from_size(JSContextRef ctx,
+                                gsize val,
+                                JSValueRef* exception);
+
+gssize seed_value_to_ssize(JSContextRef ctx,
+                           JSValueRef val,
+                           JSValueRef* exception);
+JSValueRef seed_value_from_ssize(JSContextRef ctx,
+                                 gssize val,
+                                 JSValueRef* exception);
+
+gchar* seed_value_to_filename(JSContextRef ctx,
+                              JSValueRef val,
+                              JSValueRef* exception);
+JSValueRef seed_value_from_filename(JSContextRef ctx,
+                                    const gchar* filename,
+                                    JSValueRef* exception);
+
+gchar* seed_value_to_string(JSContextRef ctx,
+                            JSValueRef val,
+                            JSValueRef* exception);
+
+JSValueRef seed_value_from_string(JSContextRef ctx,
+                                  const gchar* val,
+                                  JSValueRef* exception);
+
+time_t seed_value_to_time_t(JSContextRef ctx,
+                            JSValueRef val,
+                            JSValueRef* exception);
+
+JSValueRef seed_value_from_time_t(JSContextRef ctx,
+                                  time_t time,
+                                  JSValueRef* exception);
+
+GObject* seed_value_to_object(JSContextRef ctx,
+                              JSValueRef val,
+                              JSValueRef* exception);
+JSValueRef seed_value_from_object(JSContextRef ctx,
+                                  GObject* val,
+                                  JSValueRef* exception);
+JSValueRef seed_value_from_strv(JSContextRef ctx,
+                                GStrv* val,
+                                JSValueRef* exception);
+void seed_toggle_ref(gpointer data, GObject* object, gboolean is_last_ref);
+
+gboolean seed_validate_enum(GIEnumInfo* info, long val);
+
+JSValueRef seed_value_from_binary_string(JSContextRef ctx,
+                                         const gchar* bytes,
+                                         gint n_bytes,
+                                         JSValueRef* exception);
+
+JSObjectRef seed_make_wrapper_for_type(JSContextRef ctx, GType type);
 
 #endif
diff --git a/libseed/seed.h b/libseed/seed.h
index 0485f84..f00c129 100644
--- a/libseed/seed.h
+++ b/libseed/seed.h
@@ -36,432 +36,482 @@ typedef gpointer SeedContext;
 typedef gpointer SeedGlobalContext;
 typedef gpointer SeedContextGroup;
 
-typedef enum
-{
-  SEED_TYPE_UNDEFINED,
-  SEED_TYPE_NULL,
-  SEED_TYPE_BOOLEAN,
-  SEED_TYPE_NUMBER,
-  SEED_TYPE_STRING,
-  SEED_TYPE_OBJECT
+typedef enum {
+    SEED_TYPE_UNDEFINED,
+    SEED_TYPE_NULL,
+    SEED_TYPE_BOOLEAN,
+    SEED_TYPE_NUMBER,
+    SEED_TYPE_STRING,
+    SEED_TYPE_OBJECT
 } SeedType;
 
-typedef enum
-{
-  SEED_PROPERTY_ATTRIBUTE_NONE = 0,
-  SEED_PROPERTY_ATTRIBUTE_READ_ONLY = 1 << 1,
-  SEED_PROPERTY_ATTRIBUTE_DONT_ENUM = 1 << 2,
-  SEED_PROPERTY_ATTRIBUTE_DONT_DELETE = 1 << 3
+typedef enum {
+    SEED_PROPERTY_ATTRIBUTE_NONE = 0,
+    SEED_PROPERTY_ATTRIBUTE_READ_ONLY = 1 << 1,
+    SEED_PROPERTY_ATTRIBUTE_DONT_ENUM = 1 << 2,
+    SEED_PROPERTY_ATTRIBUTE_DONT_DELETE = 1 << 3
 } SeedPropertyAttributes;
 
-typedef enum
-{
-  SEED_CLASS_ATTRIBUTE_NONE = 0,
-  SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE = 1 << 1
+typedef enum {
+    SEED_CLASS_ATTRIBUTE_NONE = 0,
+    SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE = 1 << 1
 } SeedClassAttributes;
 
 typedef struct _SeedScript SeedScript;
 
 typedef struct _SeedEngine
 {
-  SeedGlobalContext context;
-  SeedValue global;
-  gchar **search_path;
+    SeedGlobalContext context;
+    SeedValue global;
+    gchar** search_path;
 
-  SeedContextGroup group;
+    SeedContextGroup group;
+    gchar* program_name;
 } SeedEngine;
 
 /*
  * seed-engine.c
  */
-SeedEngine *seed_init (gint *argc, gchar ***argv);
-SeedEngine *
-seed_init_with_context (gint * argc, gchar *** argv, SeedGlobalContext context);
-
-SeedEngine *seed_init_with_context_group (gint *argc, gchar ***argv,
-					  SeedContextGroup group);
-SeedEngine *seed_init_with_context_and_group (gint * argc,gchar *** argv,
-					  SeedGlobalContext context, SeedContextGroup group);
-SeedEngine *seed_init_constrained (gint * argc, gchar *** argv);
-SeedEngine *seed_init_constrained_with_context_and_group (gint * argc,
-                                                                 gchar *** argv,
-                                                                 SeedGlobalContext context,
-                                                                 SeedContextGroup group);
-void seed_engine_destroy (SeedEngine *eng);
-
-SeedValue seed_simple_evaluate (SeedContext ctx,
-				gchar * source,
-				SeedException *exception);
-
-SeedScript *seed_make_script (SeedContext ctx,
-			      const gchar * js,
-			      const gchar * source_url,
-			      gint line_number);
-SeedScript *seed_script_new_from_file (SeedContext ctx, gchar * file);
-SeedException seed_script_exception (SeedScript * s);
-void seed_script_destroy (SeedScript *s);
-void seed_make_exception (SeedContext ctx, SeedException exception,
-			  const gchar * name, const gchar * message, ...) G_GNUC_PRINTF (4,5);
-gchar *seed_exception_get_name (SeedContext ctx, SeedException exception);
-gchar *seed_exception_get_message (SeedContext ctx, SeedException exception);
-guint seed_exception_get_line (SeedContext ctx, SeedException exception);
-gchar *seed_exception_get_file (SeedContext ctx, SeedException exception);
-gchar *seed_exception_to_string (SeedContext ctx, SeedException exception);
-
-SeedValue seed_evaluate (SeedContext ctx, SeedScript * s, SeedObject this_object);
-
-SeedValue
-seed_engine_expose_gobject (SeedEngine *engine, gchar *js_name, GObject *object, gchar *gir_namespace, SeedException exception);
-SeedValue
-seed_engine_expose_namespace (SeedEngine *engine, gchar *namespace_name, SeedException exception);
-GOptionGroup * seed_get_option_group (void);
+SeedEngine* seed_init(gint* argc, gchar*** argv);
+SeedEngine* seed_init_with_context(gint* argc,
+                                   gchar*** argv,
+                                   SeedGlobalContext context);
+
+SeedEngine* seed_init_with_context_group(gint* argc,
+                                         gchar*** argv,
+                                         SeedContextGroup group);
+SeedEngine* seed_init_with_context_and_group(gint* argc,
+                                             gchar*** argv,
+                                             SeedGlobalContext context,
+                                             SeedContextGroup group);
+SeedEngine* seed_init_constrained(gint* argc, gchar*** argv);
+SeedEngine* seed_init_constrained_with_context_and_group(
+  gint* argc,
+  gchar*** argv,
+  SeedGlobalContext context,
+  SeedContextGroup group);
+void seed_engine_destroy(SeedEngine* eng);
+
+SeedValue seed_simple_evaluate(SeedContext ctx,
+                               gchar* source,
+                               SeedException* exception);
+
+SeedScript* seed_make_script(SeedContext ctx,
+                             const gchar* js,
+                             const gchar* source_url,
+                             gint line_number);
+SeedScript* seed_script_new_from_file(SeedContext ctx, gchar* file);
+SeedException seed_script_exception(SeedScript* s);
+void seed_script_destroy(SeedScript* s);
+void seed_make_exception(SeedContext ctx,
+                         SeedException exception,
+                         const gchar* name,
+                         const gchar* message,
+                         ...) G_GNUC_PRINTF(4, 5);
+gchar* seed_exception_get_name(SeedContext ctx, SeedException exception);
+gchar* seed_exception_get_message(SeedContext ctx, SeedException exception);
+guint seed_exception_get_line(SeedContext ctx, SeedException exception);
+gchar* seed_exception_get_file(SeedContext ctx, SeedException exception);
+gchar* seed_exception_get_stack(SeedContext ctx, SeedException exception);
+gchar* seed_exception_to_string(SeedContext ctx, SeedException exception);
+
+SeedValue seed_evaluate(SeedContext ctx, SeedScript* s, SeedObject this_object);
+
+SeedValue seed_engine_expose_gobject(SeedEngine* engine,
+                                     gchar* js_name,
+                                     GObject* object,
+                                     gchar* gir_namespace,
+                                     SeedException exception);
+SeedValue seed_engine_expose_namespace(SeedEngine* engine,
+                                       gchar* namespace_name,
+                                       SeedException exception);
+GOptionGroup* seed_get_option_group(void);
 
 /*
  * seed-api.c
  */
 
-SeedGlobalContext seed_context_create (SeedContextGroup group,
-				       SeedClass global_class);
-SeedGlobalContext seed_context_ref (SeedGlobalContext ctx);
-void seed_context_unref (SeedGlobalContext ctx);
-void seed_context_collect (SeedGlobalContext ctx);
-
-SeedObject seed_context_get_global_object (SeedContext ctx);
-
-void seed_importer_add_global(SeedContext ctx, gchar *name);
-void seed_importer_set_search_path (SeedContext ctx,
-				    gchar **search_path);
-void seed_prepare_global_context (SeedContext ctx);
-void seed_importer_add_search_path (SeedContext ctx, gchar *search_path);
-
-
-SeedValue seed_make_null (SeedContext ctx);
-SeedValue seed_make_undefined (SeedContext ctx);
-
-SeedString seed_string_ref (SeedString string);
-void seed_string_unref (SeedString string);
-
-gsize seed_string_get_maximum_size (SeedString string);
-gsize seed_string_to_utf8_buffer (SeedString string, gchar * buffer,
-				  size_t buffer_size);
-
-gboolean seed_string_is_equal (SeedString a, SeedString b);
-gboolean seed_string_is_equal_utf8 (SeedString a, const gchar * b);
-
-gboolean seed_value_is_null (SeedContext ctx, SeedValue value);
-gboolean seed_value_is_undefined (SeedContext ctx, SeedValue value);
-gboolean seed_value_is_object (SeedContext ctx, SeedValue value);
-gboolean seed_value_is_object_of_class (SeedContext ctx, SeedValue value, SeedClass klass);
-gboolean seed_value_is_function (SeedContext ctx, SeedObject value);
-gboolean seed_value_is_string (SeedContext ctx, SeedValue value);
-gboolean seed_value_is_number (SeedContext ctx, SeedValue value);
-
-void seed_value_unprotect (SeedContext ctx, SeedValue value);
-void seed_value_protect (SeedContext ctx, SeedValue value);
-
-gboolean seed_value_to_gvalue (SeedContext ctx,
-			       SeedValue val, GType type,
-			       GValue * gval, SeedException * exception);
-
-SeedValue seed_value_from_gvalue (SeedContext ctx,
-				  GValue * gval, SeedException * exception);
-
-gboolean seed_value_to_gi_argument (SeedContext ctx,
-				    SeedValue value,
-				    GITypeInfo * type_info,
-				    GArgument * arg, SeedValue * exception);
-
-SeedValue seed_value_from_gi_argument (SeedContext ctx,
-				       GArgument * arg,
-				       GITypeInfo * type_info,
-				       SeedException * exception);
-
-gboolean seed_value_to_boolean (SeedContext ctx,
-				SeedValue val, SeedException * exception);
-
-SeedValue seed_value_from_boolean (SeedContext ctx,
-				   gboolean val, SeedException * exception);
-
-guint seed_value_to_uint (SeedContext ctx,
-			  SeedValue val, SeedException * exception);
-
-SeedValue seed_value_from_uint (SeedContext ctx,
-				guint val, SeedException * exception);
-
-gint seed_value_to_int (SeedContext ctx,
-			SeedValue val, SeedException * exception);
-
-SeedValue seed_value_from_int (SeedContext ctx,
-			       gint val, SeedException * exception);
-
-gchar seed_value_to_char (SeedContext ctx,
-			  SeedValue val, SeedException * exception);
-SeedValue seed_value_from_char (SeedContext ctx,
-				gchar val, SeedException * exception);
-
-guchar seed_value_to_uchar (SeedContext ctx,
-			    SeedValue val, SeedException * exception);
-SeedValue seed_value_from_uchar (SeedContext ctx,
-				 guchar val, SeedException * exception);
-
-glong seed_value_to_long (SeedContext ctx,
-			  SeedValue val, SeedException * exception);
-SeedValue seed_value_from_long (SeedContext ctx,
-				glong val, SeedException * exception);
-
-gulong seed_value_to_ulong (SeedContext ctx,
-			    SeedValue val, SeedException * exception);
-SeedValue seed_value_from_ulong (SeedContext ctx,
-				 gulong val, SeedException * exception);
-
-gint64 seed_value_to_int64 (SeedContext ctx,
-			    SeedValue val, SeedException * exception);
-SeedValue seed_value_from_int64 (SeedContext ctx,
-				 gint64 val, SeedException * exception);
-
-guint64 seed_value_to_uint64 (SeedContext ctx,
-			      SeedValue val, SeedException * exception);
-SeedValue seed_value_from_uint64 (SeedContext ctx,
-				  guint64 val, SeedException * exception);
-
-gfloat seed_value_to_float (SeedContext ctx,
-			    SeedValue val, SeedException * exception);
-SeedValue seed_value_from_float (SeedContext ctx,
-				 gfloat val, SeedException * exception);
-
-gdouble seed_value_to_double (SeedContext ctx,
-			      SeedValue val, SeedException * exception);
-SeedValue seed_value_from_double (SeedContext ctx,
-				  gdouble val, SeedException * exception);
-
-gchar *seed_value_to_string (SeedContext ctx,
-			     SeedValue val, SeedException * exception);
-SeedValue seed_value_from_string (SeedContext ctx,
-				  const gchar * val, SeedException * exception);
-
-gchar *seed_value_to_filename (SeedContext ctx,
-			       SeedValue val, SeedValue *exception);
-SeedValue seed_value_from_filename (SeedContext ctx,
-				    SeedValue val, SeedValue *exception);
-
-SeedValue seed_value_from_binary_string (SeedContext ctx,
-					 const gchar *bytes,
-					 gint n_bytes, 
-					 SeedException *exception);
-
-SeedType seed_value_get_type (SeedContext ctx, SeedValue value);
-
-gboolean
-seed_value_to_format (SeedContext ctx,
-		      const gchar *format,
-		      SeedValue *values,
-		      SeedValue *exception,
-		      ...);
-
-typedef SeedObject (*SeedModuleInitCallback) (SeedEngine * eng);
-
-gboolean seed_object_set_property (SeedContext ctx,
-				   SeedObject object,
-				   const gchar * name, SeedValue value);
-SeedValue seed_object_get_property (SeedContext ctx,
-				    SeedObject object, const gchar * name);
-
-void seed_object_set_property_at_index (SeedContext ctx,
-					SeedObject object,
-					gint index,
-					SeedValue value,
-					SeedException * exception);
-
-SeedValue seed_object_get_property_at_index (SeedContext ctx,
-					     SeedObject object,
-					     gint index,
-					     SeedException *exception);
-
-SeedValue seed_object_call (SeedContext ctx,
-			    SeedObject object,
-			    SeedObject this_object,
-			    gsize argument_count,
-			    const SeedValue arguments[],
-			    SeedException * exception);
-
-GObject *seed_value_to_object (SeedContext ctx,
-			       SeedValue val, SeedException * exception);
-SeedValue seed_value_from_object (SeedContext ctx,
-				  GObject * val, SeedException * exception);
-
-SeedObject seed_make_object (SeedContext ctx, SeedClass klass,
-			     gpointer private_object);
-
-gpointer seed_object_get_private (SeedObject object);
-void seed_object_set_private (SeedObject object, gpointer value);
-
-gchar **seed_object_copy_property_names(SeedContext ctx, SeedObject object);
-
-gpointer seed_pointer_get_pointer (SeedContext ctx, SeedValue pointer);
-
-SeedObject
-seed_object_get_prototype (SeedContext ctx, SeedObject obj);
-
-gboolean
-seed_object_is_of_class (SeedContext ctx, SeedObject obj, SeedClass klass);
-
-SeedValue seed_make_pointer (SeedContext ctx, gpointer pointer);
-
-typedef SeedValue (*SeedFunctionCallback) (SeedContext ctx,
-					   SeedObject function,
-					   SeedObject this_object,
-					   gsize argument_count,
-					   const SeedValue arguments[],
-					   SeedException * exception);
-
-void seed_create_function (SeedContext ctx,
-			   gchar * name, SeedFunctionCallback func,
-			   SeedObject obj);
-SeedObject seed_make_function (SeedContext ctx, SeedFunctionCallback func, const gchar *name);
-
-
-SeedObject seed_make_array (SeedContext ctx, const SeedValue elements,
-			    gsize num_elements, SeedException *exception);
-
-
-
-typedef void (*SeedObjectInitializeCallback) (SeedContext ctx,
-					      SeedObject object);
+SeedGlobalContext seed_context_create(SeedContextGroup group,
+                                      SeedClass global_class);
+SeedGlobalContext seed_context_ref(SeedGlobalContext ctx);
+void seed_context_unref(SeedGlobalContext ctx);
+void seed_context_collect(SeedGlobalContext ctx);
+
+SeedObject seed_context_get_global_object(SeedContext ctx);
+
+void seed_importer_add_global(SeedContext ctx, gchar* name);
+void seed_importer_set_search_path(SeedContext ctx, gchar** search_path);
+void seed_prepare_global_context(SeedContext ctx);
+void seed_importer_add_search_path(SeedContext ctx, gchar* search_path);
+
+SeedValue seed_make_null(SeedContext ctx);
+SeedValue seed_make_undefined(SeedContext ctx);
+
+SeedString seed_string_ref(SeedString string);
+void seed_string_unref(SeedString string);
+
+gsize seed_string_get_maximum_size(SeedString string);
+gsize seed_string_to_utf8_buffer(SeedString string,
+                                 gchar* buffer,
+                                 size_t buffer_size);
+
+gboolean seed_string_is_equal(SeedString a, SeedString b);
+gboolean seed_string_is_equal_utf8(SeedString a, const gchar* b);
+
+gboolean seed_value_is_null(SeedContext ctx, SeedValue value);
+gboolean seed_value_is_undefined(SeedContext ctx, SeedValue value);
+gboolean seed_value_is_object(SeedContext ctx, SeedValue value);
+gboolean seed_value_is_object_of_class(SeedContext ctx,
+                                       SeedValue value,
+                                       SeedClass klass);
+gboolean seed_value_is_function(SeedContext ctx, SeedObject value);
+gboolean seed_value_is_string(SeedContext ctx, SeedValue value);
+gboolean seed_value_is_number(SeedContext ctx, SeedValue value);
+
+void seed_value_unprotect(SeedContext ctx, SeedValue value);
+void seed_value_protect(SeedContext ctx, SeedValue value);
+
+gboolean seed_value_to_gvalue(SeedContext ctx,
+                              SeedValue val,
+                              GType type,
+                              GValue* gval,
+                              SeedException* exception);
+
+SeedValue seed_value_from_gvalue(SeedContext ctx,
+                                 GValue* gval,
+                                 SeedException* exception);
+
+gboolean seed_value_to_gi_argument(SeedContext ctx,
+                                   SeedValue value,
+                                   GITypeInfo* type_info,
+                                   GITransfer transfer,
+                                   GArgument* arg,
+                                   SeedValue* exception);
+
+SeedValue seed_value_from_gi_argument(SeedContext ctx,
+                                      GArgument* arg,
+                                      GITypeInfo* type_info,
+                                      SeedException* exception);
+
+gboolean seed_value_to_boolean(SeedContext ctx,
+                               SeedValue val,
+                               SeedException* exception);
+
+SeedValue seed_value_from_boolean(SeedContext ctx,
+                                  gboolean val,
+                                  SeedException* exception);
+
+guint seed_value_to_uint(SeedContext ctx,
+                         SeedValue val,
+                         SeedException* exception);
+
+SeedValue seed_value_from_uint(SeedContext ctx,
+                               guint val,
+                               SeedException* exception);
+
+gint seed_value_to_int(SeedContext ctx,
+                       SeedValue val,
+                       SeedException* exception);
+
+SeedValue seed_value_from_int(SeedContext ctx,
+                              gint val,
+                              SeedException* exception);
+
+gchar seed_value_to_char(SeedContext ctx,
+                         SeedValue val,
+                         SeedException* exception);
+SeedValue seed_value_from_char(SeedContext ctx,
+                               gchar val,
+                               SeedException* exception);
+
+guchar seed_value_to_uchar(SeedContext ctx,
+                           SeedValue val,
+                           SeedException* exception);
+SeedValue seed_value_from_uchar(SeedContext ctx,
+                                guchar val,
+                                SeedException* exception);
+
+glong seed_value_to_long(SeedContext ctx,
+                         SeedValue val,
+                         SeedException* exception);
+SeedValue seed_value_from_long(SeedContext ctx,
+                               glong val,
+                               SeedException* exception);
+
+gulong seed_value_to_ulong(SeedContext ctx,
+                           SeedValue val,
+                           SeedException* exception);
+SeedValue seed_value_from_ulong(SeedContext ctx,
+                                gulong val,
+                                SeedException* exception);
+
+gint64 seed_value_to_int64(SeedContext ctx,
+                           SeedValue val,
+                           SeedException* exception);
+SeedValue seed_value_from_int64(SeedContext ctx,
+                                gint64 val,
+                                SeedException* exception);
+
+guint64 seed_value_to_uint64(SeedContext ctx,
+                             SeedValue val,
+                             SeedException* exception);
+SeedValue seed_value_from_uint64(SeedContext ctx,
+                                 guint64 val,
+                                 SeedException* exception);
+
+gfloat seed_value_to_float(SeedContext ctx,
+                           SeedValue val,
+                           SeedException* exception);
+SeedValue seed_value_from_float(SeedContext ctx,
+                                gfloat val,
+                                SeedException* exception);
+
+gdouble seed_value_to_double(SeedContext ctx,
+                             SeedValue val,
+                             SeedException* exception);
+SeedValue seed_value_from_double(SeedContext ctx,
+                                 gdouble val,
+                                 SeedException* exception);
+
+gchar* seed_value_to_string(SeedContext ctx,
+                            SeedValue val,
+                            SeedException* exception);
+SeedValue seed_value_from_string(SeedContext ctx,
+                                 const gchar* val,
+                                 SeedException* exception);
+
+gchar* seed_value_to_filename(SeedContext ctx,
+                              SeedValue val,
+                              SeedValue* exception);
+SeedValue seed_value_from_filename(SeedContext ctx,
+                                   SeedValue val,
+                                   SeedValue* exception);
+
+SeedValue seed_value_from_binary_string(SeedContext ctx,
+                                        const gchar* bytes,
+                                        gint n_bytes,
+                                        SeedException* exception);
+
+SeedType seed_value_get_type(SeedContext ctx, SeedValue value);
+
+gboolean seed_value_to_format(SeedContext ctx,
+                              const gchar* format,
+                              SeedValue* values,
+                              SeedValue* exception,
+                              ...);
+
+typedef SeedObject (*SeedModuleInitCallback)(SeedEngine* eng);
+
+gboolean seed_object_set_property(SeedContext ctx,
+                                  SeedObject object,
+                                  const gchar* name,
+                                  SeedValue value);
+SeedValue seed_object_get_property(SeedContext ctx,
+                                   SeedObject object,
+                                   const gchar* name);
+
+void seed_object_set_property_at_index(SeedContext ctx,
+                                       SeedObject object,
+                                       gint index,
+                                       SeedValue value,
+                                       SeedException* exception);
+
+SeedValue seed_object_get_property_at_index(SeedContext ctx,
+                                            SeedObject object,
+                                            gint index,
+                                            SeedException* exception);
+
+SeedValue seed_object_call(SeedContext ctx,
+                           SeedObject object,
+                           SeedObject this_object,
+                           gsize argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception);
+
+GObject* seed_value_to_object(SeedContext ctx,
+                              SeedValue val,
+                              SeedException* exception);
+SeedValue seed_value_from_object(SeedContext ctx,
+                                 GObject* val,
+                                 SeedException* exception);
+
+SeedObject seed_make_object(SeedContext ctx,
+                            SeedClass klass,
+                            gpointer private_object);
+
+gpointer seed_object_get_private(SeedObject object);
+void seed_object_set_private(SeedObject object, gpointer value);
+
+gchar** seed_object_copy_property_names(SeedContext ctx, SeedObject object);
+
+gpointer seed_pointer_get_pointer(SeedContext ctx, SeedValue pointer);
+
+SeedObject seed_object_get_prototype(SeedContext ctx, SeedObject obj);
+
+gboolean seed_object_is_of_class(SeedContext ctx,
+                                 SeedObject obj,
+                                 SeedClass klass);
+
+SeedValue seed_make_pointer(SeedContext ctx, gpointer pointer);
+
+typedef SeedValue (*SeedFunctionCallback)(SeedContext ctx,
+                                          SeedObject function,
+                                          SeedObject this_object,
+                                          gsize argument_count,
+                                          const SeedValue arguments[],
+                                          SeedException* exception);
+
+void seed_create_function(SeedContext ctx,
+                          gchar* name,
+                          SeedFunctionCallback func,
+                          SeedObject obj);
+SeedObject seed_make_function(SeedContext ctx,
+                              SeedFunctionCallback func,
+                              const gchar* name);
+
+SeedObject seed_make_array(SeedContext ctx,
+                           const SeedValue elements,
+                           gsize num_elements,
+                           SeedException* exception);
+
+typedef void (*SeedObjectInitializeCallback)(SeedContext ctx,
+                                             SeedObject object);
 
 /* Using any functions that require a context from
  *this callback has undefined results */
-typedef void (*SeedObjectFinalizeCallback) (SeedObject object);
-
-typedef gboolean (*SeedObjectHasPropertyCallback) (SeedContext ctx,
-						   SeedObject object,
-						   SeedString string);
-typedef SeedValue (*SeedObjectGetPropertyCallback) (SeedContext ctx,
-						    SeedObject object,
-						    SeedString property_name,
-						    SeedException * e);
-typedef gboolean (*SeedObjectSetPropertyCallback) (SeedContext ctx,
-						   SeedObject object,
-						   SeedString property_name,
-						   SeedValue value,
-						   SeedException * e);
-typedef gboolean (*SeedObjectDeletePropertyCallback) (SeedContext ctx,
-						      SeedObject object,
-						      SeedString property_name,
-						      SeedException * e);
+typedef void (*SeedObjectFinalizeCallback)(SeedObject object);
+
+typedef gboolean (*SeedObjectHasPropertyCallback)(SeedContext ctx,
+                                                  SeedObject object,
+                                                  SeedString string);
+typedef SeedValue (*SeedObjectGetPropertyCallback)(SeedContext ctx,
+                                                   SeedObject object,
+                                                   SeedString property_name,
+                                                   SeedException* e);
+typedef gboolean (*SeedObjectSetPropertyCallback)(SeedContext ctx,
+                                                  SeedObject object,
+                                                  SeedString property_name,
+                                                  SeedValue value,
+                                                  SeedException* e);
+typedef gboolean (*SeedObjectDeletePropertyCallback)(SeedContext ctx,
+                                                     SeedObject object,
+                                                     SeedString property_name,
+                                                     SeedException* e);
 /* TODO: Have to decide on accumulator API
 //typedef void (*SeedObjectGetPropertyNamesCallback) (SeedContext ctx, */
 
-typedef void (*SeedObjectGetPropertyNamesCallback) (void);
-
-typedef SeedValue (*SeedObjectCallAsFunctionCallback) (SeedContext ctx,
-						       SeedObject function,
-						       SeedObject this_object,
-						       gsize argument_count,
-						       const SeedValue
-						       arguments[],
-						       SeedException *
-						       exception);
-typedef SeedValue (*SeedObjectCallAsConstructorCallback) (SeedContext ctx,
-							  SeedObject
-							  constructor,
-							  gsize
-							  argument_count,
-							  const SeedValue
-							  arguments[],
-							  SeedException *
-							  exception);
-
-typedef gboolean (*SeedObjectHasInstanceCallback) (SeedContext ctx,
-						   SeedObject constructor,
-						   SeedObject instance_p,
-						   SeedException * exception);
-
-typedef SeedValue (*SeedObjectConvertToTypeCallback) (SeedContext ctx,
-						      SeedObject object,
-						      SeedType type,
-						      SeedException *
-						      exception);
+typedef void (*SeedObjectGetPropertyNamesCallback)(void);
+
+typedef SeedValue (*SeedObjectCallAsFunctionCallback)(
+  SeedContext ctx,
+  SeedObject function,
+  SeedObject this_object,
+  gsize argument_count,
+  const SeedValue arguments[],
+  SeedException* exception);
+typedef SeedValue (*SeedObjectCallAsConstructorCallback)(
+  SeedContext ctx,
+  SeedObject constructor,
+  gsize argument_count,
+  const SeedValue arguments[],
+  SeedException* exception);
+
+typedef gboolean (*SeedObjectHasInstanceCallback)(SeedContext ctx,
+                                                  SeedObject constructor,
+                                                  SeedObject instance_p,
+                                                  SeedException* exception);
+
+typedef SeedValue (*SeedObjectConvertToTypeCallback)(SeedContext ctx,
+                                                     SeedObject object,
+                                                     SeedType type,
+                                                     SeedException* exception);
 
 typedef struct _seed_static_value
 {
-  const gchar *const name;
-  SeedObjectGetPropertyCallback get_property;
-  SeedObjectSetPropertyCallback set_property;
-  SeedPropertyAttributes attributes;
+    const gchar* const name;
+    SeedObjectGetPropertyCallback get_property;
+    SeedObjectSetPropertyCallback set_property;
+    SeedPropertyAttributes attributes;
 } seed_static_value;
 
 typedef struct _seed_static_function
 {
-  const gchar *const name;
-  SeedObjectCallAsFunctionCallback callback;
-  SeedPropertyAttributes attributes;
+    const gchar* const name;
+    SeedObjectCallAsFunctionCallback callback;
+    SeedPropertyAttributes attributes;
 } seed_static_function;
 
 typedef struct _seed_class_definition
 {
-  int version;			/* Always 0 */
-  SeedClassAttributes attributes;
-
-  const gchar *class_name;
-  SeedClass parent_class;
-
-  const seed_static_value *static_values;
-  const seed_static_function *static_functions;
-
-  SeedObjectInitializeCallback initialize;
-  SeedObjectFinalizeCallback finalize;
-  SeedObjectHasPropertyCallback has_property;
-  SeedObjectGetPropertyCallback get_property;
-  SeedObjectSetPropertyCallback set_property;
-  SeedObjectDeletePropertyCallback delete_property;
-  SeedObjectGetPropertyNamesCallback get_property_names;
-  SeedObjectCallAsFunctionCallback call_as_function;
-  SeedObjectCallAsConstructorCallback call_as_constructor;
-  SeedObjectHasInstanceCallback has_instance;
-  SeedObjectConvertToTypeCallback convert_to_type;
+    int version; /* Always 0 */
+    SeedClassAttributes attributes;
+
+    const gchar* class_name;
+    SeedClass parent_class;
+
+    const seed_static_value* static_values;
+    const seed_static_function* static_functions;
+
+    SeedObjectInitializeCallback initialize;
+    SeedObjectFinalizeCallback finalize;
+    SeedObjectHasPropertyCallback has_property;
+    SeedObjectGetPropertyCallback get_property;
+    SeedObjectSetPropertyCallback set_property;
+    SeedObjectDeletePropertyCallback delete_property;
+    SeedObjectGetPropertyNamesCallback get_property_names;
+    SeedObjectCallAsFunctionCallback call_as_function;
+    SeedObjectCallAsConstructorCallback call_as_constructor;
+    SeedObjectHasInstanceCallback has_instance;
+    SeedObjectConvertToTypeCallback convert_to_type;
 } seed_class_definition;
 
-#define seed_empty_class { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,};
-
-SeedClass seed_create_class (seed_class_definition * def);
-
-SeedObject seed_make_constructor (SeedContext ctx,
-				  SeedClass klass,
-				  SeedObjectCallAsConstructorCallback constructor);
-
-void seed_engine_set_search_path (SeedEngine * eng, const gchar * path);
-gchar **seed_engine_get_search_path (SeedEngine * eng);
-
-void
-seed_signal_connect (SeedContext ctx,
-		     GObject *object,
-		     const gchar *signal,
-		     const gchar *script);
-
-void
-seed_signal_connect_value (SeedContext ctx,
-			   GObject *object,
-			   const gchar *signal,
-			   SeedValue function,
-			   SeedValue user_data);
-
-GClosure *seed_closure_new (SeedContext ctx,
-			    SeedObject function,
-			    SeedObject user_data,
-			    const gchar *description);
-
-
-SeedObject
-seed_closure_get_callable (GClosure *c);
-
-SeedValue
-seed_closure_invoke (GClosure *closure, SeedValue *args, guint argc, SeedException *exception);
-
-SeedValue
-seed_closure_invoke_with_context (SeedContext ctx, GClosure *closure, SeedValue *args, guint argc, SeedException *exception);
-
-void
-seed_closure_warn_exception (GClosure *c, SeedContext ctx, SeedException exception);
+#define seed_empty_class                                                       \
+    {                                                                          \
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                     \
+    };
+
+SeedClass seed_create_class(seed_class_definition* def);
+
+SeedObject seed_make_constructor(
+  SeedContext ctx,
+  SeedClass klass,
+  SeedObjectCallAsConstructorCallback constructor);
+
+void seed_engine_set_search_path(SeedEngine* eng, const gchar* path);
+gchar** seed_engine_get_search_path(SeedEngine* eng);
+
+void seed_signal_connect(SeedContext ctx,
+                         GObject* object,
+                         const gchar* signal,
+                         const gchar* script);
+
+void seed_signal_connect_value(SeedContext ctx,
+                               GObject* object,
+                               const gchar* signal,
+                               SeedValue function,
+                               SeedValue user_data);
+
+GClosure* seed_closure_new(SeedContext ctx,
+                           SeedObject function,
+                           SeedObject user_data,
+                           const gchar* description);
+
+SeedObject seed_closure_get_callable(GClosure* c);
+
+SeedValue seed_closure_invoke(GClosure* closure,
+                              SeedValue* args,
+                              guint argc,
+                              SeedException* exception);
+
+SeedValue seed_closure_invoke_with_context(SeedContext ctx,
+                                           GClosure* closure,
+                                           SeedValue* args,
+                                           guint argc,
+                                           SeedException* exception);
+
+void seed_closure_warn_exception(GClosure* c,
+                                 SeedContext ctx,
+                                 SeedException exception);
 
 G_END_DECLS
 
diff --git a/ltmain.sh b/ltmain.sh
index 0096fe6..9536629 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
 
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -23,881 +26,2112 @@
 # 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
-TIMESTAMP=""
-package_revision=1.3337
+VERSION="2.4.6 Debian-2.4.6-0.1bq1"
+package_revision=2.4.6
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 3 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES 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, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+	  export $_G_var
+	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
 
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+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
+
 
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
 
 
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+		   func_path_progs_result=$func_check_prog_result
+		   ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
 
 : ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
 
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
 
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
 
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
 
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
 
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
 
-# func_stripname 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).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    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 may be replaced by extended shell implementation
 
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
 
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
 
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
 
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
 
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
 
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
 case $progpath in
   [\\/]*|[A-Za-z]:\\*) ;;
   *[\\/]*)
-     progdir=$func_dirname_result
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
      progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
   *)
-     save_IFS="$IFS"
+     _G_IFS=$IFS
      IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
-       IFS="$save_IFS"
+       IFS=$_G_IFS
        test -x "$progdir/$progname" && break
      done
-     IFS="$save_IFS"
+     IFS=$_G_IFS
      test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
+     progpath=$progdir/$progname
      ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
 
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
 
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
 
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
 opt_dry_run=false
-opt_help=false
 opt_quiet=false
 opt_verbose=false
-opt_warning=:
 
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
 {
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset=''
+        tc_bold='';   tc_standout=''
+        tc_red='';   tc_green=''
+        tc_blue='';  tc_cyan=''
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
 }
 
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
 {
-    $opt_verbose && func_echo ${1+"$@"}
+    $debug_cmd
 
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
 }
 
-# func_echo_all arg...
+
+# func_echo_all ARG...
+# --------------------
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
     $ECHO "$*"
 }
 
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
 {
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
 }
 
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
 {
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+    $debug_cmd
 
-    # bash bug again:
-    :
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
 }
 
-# func_fatal_error arg...
+
+# func_fatal_error ARG...
+# -----------------------
 # Echo program name prefixed message to standard error, and exit.
 func_fatal_error ()
 {
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
+    $debug_cmd
 
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
+    func_error "$*"
+    exit $EXIT_FAILURE
 }
-help="Try \`$progname --help' for more information."  ## default
 
 
-# func_grep expression filename
+# func_grep EXPRESSION FILENAME
+# -----------------------------
 # Check whether EXPRESSION matches any line of FILENAME, without output.
 func_grep ()
 {
+    $debug_cmd
+
     $GREP "$1" "$2" >/dev/null 2>&1
 }
 
 
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
 # Make sure the entire path to DIRECTORY-PATH is available.
 func_mkdir_p ()
 {
-    my_directory_path="$1"
-    my_dir_list=
+    $debug_cmd
 
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+    _G_directory_path=$1
+    _G_dir_list=
 
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
       esac
 
       # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
+      while test ! -d "$_G_directory_path"; do
         # ...make a list in topmost first order.  Use a colon delimited
 	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
+        _G_dir_list=$_G_directory_path:$_G_dir_list
 
         # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
+        case $_G_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
       done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
         # try to create one of the directories concurrently.  Don't
         # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
+        $MKDIR "$_G_dir" 2>/dev/null || :
       done
-      IFS="$save_mkdir_p_IFS"
+      IFS=$func_mkdir_p_IFS
 
       # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
     fi
 }
 
 
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
 # Make a temporary directory that won't clash with other running
 # libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
 func_mktempdir ()
 {
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
 
-    if test "$opt_dry_run" = ":"; then
+    if test : = "$opt_dry_run"; then
       # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
+      _G_tmpdir=$_G_template-$$
     else
 
       # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 
-      if test ! -d "$my_tmpdir"; then
+      if test ! -d "$_G_tmpdir"; then
         # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
 
-        save_mktempdir_umask=`umask`
+        func_mktempdir_umask=`umask`
         umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
     fi
 
-    $ECHO "$my_tmpdir"
+    $ECHO "$_G_tmpdir"
 }
 
 
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
 {
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
+    $debug_cmd
 
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
         ;;
       *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
     esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
 }
 
 
-# func_quote_for_expand arg
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+	  ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
 # Aesthetically quote ARG to be evaled later; same as above,
 # but do not quote variable references.
 func_quote_for_expand ()
 {
+    $debug_cmd
+
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+	_G_arg=`$ECHO "$1" | $SED \
+	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-        my_arg="$1" ;;
+        _G_arg=$1 ;;
     esac
 
-    case $my_arg in
+    case $_G_arg in
       # Double-quote args containing shell metacharacters to delay
       # word splitting and command substitution for a subsequent eval.
       # Many Bourne shells cannot handle close brackets correctly
       # in scan sets, so we specify it separately.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
+        _G_arg=\"$_G_arg\"
         ;;
     esac
 
-    func_quote_for_expand_result="$my_arg"
+    func_quote_for_expand_result=$_G_arg
 }
 
 
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# 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).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.
 func_show_eval ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
+    }
 }
 
 
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
 # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.  Use the saved locale for evaluation.
 func_show_eval_locale ()
 {
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
 
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
       eval "func_echo $func_quote_for_expand_result"
     }
 
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+    $opt_dry_run || {
+      eval "$_G_user_locale
+	    $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
       fi
-    fi
+    }
 }
 
+
 # func_tr_sh
+# ----------
 # Turn $1 into a string suitable for a shell variable name.
 # Result is stored in $func_tr_sh_result.  All characters
 # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
 # if $1 begins with a digit, a '_' is prepended as well.
 func_tr_sh ()
 {
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
 }
 
 
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
 {
-    $opt_debug
+    $debug_cmd
 
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
+    $opt_verbose && func_echo "$*"
+
+    :
 }
 
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
 {
-    $opt_debug
+    $debug_cmd
 
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
 }
 
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      eval $_G_hook '"$@"'
+
+      # store returned options list back into positional
+      # parameters for next 'cmd' execution.
+      eval _G_hook_result=\$${_G_hook}_result
+      eval set dummy "$_G_hook_result"; shift
+    done
+
+    func_quote_for_eval ${1+"$@"}
+    func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_options_prep_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=: ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         ;;
+#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#          esac
+#        done
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_silent_option_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        func_quote_for_eval ${1+"$@"}
+#        my_option_validation_result=$func_quote_for_eval_result
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    func_options_prep ${1+"$@"}
+    eval func_parse_options \
+        ${func_options_prep_result+"$func_options_prep_result"}
+    eval func_validate_options \
+        ${func_parse_options_result+"$func_parse_options_result"}
+
+    eval func_run_hooks func_options \
+        ${func_validate_options_result+"$func_validate_options_result"}
+
+    # save modified positional parameters for caller
+    func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    func_run_hooks func_options_prep ${1+"$@"}
+
+    # save modified positional parameters for caller
+    func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      func_run_hooks func_parse_options ${1+"$@"}
+
+      # Adjust func_parse_options positional parameters to match
+      eval set dummy "$func_run_hooks_result"; shift
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+		      ;;
+
+        --warnings|--warning|-W)
+                      test $# = 0 && func_missing_arg $_G_opt && break
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*)        func_split_equals "$_G_opt"
+	              set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+      esac
+    done
+
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    func_run_hooks func_validate_options ${1+"$@"}
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    # save modified positional parameters for caller
+    func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
 func_help ()
 {
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
 }
 
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
-    $opt_debug
+    $debug_cmd
 
-    func_error "missing argument for $1."
+    func_error "Missing argument for '$1'."
     exit_cmd=exit
 }
 
 
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
 # Set func_split_short_opt_name and func_split_short_opt_arg shell
 # variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
 {
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+    $debug_cmd
 
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
 
 
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
 {
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
+    $debug_cmd
 
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+	h
+	/^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
 
-exit_cmd=:
 
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
 
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
 
+    exit $?
+}
 
 
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
 
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
 {
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+    $debug_cmd
 
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
 
 
-# func_arith arithmetic-term...
-func_arith ()
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
 {
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+    $debug_cmd
 
+    $warning_func ${1+"$@"}
+}
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
 
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
 
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
 {
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname (GNU libtool) 2.4.6
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
 
 
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
 
 
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
@@ -915,17 +2149,19 @@ func_config ()
     exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
     echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       echo "enable shared libraries"
     else
       echo "disable shared libraries"
     fi
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       echo "enable static libraries"
     else
       echo "disable static libraries"
@@ -934,289 +2170,297 @@ func_features ()
     exit $?
 }
 
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
 # Verify that TAGNAME is valid, and either flag an error and exit, or
 # enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 # variable here.
 func_enable_tag ()
 {
-  # Global variable:
-  tagname="$1"
+    # Global variable:
+    tagname=$1
 
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
 
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
 
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
     *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	  taglist="$taglist $tagname"
+
+	  # Evaluate the configuration.  Be careful to quote the path
+	  # and the sed script, to avoid splitting on whitespace, but
+	  # also don't use non-portable quotes within backquotes within
+	  # quotes we have to do it in 2 steps:
+	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	  eval "$extractedcf"
+        else
+	  func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
 }
 
+
 # func_check_version_match
+# ------------------------
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
 func_check_version_match ()
 {
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from an older release.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      else
-        cat >&2 <<_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
 $progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 $progname: but the definition of this LT_INIT comes from revision $macro_revision.
 $progname: You should recreate aclocal.m4 with macros from revision $package_revision
 $progname: of $PACKAGE $VERSION and run autoconf again.
 _LT_EOF
-    fi
+      fi
 
-    exit $EXIT_MISMATCH
-  fi
+      exit $EXIT_MISMATCH
+    fi
 }
 
 
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
 
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
 
+    nonopt=
+    preserve_args=
 
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    esac
+
+    # Pass back the list of options.
+    func_quote_for_eval ${1+"$@"}
+    libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
 
 
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
 {
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
+    $debug_cmd
 
-  # Validate options:
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+	# An option not handled by this hook function:
+        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+      esac
+    done
 
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
 
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
+    # save modified positional parameters for caller
+    func_quote_for_eval ${1+"$@"}
+    libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
 
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
 
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
 
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
     fi
 
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
 
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
 
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
 
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
 
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
 }
+func_add_hook func_validate_options libtool_validate_options
+
 
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
 
 
 
@@ -1224,24 +2468,52 @@ func_enable_tag "$optarg"
 ##    Main.    ##
 ## ----------- ##
 
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
 # func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function implements the same check as func_lalib_p without
 # resorting to external programs.  To this end, it redirects stdin and
 # closes it afterwards, without saving the original file descriptor.
 # As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
+# fatal anyway.  Works if 'file' does not exist.
 func_lalib_unsafe_p ()
 {
     lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
-	    case "$lalib_p_line" in
+	    case $lalib_p_line in
 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 	    esac
 	done
 	exec 0<&5 5<&-
     fi
-    test "$lalib_p" = yes
+    test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
 # determined imposters.
 func_ltwrapper_script_p ()
 {
-    func_lalib_p "$1"
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname ()
 {
     func_dirname_and_basename "$1" "" "."
     func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 }
 
 # func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
-    $opt_debug
+    $debug_cmd
+
     save_ifs=$IFS; IFS='~'
     for cmd in $1; do
-      IFS=$save_ifs
+      IFS=$sp$nl
       eval cmd=\"$cmd\"
+      IFS=$save_ifs
       func_show_eval "$cmd" "${2-:}"
     done
     IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
 # Note that it is not necessary on cygwin/mingw to append a dot to
 # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
 func_source ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $1 in
     */* | *\\*)	. "$1" ;;
     *)		. "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
 # store the result into func_replace_sysroot_result.
 func_replace_sysroot ()
 {
-  case "$lt_sysroot:$1" in
+  case $lt_sysroot:$1 in
   ?*:"$lt_sysroot"*)
     func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
+    func_replace_sysroot_result='='$func_stripname_result
     ;;
   *)
     # Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    $opt_debug
+    $debug_cmd
+
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
 	for z in $available_tags; do
 	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
 	# line option must be used.
 	if test -z "$tagname"; then
 	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
+	  func_fatal_error "specify a tag with '--tag'"
 #	else
 #	  func_verbose "using $tagname tagged configuration"
 	fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
 # but don't create it if we're doing a dry run.
 func_write_libtool_object ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
     else
       write_lobj=none
     fi
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
     else
       write_oldobj=none
     fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
     $opt_dry_run || {
       cat >${write_libobj}T <<EOF
 # $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
 non_pic_object=$write_oldobj
 
 EOF
-      $MV "${write_libobj}T" "${write_libobj}"
+      $MV "${write_libobj}T" "$write_libobj"
     }
 }
 
@@ -1482,8 +2759,9 @@ EOF
 # be empty on error (or when ARG is empty)
 func_convert_core_file_wine_to_w32 ()
 {
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
   if test -n "$1"; then
     # Unfortunately, winepath does not exit with a non-zero error code, so we
     # are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
     # *an error message* to stdout. So we must check for both error code of
     # zero AND non-empty stdout, which explains the odd construction:
     func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
       func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
+        $SED -e "$sed_naive_backslashify"`
     else
       func_convert_core_file_wine_to_w32_result=
     fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
 # are convertible, then the result may be empty.
 func_convert_core_path_wine_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
+  func_convert_core_path_wine_to_w32_result=
   if test -n "$1"; then
     oldIFS=$IFS
     IFS=:
     for func_convert_core_path_wine_to_w32_f in $1; do
       IFS=$oldIFS
       func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
         if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
         else
           func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
         fi
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
 # environment variable; do not put it in $PATH.
 func_cygpath ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
     func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
     if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
     fi
   else
     func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
   fi
 }
 #end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
 # result in func_convert_core_msys_to_w32_result.
 func_convert_core_msys_to_w32 ()
 {
-  $opt_debug
+  $debug_cmd
+
   # awkward: cmd appends spaces to result
   func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
 }
 #end: func_convert_core_msys_to_w32
 
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
 # func_to_host_file_result to ARG1).
 func_convert_file_check ()
 {
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
     func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
+    func_error "  '$1'"
     func_error "Continuing, but uninstalled executables may not work."
     # Fallback:
-    func_to_host_file_result="$1"
+    func_to_host_file_result=$1
   fi
 }
 # end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
 # func_to_host_file_result to a simplistic fallback value (see below).
 func_convert_path_check ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -z "$4" && test -n "$3"; then
     func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
+    func_error "  '$3'"
     func_error "Continuing, but uninstalled executables may not work."
     # Fallback.  This is a deliberately simplistic "conversion" and
     # should not be "improved".  See libtool.info.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
       func_to_host_path_result=`echo "$3" |
         $SED -e "$lt_replace_pathsep_chars"`
     else
-      func_to_host_path_result="$3"
+      func_to_host_path_result=$3
     fi
   fi
 }
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
 # and appending REPL if ORIG matches BACKPAT.
 func_convert_path_front_back_pathsep ()
 {
-  $opt_debug
+  $debug_cmd
+
   case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
     ;;
   esac
   case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
 ##################################################
 # $build to $host FILE NAME CONVERSION FUNCTIONS #
 ##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
 # in func_to_host_file_result.
 func_to_host_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   $to_host_file_cmd "$1"
 }
 # end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
 # in (the comma separated) LAZY, no conversion takes place.
 func_to_tool_file ()
 {
-  $opt_debug
+  $debug_cmd
+
   case ,$2, in
     *,"$to_tool_file_cmd",*)
       func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
 # Copy ARG to func_to_host_file_result.
 func_convert_file_noop ()
 {
-  func_to_host_file_result="$1"
+  func_to_host_file_result=$1
 }
 # end func_convert_file_noop
 
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
 # func_to_host_file_result.
 func_convert_file_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
 # func_to_host_file_result.
 func_convert_file_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
     # LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
 # and a working winepath. Returns result in func_to_host_file_result.
 func_convert_file_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
 # Returns result in func_to_host_file_result.
 func_convert_file_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     func_convert_core_msys_to_w32 "$1"
     func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
+    func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
 # in func_to_host_file_result.
 func_convert_file_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_file_result="$1"
+  $debug_cmd
+
+  func_to_host_file_result=$1
   if test -n "$1"; then
     # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
     func_convert_core_file_wine_to_w32 "$1"
     func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
+    func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
 #############################################
 # $build to $host PATH CONVERSION FUNCTIONS #
 #############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
 to_host_path_cmd=
 func_init_to_host_path_cmd ()
 {
-  $opt_debug
+  $debug_cmd
+
   if test -z "$to_host_path_cmd"; then
     func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
   fi
 }
 
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
 # in func_to_host_path_result.
 func_to_host_path ()
 {
-  $opt_debug
+  $debug_cmd
+
   func_init_to_host_path_cmd
   $to_host_path_cmd "$1"
 }
@@ -1829,7 +3122,7 @@ func_to_host_path ()
 # Copy ARG to func_to_host_path_result.
 func_convert_path_noop ()
 {
-  func_to_host_path_result="$1"
+  func_to_host_path_result=$1
 }
 # end func_convert_path_noop
 
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
 # func_to_host_path_result.
 func_convert_path_msys_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from ARG.  MSYS
     # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 ()
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
 # func_to_host_file_result.
 func_convert_path_cygwin_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
 # a working winepath.  Returns result in func_to_host_file_result.
 func_convert_path_nix_to_w32 ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
 # Returns result in func_to_host_file_result.
 func_convert_path_msys_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
 # func_to_host_file_result.
 func_convert_path_nix_to_cygwin ()
 {
-  $opt_debug
-  func_to_host_path_result="$1"
+  $debug_cmd
+
+  func_to_host_path_result=$1
   if test -n "$1"; then
     # Remove leading and trailing path separator characters from
     # ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
     func_to_host_path_tmp1=$func_stripname_result
     func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
     func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
+    func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
 # end func_convert_path_nix_to_cygwin
 
 
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[	 ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
-    $opt_debug
+    $debug_cmd
+
     # Get the compilation command and the source file.
     base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
     suppress_opt=yes
     suppress_output=
     arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
       case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
+	lastarg=$arg
 	arg_mode=normal
 	;;
 
       target )
-	libobj="$arg"
+	libobj=$arg
 	arg_mode=normal
 	continue
 	;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
 	case $arg in
 	-o)
 	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
+	    func_fatal_error "you cannot specify '-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
 	  func_stripname '-Wc,' '' "$arg"
 	  args=$func_stripname_result
 	  lastarg=
-	  save_ifs="$IFS"; IFS=','
+	  save_ifs=$IFS; IFS=,
 	  for arg in $args; do
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 	    func_append_quoted lastarg "$arg"
 	  done
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
@@ -2027,8 +3343,8 @@ func_mode_compile ()
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
+	  lastarg=$srcfile
+	  srcfile=$arg
 	  ;;
 	esac  #  case $arg
 	;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
       func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      func_fatal_error "you must specify a target with \`-o'"
+      func_fatal_error "you must specify a target with '-o'"
       ;;
     *)
       # Get the name of the library object.
       test -z "$libobj" && {
 	func_basename "$srcfile"
-	libobj="$func_basename_result"
+	libobj=$func_basename_result
       }
       ;;
     esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
     case $libobj in
     *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      func_fatal_error "cannot determine name of library object from '$libobj'"
       ;;
     esac
 
@@ -2078,8 +3394,8 @@ func_mode_compile ()
     for arg in $later; do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes = "$build_libtool_libs" \
+	  || func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	continue
 	;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
     func_quote_for_eval "$libobj"
     test "X$libobj" != "X$func_quote_for_eval_result" \
       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
 
     test -z "$base_compile" && \
       func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
+    if test yes = "$build_old_libs"; then
       removelist="$obj $lobj $libobj ${libobj}T"
     else
       removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
       pic_mode=default
       ;;
     esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
 
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
     else
       output_obj=
       need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
 
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
+    if test yes = "$need_locks"; then
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
-    elif test "$need_locks" = warn; then
+    elif test warn = "$need_locks"; then
       if test -f "$lockfile"; then
 	$ECHO "\
 *** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2180,11 +3496,11 @@ compiler."
     qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
+    if test yes = "$build_libtool_libs"; then
       # Without this assignment, base_compile gets emptied.
       fbsd_hideous_sh_bug=$base_compile
 
-      if test "$pic_mode" != no; then
+      if test no != "$pic_mode"; then
 	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
       func_show_eval_locale "$command"	\
           'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2228,20 +3544,20 @@ compiler."
       fi
 
       # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
+      if test yes = "$suppress_opt"; then
 	suppress_output=' >/dev/null 2>&1'
       fi
     fi
 
     # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
 	# Don't build PIC code
 	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
-      if test "$compiler_c_o" = yes; then
+      if test yes = "$compiler_c_o"; then
 	func_append command " -o $obj"
       fi
 
@@ -2250,7 +3566,7 @@ compiler."
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
-      if test "$need_locks" = warn &&
+      if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
+your compiler does not support '-c' and '-o' together.  If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2281,7 +3597,7 @@ compiler."
       func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
       # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
+      if test no != "$need_locks"; then
 	removelist=$lockfile
         $RM "$lockfile"
       fi
@@ -2291,7 +3607,7 @@ compiler."
 }
 
 $opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
 Remove files from the build directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
   -no-suppress      do not suppress compiler output for multiple passes
   -prefer-pic       try to build PIC objects only
   -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
   -Wc,FLAG          pass FLAG directly to the compiler
 
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
         ;;
 
       execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
 
   -dlopen FILE      add the directory containing FILE to the library path
 
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
 flags.
 
 If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
         ;;
 
       install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
 Install executables or libraries.
 
 INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
   -avoid-version    do not add a version suffix if possible
   -bindir BINDIR    specify path to binaries directory (for systems where
                     libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
   -no-install       link a not-installable executable
   -no-undefined     declare that a library does not refer to external symbols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
   -precious-files-regex REGEX
                     don't remove output files matching REGEX
   -release RELEASE  specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
   -Xlinker FLAG     pass linker-specific FLAG directly to the linker
   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
 
-Every other argument is treated as a filename.  Files ending in \`.la' are
+Every other argument is treated as a filename.  Files ending in '.la' are
 treated as uninstalled libtool libraries, other files are standard or library
 object files.
 
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
 required, except when creating a convenience library.
 
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
 
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 is created, otherwise an executable program is created."
         ;;
 
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
 Remove libraries from an installation directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
+        func_fatal_help "invalid operation mode '$opt_mode'"
         ;;
     esac
 
     echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
+    $ECHO "Try '$progname --help' for more information about other modes."
 }
 
 # Now that we've collected a possible --mode arg, show help if necessary
 if $opt_help; then
-  if test "$opt_help" = :; then
+  if test : = "$opt_help"; then
     func_mode_help
   else
     {
@@ -2491,7 +3808,7 @@ if $opt_help; then
       for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
       for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
 	func_mode_help
       done
     } |
-    sed '1d
+    $SED '1d
       /^When reporting/,/^Report/{
 	H
 	d
@@ -2516,16 +3833,17 @@ fi
 # func_mode_execute arg...
 func_mode_execute ()
 {
-    $opt_debug
+    $debug_cmd
+
     # The first argument is the command name.
-    cmd="$nonopt"
+    cmd=$nonopt
     test -z "$cmd" && \
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
     for file in $opt_dlopen; do
       test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+	|| func_fatal_help "'$file' is not a file"
 
       dir=
       case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+	  || func_fatal_help "'$lib' is not a valid libtool archive"
 
 	# Read the libtool library.
 	dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
 	if test -z "$dlname"; then
 	  # Warn if it was a shared library.
 	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	    func_warning "'$file' was not linked with '-export-dynamic'"
 	  continue
 	fi
 
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 
 	if test -f "$dir/$objdir/$dlname"; then
 	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 	  fi
 	fi
 	;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
       *.lo)
 	# Just add the directory containing the .lo file.
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	;;
 
       *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 	continue
 	;;
       esac
 
       # Get the absolute pathname.
       absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
+      test -n "$absdir" && dir=$absdir
 
       # Now add the directory to shlibpath_var.
       if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
 
     # This variable tells wrapper scripts just to set shlibpath_var
     # rather than running their programs.
-    libtool_execute_magic="$magic"
+    libtool_execute_magic=$magic
 
     # Check if any of the arguments is a wrapper script.
     args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
 	if func_ltwrapper_script_p "$file"; then
 	  func_source "$file"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	elif func_ltwrapper_executable_p "$file"; then
 	  func_ltwrapper_scriptname "$file"
 	  func_source "$func_ltwrapper_scriptname_result"
 	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
+	  file=$progdir/$program
 	fi
 	;;
       esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
       func_append_quoted args "$file"
     done
 
-    if test "X$opt_dry_run" = Xfalse; then
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
       if test -n "$shlibpath_var"; then
 	# Export the shlibpath_var.
 	eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
       done
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
+      exec_cmd=\$cmd$args
     fi
 }
 
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
-    $opt_debug
+    $debug_cmd
+
     libs=
     libdirs=
     admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
 	if func_lalib_unsafe_p "$opt"; then
 	  func_append libs " $opt"
 	else
-	  func_warning "\`$opt' is not a valid libtool archive"
+	  func_warning "'$opt' is not a valid libtool archive"
 	fi
 
       else
-	func_fatal_error "invalid argument \`$opt'"
+	func_fatal_error "invalid argument '$opt'"
       fi
     done
 
@@ -2682,12 +4001,12 @@ func_mode_finish ()
       # Remove sysroot references
       if $opt_dry_run; then
         for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
         done
       else
         tmpdir=`func_mktempdir`
         for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 	    > $tmpdir/tmp-la
 	  mv -f $tmpdir/tmp-la $lib
 	done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
     fi
 
     # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
+    $opt_quiet && exit $EXIT_SUCCESS
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
       echo
       echo "If you ever happen to want to link against installed libraries"
       echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
       echo "flag during linking and do at least one of the following:"
       if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
 	echo "     during execution"
       fi
       if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "   - add LIBDIR to the '$runpath_var' environment variable"
 	echo "     during linking"
       fi
       if test -n "$hardcode_libdir_flag_spec"; then
 	libdir=LIBDIR
 	eval flag=\"$hardcode_libdir_flag_spec\"
 
-	$ECHO "   - use the \`$flag' linker flag"
+	$ECHO "   - use the '$flag' linker flag"
       fi
       if test -n "$admincmds"; then
 	$ECHO "   - have your system administrator run these commands:$admincmds"
       fi
       if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
       fi
       echo
 
@@ -2762,18 +4081,20 @@ func_mode_finish ()
     exit $EXIT_SUCCESS
 }
 
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
-    $opt_debug
+    $debug_cmd
+
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
        # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
     opts=
     prev=
     install_type=
-    isdir=no
+    isdir=false
     stripme=
     no_mode=:
     for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
       fi
 
       case $arg in
-      -d) isdir=yes ;;
+      -d) isdir=: ;;
       -f)
 	if $install_cp; then :; else
 	  prev=$arg
@@ -2831,7 +4152,7 @@ func_mode_install ()
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
 	    arg2=$install_override_mode
 	    no_mode=false
 	  fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
       func_fatal_help "you must specify an install program"
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
+      func_fatal_help "the '$prev' option requires an argument"
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
     dest=$func_stripname_result
 
     # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
       destname=
     else
       func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
+      destdir=$func_dirname_result
+      destname=$func_basename_result
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files; shift
       test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
+	func_fatal_help "'$dest' is not a directory"
     fi
     case $destdir in
     [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
 	case $file in
 	*.lo) ;;
 	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  func_fatal_help "'$destdir' must be an absolute directory name"
 	  ;;
 	esac
       done
@@ -2908,7 +4229,7 @@ func_mode_install ()
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     staticlibs=
     future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+	  || func_fatal_help "'$file' is not a valid libtool archive"
 
 	library_names=
 	old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
 	fi
 
 	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
 	  # are installed into $libdir/../bin (currently, that works fine)
 	  # but it's something to keep an eye on.
 	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
 	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
-	  func_warning "relinking \`$file'"
+	  func_warning "relinking '$file'"
 	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 	fi
 
 	# See the names of the shared library.
 	set dummy $library_names; shift
 	if test -n "$1"; then
-	  realname="$1"
+	  realname=$1
 	  shift
 
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	  srcname=$realname
+	  test -n "$relink_command" && srcname=${realname}T
 
 	  # Install the shared library and build the symlinks.
 	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
-	  tstripme="$stripme"
+	  tstripme=$stripme
 	  case $host_os in
 	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
-	      tstripme=""
+	      tstripme=
+	      ;;
+	    esac
+	    ;;
+	  os2*)
+	    case $realname in
+	    *_dll.a)
+	      tstripme=
 	      ;;
 	    esac
 	    ;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # Try 'ln -sf' first, because the 'ln' binary might depend on
 	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 	    # so we also need to try rm && ln -s.
 	    for linkname
@@ -3017,14 +4345,14 @@ func_mode_install ()
 	  fi
 
 	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
+	  lib=$destdir/$realname
 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 	fi
 
 	# Install the pseudo-library for information purposes.
 	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
+	name=$func_basename_result
+	instname=$dir/${name}i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
 
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
 	  staticdest=$func_lo2o_result
 	  ;;
 	*.$objext)
-	  staticdest="$destfile"
+	  staticdest=$destfile
 	  destfile=
 	  ;;
 	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  func_fatal_help "cannot copy a libtool object to '$destfile'"
 	  ;;
 	esac
 
@@ -3063,7 +4391,7 @@ func_mode_install ()
 	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 
 	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
+	if test yes = "$build_old_libs"; then
 	  # Deduce the name of the old-style object file.
 	  func_lo2o "$file"
 	  staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
       *)
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
+	  destfile=$destdir/$destname
 	else
 	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
+	  destfile=$func_basename_result
+	  destfile=$destdir/$destfile
 	fi
 
 	# If the file is missing, and there is a .exe on the end, strip it
 	# because it is most likely a libtool script we actually want to
 	# install
-	stripped_ext=""
+	stripped_ext=
 	case $file in
 	  *.exe)
 	    if test ! -f "$file"; then
 	      func_stripname '' '.exe' "$file"
 	      file=$func_stripname_result
-	      stripped_ext=".exe"
+	      stripped_ext=.exe
 	    fi
 	    ;;
 	esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
 
 	  # Check the variables that should have been set.
 	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
 
-	  finalize=yes
+	  finalize=:
 	  for lib in $notinst_deplibs; do
 	    # Check to see that each library is installed.
 	    libdir=
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
+	      func_warning "'$lib' has not been installed in '$libdir'"
+	      finalize=false
 	    fi
 	  done
 
@@ -3139,29 +4467,29 @@ func_mode_install ()
 	  func_source "$wrapper"
 
 	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
+	  if test no = "$fast_install" && test -n "$relink_command"; then
 	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
+	      if $finalize; then
 	        tmpdir=`func_mktempdir`
 		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
+		file=$func_basename_result
+	        outputname=$tmpdir/$file
 	        # Replace the output file specification.
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
-	        $opt_silent || {
+	        $opt_quiet || {
 	          func_quote_for_expand "$relink_command"
 		  eval "func_echo $func_quote_for_expand_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
+		  func_error "error: relink '$file' with the above command before installing it"
 		  $opt_dry_run || ${RM}r "$tmpdir"
 		  continue
 	        fi
-	        file="$outputname"
+	        file=$outputname
 	      else
-	        func_warning "cannot relink \`$file'"
+	        func_warning "cannot relink '$file'"
 	      fi
 	    }
 	  else
@@ -3198,10 +4526,10 @@ func_mode_install ()
 
     for file in $staticlibs; do
       func_basename "$file"
-      name="$func_basename_result"
+      name=$func_basename_result
 
       # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
+      oldlib=$destdir/$name
       func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
       tool_oldlib=$func_to_tool_file_result
 
@@ -3216,18 +4544,18 @@ func_mode_install ()
     done
 
     test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+      func_warning "remember to run '$progname --finish$future_libdirs'"
 
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
     else
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
     my_dlsyms=
 
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
       if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
+	my_dlsyms=${my_outputname}S.c
       else
 	func_error "not configured to extract global symbols from dlpreopened files"
       fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
       "") ;;
       *.c)
 	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
+	nlist=$output_objdir/$my_outputname.nm
 
 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
 	func_verbose "creating $output_objdir/$my_dlsyms"
 
 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
 #endif
 
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 #endif
 
 /* 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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
 # define LT_DLSYM_CONST const
 #endif
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* External symbol declarations for the compiler. */\
 "
 
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
+	if test yes = "$dlself"; then
+	  func_verbose "generating symbol list for '$output'"
 
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
@@ -3298,7 +4629,7 @@ extern \"C\" {
 	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
 	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
 	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
@@ -3318,10 +4649,10 @@ extern \"C\" {
 
 	  # Prepare the list of exported symbols
 	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
+	    export_symbols=$output_objdir/$outputname.exp
 	    $opt_dry_run || {
 	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
 	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
 	fi
 
 	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_verbose "extracting global C symbols from '$dlprefile'"
 	  func_basename "$dlprefile"
-	  name="$func_basename_result"
+	  name=$func_basename_result
           case $host in
 	    *cygwin* | *mingw* | *cegcc* )
 	      # if an import library, we need to obtain dlname
 	      if func_win32_import_lib_p "$dlprefile"; then
 	        func_tr_sh "$dlprefile"
 	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
+	        dlprefile_dlbasename=
 	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
 	          # Use subshell, to avoid clobbering current variable values
 	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
+	          if test -n "$dlprefile_dlname"; then
 	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
+	            dlprefile_dlbasename=$func_basename_result
 	          else
 	            # no lafile. user explicitly requested -dlpreopen <import library>.
 	            $sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
 	          fi
 	        fi
 	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
+	          if test -n "$dlprefile_dlbasename"; then
 	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
 	          else
 	            func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
 	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
+	  func_show_eval '$RM "${nlist}I"'
+	  if test -n "$global_symbol_to_import"; then
+	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	  fi
+
 	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
@@ -3432,11 +4768,30 @@ typedef struct {
   void *address;
 } lt_dlsymlist;
 extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	    echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+	  fi
+	  echo >> "$output_objdir/$my_dlsyms" "\
 LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+	  if test -s "$nlist"I; then
+	    echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+	  fi
 
 	  case $need_lib_prefix in
 	  no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
 	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
+	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 	    ;;
 	  esac
 	  ;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
 	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
 	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	symfileobj=$output_objdir/${my_outputname}S.$objext
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
 	esac
 	;;
       *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
 	;;
       esac
     else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
     fi
 }
 
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
 # func_win32_libid arg
 # return the library type of file 'arg'
 #
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
 # Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
-  $opt_debug
-  win32_libid_type="unknown"
+  $debug_cmd
+
+  win32_libid_type=unknown
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
   *ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
+      case $nm_interface in
+      "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	   func_cygming_gnu_implib_p "$1"
+	then
+	  win32_nmres=import
+	else
+	  win32_nmres=
+	fi
+	;;
+      *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	  $SED -n -e '
 	    1,100{
 		/ I /{
-		    s,.*,import,
+		    s|.*|import|
 		    p
 		    q
 		}
 	    }'`
+	;;
+      esac
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib ()
 {
-  $opt_debug
+  $debug_cmd
+
   sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 }
 
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
 # specified import library.
 func_cygming_dll_for_implib_fallback_core ()
 {
-  $opt_debug
+  $debug_cmd
+
   match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
   $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
     $SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
       /./p' |
     # we now have a list, one entry per line, of the stringified
     # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
     # a '.' (that is, objdump's representation of an unprintable
     # character.) This should work for all archives with less than
     # 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
     $SED -e '/^\./d;/^.\./d;q'
 }
 
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
 # func_cygming_dll_for_implib_fallback ARG
 # Platform-specific function to extract the
 # name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
 #    $sharedlib_from_linklib_result
 func_cygming_dll_for_implib_fallback ()
 {
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
     # binutils import library
     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
+  elif func_cygming_ms_implib_p "$1"; then
     # ms-generated import library
     sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
   else
     # unknown
-    sharedlib_from_linklib_result=""
+    sharedlib_from_linklib_result=
   fi
 }
 
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
       lockfile=$f_ex_an_ar_oldlib.lock
       until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
     fi
     func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
 		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
+    if test yes = "$lock_old_archive_extraction"; then
       $opt_dry_run || rm -f "$lockfile"
     fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
-    $opt_debug
-    my_gentop="$1"; shift
+    $debug_cmd
+
+    my_gentop=$1; shift
     my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
 
     for my_xlib in $my_oldlibs; do
       # Extract the objects.
       case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
+      my_xlib=$func_basename_result
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
 	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
 
       func_mkdir_p "$my_xdir"
 
@@ -3778,22 +5152,23 @@ func_extract_archives ()
 	  cd $my_xdir || exit $?
 	  darwin_archive=$my_xabs
 	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
+	  func_basename "$darwin_archive"
+	  darwin_base_archive=$func_basename_result
 	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 	  if test -n "$darwin_arches"; then
 	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 	    darwin_arch=
 	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	    for darwin_arch in  $darwin_arches; do
+	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
 	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
       my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
-    func_extract_archives_result="$my_oldobjs"
+    func_extract_archives_result=$my_oldobjs
 }
 
 
@@ -3830,7 +5205,7 @@ func_extract_archives ()
 #
 # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
 # variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
 # the $objdir directory.  This is a cygwin/mingw-specific
 # behavior.
 func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
 
 # Very basic option parsing. These options are (a) specific to
 # the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
 # windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
 # this pattern).
 #
 # There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
 
   # Print the debug banner immediately:
   if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
   fi
 }
 
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
   lt_dump_args_N=1;
   for lt_arg
   do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
     lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
   done
 }
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
   *-*-mingw | *-*-os2* | *-cegcc*)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
   *)
     $ECHO "\
       if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
         func_lt_dump_args \${1+\"\$@\"} 1>&2
       fi
       exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-	if test "$fast_install" = yes; then
+	if test yes = "$fast_install"; then
 	  $ECHO "\
   program=lt-'$outputname'$exeext
   progdir=\"\$thisdir/$objdir\"
 
   if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
     file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
     if test -n \"\$relink_command\"; then
       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
       else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
       fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
 	fi
 
 	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
     fi
   else
     # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
     \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
 	cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
 # ifdef __STRICT_ANSI__
 int _putenv (const char *);
 # endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # ifdef __STRICT_ANSI__
 char *realpath (const char *, char *);
 int putenv (char *);
 int setenv (const char *, const char *, int);
 # endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
 #endif
 
 /* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
 # define setmode _setmode
 # define stat    _stat
 # define chmod   _chmod
 # define getcwd  _getcwd
 # define putenv  _putenv
 # define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
 # define setmode _setmode
 # define stat    _stat
 # define chmod   _chmod
 # define getcwd  _getcwd
 # define putenv  _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # define HAVE_SETENV
 # define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
 #endif
 
-#if defined(PATH_MAX)
+#if defined PATH_MAX
 # define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
 # define LT_PATHMAX MAXPATHLEN
 #else
 # define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
 # define PATH_SEPARATOR ':'
 #endif
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
 # define HAVE_DOS_BASED_FILE_SYSTEM
 # define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
 
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
+  if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
 static int lt_debug = 1;
 #else
 static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
 EOF
 
 	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
               func_to_host_path "$temp_rpath"
 	      cat <<EOF
 const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE   = "";
 EOF
 	    fi
 
-	    if test "$fast_install" = yes; then
+	    if test yes = "$fast_install"; then
 	      cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
   char *actual_cwrapper_name;
   char *target_name;
   char *lt_argv_zero;
-  intptr_t rval = 127;
+  int rval = 127;
 
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
+  newargz = XMALLOC (char *, (size_t) argc + 1);
 
   /* very simple arg parsing; don't want to rely on getopt
    * also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
   newargc=0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
+      if (STREQ (argv[i], dumpscript_opt))
 	{
 EOF
-	    case "$host" in
+	    case $host in
 	      *mingw* | *cygwin* )
 		# make stdout use "unix" line endings
 		echo "          setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
 	  lt_dump_script (stdout);
 	  return 0;
 	}
-      if (strcmp (argv[i], debug_opt) == 0)
+      if (STREQ (argv[i], debug_opt))
 	{
           lt_debug = 1;
           continue;
 	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+      if (STREQ (argv[i], ltwrapper_option_prefix))
         {
           /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
              namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
 EOF
 	    cat <<EOF
   /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
 EOF
 	    cat <<"EOF"
   lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
   newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
 {
   const char *base;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   /* Skip over the disk name in MSDOS pathnames. */
   if (isalpha ((unsigned char) name[0]) && name[1] == ':')
     name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
   const char *p_next;
   /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
-  int tmp_len;
+  size_t tmp_len;
   char *concat_name;
 
   lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
     return NULL;
 
   /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
   if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
     {
       concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
 	    return concat_name;
 	  XFREE (concat_name);
 	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
     }
 #endif
 
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
 	      for (q = p; *q; q++)
 		if (IS_PATH_SEPARATOR (*q))
 		  break;
-	      p_len = q - p;
+	      p_len = (size_t) (q - p);
 	      p_next = (*q == '\0' ? q : q + 1);
 	      if (p_len == 0)
 		{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
   if (patlen <= len)
     {
       str += len - patlen;
-      if (strcmp (str, pat) == 0)
+      if (STREQ (str, pat))
 	*str = '\0';
     }
   return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
     char *str = xstrdup (value);
     setenv (name, str, 1);
 #else
-    int len = strlen (name) + 1 + strlen (value) + 1;
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
     char *str = XMALLOC (char, len);
     sprintf (str, "%s=%s", name, value);
     if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
   char *new_value;
   if (orig_value && *orig_value)
     {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
       new_value = XMALLOC (char, add_len + orig_value_len + 1);
       if (to_end)
         {
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
     {
       char *new_value = lt_extend_str (getenv (name), value, 0);
       /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
         {
-          new_value[len-1] = '\0';
+          new_value[--len] = '\0';
         }
       lt_setenv (name, new_value);
       XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
 # True if ARG is an import lib, as indicated by $file_magic_cmd
 func_win32_import_lib_p ()
 {
-    $opt_debug
+    $debug_cmd
+
     case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
     *import*) : ;;
     *) false ;;
     esac
 }
 
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
-    $opt_debug
+    $debug_cmd
+
     case $host in
     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
+      # what system we are compiling for in order to pass an extra
       # flag for every libtool invocation.
       # allow_undefined=no
 
       # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
+      # to make a dll that has undefined symbols, in which case not
       # even a static library is built.  For now, we need to specify
       # -no-undefined on the libtool link line when we can be certain
       # that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
     module=no
     no_install=no
     objs=
+    os2dllname=
     non_pic_objects=
     precious_files_regex=
     prefer_static_libs=no
-    preload=no
+    preload=false
     prev=
     prevarg=
     release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
     vinfo=
     vinfo_number=no
     weak_libs=
-    single_module="${wl}-single_module"
+    single_module=$wl-single_module
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
     do
       case $arg in
       -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
+	test yes != "$build_libtool_libs" \
+	  && func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	break
 	;;
       -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
 
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
-      arg="$1"
+      arg=$1
       shift
       func_quote_for_eval "$arg"
       qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
 
 	case $prev in
 	bindir)
-	  bindir="$arg"
+	  bindir=$arg
 	  prev=
 	  continue
 	  ;;
 	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
+	  $preload || {
 	    # Add the symbol object into the linking commands.
 	    func_append compile_command " @SYMFILE@"
 	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
+	    preload=:
+	  }
 	  case $arg in
 	  *.la | *.lo) ;;  # We handle these cases below.
 	  force)
-	    if test "$dlself" = no; then
+	    if test no = "$dlself"; then
 	      dlself=needless
 	      export_dynamic=yes
 	    fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
 	    continue
 	    ;;
 	  self)
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 	      dlself=yes
 	    else
 	      dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
 	    continue
 	    ;;
 	  *)
-	    if test "$prev" = dlfiles; then
+	    if test dlfiles = "$prev"; then
 	      func_append dlfiles " $arg"
 	    else
 	      func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
 	  esac
 	  ;;
 	expsyms)
-	  export_symbols="$arg"
+	  export_symbols=$arg
 	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
+	    || func_fatal_error "symbol file '$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
 	expsyms_regex)
-	  export_symbols_regex="$arg"
+	  export_symbols_regex=$arg
 	  prev=
 	  continue
 	  ;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
 	  continue
 	  ;;
 	inst_prefix)
-	  inst_prefix_dir="$arg"
+	  inst_prefix_dir=$arg
+	  prev=
+	  continue
+	  ;;
+	mllvm)
+	  # Clang does not use LLVM to link, so we can simply discard any
+	  # '-mllvm $arg' options when doing the link step.
 	  prev=
 	  continue
 	  ;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
 
 		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
+		   test none = "$pic_object" &&
+		   test none = "$non_pic_object"; then
+		  func_fatal_error "cannot find name of object for '$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
 		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
+		xdir=$func_dirname_result
 
-		if test "$pic_object" != none; then
+		if test none != "$pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
+		  pic_object=$xdir$pic_object
 
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		  if test dlfiles = "$prev"; then
+		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
 		  fi
 
 		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
+		  if test dlprefiles = "$prev"; then
 		    # Preload the old-style object.
 		    func_append dlprefiles " $pic_object"
 		    prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
 
 		  # A PIC object.
 		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
+		  arg=$pic_object
 		fi
 
 		# Non-PIC object.
-		if test "$non_pic_object" != none; then
+		if test none != "$non_pic_object"; then
 		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
+		  non_pic_object=$xdir$non_pic_object
 
 		  # A standard non-PIC object
 		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
+		  if test -z "$pic_object" || test none = "$pic_object"; then
+		    arg=$non_pic_object
 		  fi
 		else
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
+		  non_pic_object=$pic_object
 		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
@@ -5378,7 +6783,7 @@ func_mode_link ()
 		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
 		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
+		  xdir=$func_dirname_result
 
 		  func_lo2o "$arg"
 		  pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
 		  func_append libobjs " $pic_object"
 		  func_append non_pic_objects " $non_pic_object"
 	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
+		  func_fatal_error "'$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
+	    func_fatal_error "link input file '$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	os2dllname)
+	  os2dllname=$arg
+	  prev=
+	  continue
+	  ;;
 	precious_regex)
-	  precious_files_regex="$arg"
+	  precious_files_regex=$arg
 	  prev=
 	  continue
 	  ;;
 	release)
-	  release="-$arg"
+	  release=-$arg
 	  prev=
 	  continue
 	  ;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
 	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
-	  if test "$prev" = rpath; then
+	  if test rpath = "$prev"; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
 	    *) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
 	  continue
 	  ;;
 	shrext)
-	  shrext_cmds="$arg"
+	  shrext_cmds=$arg
 	  prev=
 	  continue
 	  ;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
 	esac
       fi # test -n "$prev"
 
-      prevarg="$arg"
+      prevarg=$arg
 
       case $arg in
       -all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
+	if test X-export-symbols = "X$arg"; then
 	  prev=expsyms
 	else
 	  prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
 	func_stripname "-L" '' "$arg"
 	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
+	    func_fatal_error "require no space between '-L' and '$1'"
 	  else
-	    func_fatal_error "need path for \`-L' option"
+	    func_fatal_error "need path for '-L' option"
 	  fi
 	fi
 	func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
 	*)
 	  absdir=`cd "$dir" && pwd`
 	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
+	    func_fatal_error "cannot determine absolute directory name of '$dir'"
+	  dir=$absdir
 	  ;;
 	esac
 	case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
 	;;
 
       -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 	  case $host in
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
 	    ;;
 	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
 	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
+	    test X-lc = "X$arg" && continue
 	    ;;
 	  esac
-	elif test "X$arg" = "X-lc_r"; then
+	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
 	continue
 	;;
 
+      -mllvm)
+	prev=mllvm
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
 	;;
 
       -multi_module)
-	single_module="${wl}-multi_module"
+	single_module=$wl-multi_module
 	continue
 	;;
 
@@ -5682,8 +7097,8 @@ func_mode_link ()
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
+	  func_warning "'-no-install' is ignored for $host"
+	  func_warning "assuming '-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
 	continue
 	;;
 
+      -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
       -o) prev=output ;;
 
       -precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
 	func_stripname '-Wc,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
 	  func_append arg " $func_quote_for_eval_result"
 	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	  IFS="$save_ifs"
+	  IFS=$save_ifs
           func_quote_for_eval "$flag"
 	  func_append arg " $wl$func_quote_for_eval_result"
 	  func_append compiler_flags " $wl$func_quote_for_eval_result"
 	  func_append linker_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
       # -msg_* for osf cc
       -msg_*)
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,49 @@ func_mode_link ()
       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
       # -F/path              path to uninstalled frameworks, gcc on darwin
       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
+      # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
         continue
         ;;
 
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+	  compiler_flags="$compiler_flags $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  case $arg in
+	  -Zlinker | -Zstack)
+	    prev=xcompiler
+	    ;;
+	  esac
+	  continue
+        else
+	  # Otherwise treat like 'Some other compiler flag' below
+	  func_quote_for_eval "$arg"
+	  arg=$func_quote_for_eval_result
+        fi
+	;;
+
       # Some other compiler flag.
       -* | +*)
         func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
       *.$objext)
@@ -5886,21 +7330,21 @@ func_mode_link ()
 
 	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
+	     test none = "$pic_object" &&
+	     test none = "$non_pic_object"; then
+	    func_fatal_error "cannot find name of object for '$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
 	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
+	  xdir=$func_dirname_result
 
-	  if test "$pic_object" != none; then
+	  test none = "$pic_object" || {
 	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
+	    pic_object=$xdir$pic_object
 
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+	    if test dlfiles = "$prev"; then
+	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		func_append dlfiles " $pic_object"
 		prev=
 		continue
@@ -5911,7 +7355,7 @@ func_mode_link ()
 	    fi
 
 	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
+	    if test dlprefiles = "$prev"; then
 	      # Preload the old-style object.
 	      func_append dlprefiles " $pic_object"
 	      prev=
@@ -5919,23 +7363,23 @@ func_mode_link ()
 
 	    # A PIC object.
 	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
+	    arg=$pic_object
+	  }
 
 	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
+	  if test none != "$non_pic_object"; then
 	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
+	    non_pic_object=$xdir$non_pic_object
 
 	    # A standard non-PIC object
 	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
+	    if test -z "$pic_object" || test none = "$pic_object"; then
+	      arg=$non_pic_object
 	    fi
 	  else
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
+	    non_pic_object=$pic_object
 	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
@@ -5943,7 +7387,7 @@ func_mode_link ()
 	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
 	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
+	    xdir=$func_dirname_result
 
 	    func_lo2o "$arg"
 	    pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7395,7 @@ func_mode_link ()
 	    func_append libobjs " $pic_object"
 	    func_append non_pic_objects " $non_pic_object"
 	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
+	    func_fatal_error "'$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
@@ -5967,11 +7411,11 @@ func_mode_link ()
 	# A libtool-controlled library.
 
 	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
+	if test dlfiles = "$prev"; then
 	  # This library was specified with -dlopen.
 	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
-	elif test "$prev" = dlprefiles; then
+	elif test dlprefiles = "$prev"; then
 	  # The library was specified with -dlpreopen.
 	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
@@ -5986,7 +7430,7 @@ func_mode_link ()
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
       esac # arg
 
@@ -5998,9 +7442,9 @@ func_mode_link ()
     done # argument parsing loop
 
     test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
+      func_fatal_help "the '$prevarg' option requires an argument"
 
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
       func_append compile_command " $arg"
       func_append finalize_command " $arg"
@@ -6009,20 +7453,23 @@ func_mode_link ()
     oldlibs=
     # calculate the name of the file, without its directory
     func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
+    output_objdir=$func_dirname_result$objdir
     func_to_tool_file "$output_objdir/"
     tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
@@ -6045,7 +7492,7 @@ func_mode_link ()
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
+      if $opt_preserve_dup_deps; then
 	case "$libs " in
 	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
@@ -6053,7 +7500,7 @@ func_mode_link ()
       func_append libs " $deplib"
     done
 
-    if test "$linkmode" = lib; then
+    if test lib = "$linkmode"; then
       libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
       # Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7532,7 @@ func_mode_link ()
 	  case $file in
 	  *.la) ;;
 	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -6093,7 +7540,7 @@ func_mode_link ()
     prog)
 	compile_deplibs=
 	finalize_deplibs=
-	alldeplibs=no
+	alldeplibs=false
 	newdlfiles=
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
@@ -6105,32 +7552,32 @@ func_mode_link ()
     for pass in $passes; do
       # The preopen pass in lib mode reverses $deplibs; put it back here
       # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
+      if test lib,link = "$linkmode,$pass"; then
 	## FIXME: Find the place where the list is rebuilt in the wrong
 	##        order, and fix it there properly
         tmp_deplibs=
 	for deplib in $deplibs; do
 	  tmp_deplibs="$deplib $tmp_deplibs"
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
       fi
 
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
+      if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
 	deplibs=
       fi
-      if test "$linkmode" = prog; then
+      if test prog = "$linkmode"; then
 	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
 	link)
 	  libs="$deplibs %DEPLIBS%"
 	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 	  ;;
 	esac
       fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+      if test lib,dlpreopen = "$linkmode,$pass"; then
 	# Collect and forward deplibs of preopened libtool libs
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
@@ -6151,26 +7598,26 @@ func_mode_link ()
 	    esac
 	  done
 	done
-	libs="$dlprefiles"
+	libs=$dlprefiles
       fi
-      if test "$pass" = dlopen; then
+      if test dlopen = "$pass"; then
 	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
+	save_deplibs=$deplibs
 	deplibs=
       fi
 
       for deplib in $libs; do
 	lib=
-	found=no
+	found=false
 	case $deplib in
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6180,13 +7627,13 @@ func_mode_link ()
 	  continue
 	  ;;
 	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
+	  if test lib != "$linkmode" && test prog != "$linkmode"; then
+	    func_warning "'-l' is ignored for archives/objects"
 	    continue
 	  fi
 	  func_stripname '-l' '' "$deplib"
 	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	  else
 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6194,31 +7641,22 @@ func_mode_link ()
 	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
+	      lib=$searchdir/lib$name$search_ext
 	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
+		if test .la = "$search_ext"; then
+		  found=:
 		else
-		  found=no
+		  found=false
 		fi
 		break 2
 	      fi
 	    done
 	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
+	  if $found; then
+	    # deplib is a libtool library
 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
 		if func_lalib_p "$lib"; then
@@ -6226,19 +7664,19 @@ func_mode_link ()
 		  old_library=
 		  func_source "$lib"
 		  for l in $old_library $library_names; do
-		    ll="$l"
+		    ll=$l
 		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
+		  if test "X$ll" = "X$old_library"; then # only static version available
+		    found=false
 		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
+		    ladir=$func_dirname_result
 		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
+		    if test prog,link = "$linkmode,$pass"; then
 		      compile_deplibs="$deplib $compile_deplibs"
 		      finalize_deplibs="$deplib $finalize_deplibs"
 		    else
 		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 		    fi
 		    continue
 		  fi
@@ -6247,15 +7685,25 @@ func_mode_link ()
 	      *) ;;
 	      esac
 	    fi
+	  else
+	    # deplib doesn't seem to be a libtool library
+	    if test prog,link = "$linkmode,$pass"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
 	  fi
 	  ;; # -l
 	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
+	  if test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
+	    if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
 		    * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6268,18 +7716,18 @@ func_mode_link ()
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
+	    test conv = "$pass" && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
 	    func_resolve_sysroot "$func_stripname_result"
 	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
-	    if test "$pass" = conv; then
+	    if test conv = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test "$pass" = scan; then
+	    if test scan = "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -6290,13 +7738,13 @@ func_mode_link ()
 	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
+	    func_warning "'-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
-	  if test "$pass" = link; then
+	  if test link = "$pass"; then
 	    func_stripname '-R' '' "$deplib"
 	    func_resolve_sysroot "$func_stripname_result"
 	    dir=$func_resolve_sysroot_result
@@ -6314,7 +7762,7 @@ func_mode_link ()
 	  lib=$func_resolve_sysroot_result
 	  ;;
 	*.$libext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -6325,21 +7773,26 @@ func_mode_link ()
 	    case " $dlpreconveniencelibs " in
 	    *" $deplib "*) ;;
 	    *)
-	      valid_a_lib=no
+	      valid_a_lib=false
 	      case $deplibs_check_method in
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
+		    valid_a_lib=:
 		  fi
 		;;
 		pass_all)
-		  valid_a_lib=yes
+		  valid_a_lib=:
 		;;
 	      esac
-	      if test "$valid_a_lib" != yes; then
+	      if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      else
 		echo
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
 		echo "*** I have the capability to make that library automatically link in when"
@@ -6347,18 +7800,13 @@ func_mode_link ()
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because the file extensions .$libext of this argument makes me believe"
 		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
 	      fi
 	      ;;
 	    esac
 	    continue
 	    ;;
 	  prog)
-	    if test "$pass" != link; then
+	    if test link != "$pass"; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -6369,10 +7817,10 @@ func_mode_link ()
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test "$pass" = conv; then
+	  if test conv = "$pass"; then
 	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  elif test prog = "$linkmode"; then
+	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
 	      func_append newdlprefiles " $deplib"
@@ -6385,22 +7833,20 @@ func_mode_link ()
 	  continue
 	  ;;
 	%DEPLIBS%)
-	  alldeplibs=yes
+	  alldeplibs=:
 	  continue
 	  ;;
 	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
+	$found || test -f "$lib" \
+	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+	  || func_fatal_error "'$lib' is not a valid libtool archive"
 
 	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	ladir=$func_dirname_result
 
 	dlname=
 	dlopen=
@@ -6430,19 +7876,19 @@ func_mode_link ()
 	  done
 	fi
 	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	if test lib,link = "$linkmode,$pass" ||
+	   test prog,scan = "$linkmode,$pass" ||
+	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
 	  test -n "$dlopen" && func_append dlfiles " $dlopen"
 	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
-	if test "$pass" = conv; then
+	if test conv = "$pass"; then
 	  # Only check for convenience libraries
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
+	      func_fatal_error "cannot find name of link library for '$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
@@ -6450,15 +7896,15 @@ func_mode_link ()
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
+	      if $opt_preserve_dup_deps; then
 		case "$tmp_libs " in
 		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 		esac
 	      fi
 	      func_append tmp_libs " $deplib"
 	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
+	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	    func_fatal_error "'$lib' is not a convenience library"
 	  fi
 	  continue
 	fi # $pass = conv
@@ -6467,26 +7913,26 @@ func_mode_link ()
 	# Get the name of the library we link against.
 	linklib=
 	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	   { test yes = "$prefer_static_libs" ||
+	     test built,no = "$prefer_static_libs,$installed"; }; then
 	  linklib=$old_library
 	else
 	  for l in $old_library $library_names; do
-	    linklib="$l"
+	    linklib=$l
 	  done
 	fi
 	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
+	  func_fatal_error "cannot find name of link library for '$lib'"
 	fi
 
 	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
+	if test dlopen = "$pass"; then
+	  test -z "$libdir" \
+	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
+	     test yes != "$dlopen_support" ||
+	     test no = "$build_libtool_libs"
+	  then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -6500,40 +7946,40 @@ func_mode_link ()
 
 	# We need an absolute path.
 	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "cannot determine absolute directory name of '$ladir'"
 	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
+	    abs_ladir=$ladir
 	  fi
 	  ;;
 	esac
 	func_basename "$lib"
-	laname="$func_basename_result"
+	laname=$func_basename_result
 
 	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
+	if test yes = "$installed"; then
 	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
+	    func_warning "library '$lib' was moved."
+	    dir=$ladir
+	    absdir=$abs_ladir
+	    libdir=$abs_ladir
 	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
+	    dir=$lt_sysroot$libdir
+	    absdir=$lt_sysroot$libdir
 	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
+	    dir=$ladir
+	    absdir=$abs_ladir
 	    # Remove this search path later
 	    func_append notinst_path " $abs_ladir"
 	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
+	    dir=$ladir/$objdir
+	    absdir=$abs_ladir/$objdir
 	    # Remove this search path later
 	    func_append notinst_path " $abs_ladir"
 	  fi
@@ -6542,11 +7988,11 @@ func_mode_link ()
 	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	if test dlpreopen = "$pass"; then
+	  if test -z "$libdir" && test prog = "$linkmode"; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 	  fi
-	  case "$host" in
+	  case $host in
 	    # special handling for platforms with PE-DLLs.
 	    *cygwin* | *mingw* | *cegcc* )
 	      # Linker will automatically link against shared library if both
@@ -6590,9 +8036,9 @@ func_mode_link ()
 
 	if test -z "$libdir"; then
 	  # Link the convenience library
-	  if test "$linkmode" = lib; then
+	  if test lib = "$linkmode"; then
 	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
+	  elif test prog,link = "$linkmode,$pass"; then
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	  else
@@ -6602,14 +8048,14 @@ func_mode_link ()
 	fi
 
 
-	if test "$linkmode" = prog && test "$pass" != link; then
+	if test prog = "$linkmode" && test link != "$pass"; then
 	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
+	  linkalldeplibs=false
+	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	     test no = "$build_libtool_libs"; then
+	    linkalldeplibs=:
 	  fi
 
 	  tmp_libs=
@@ -6621,14 +8067,14 @@ func_mode_link ()
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
+	    if $linkalldeplibs; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      # Need to hardcode shared library paths
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
@@ -6638,15 +8084,15 @@ func_mode_link ()
 	  continue
 	fi # $linkmode = prog...
 
-	if test "$linkmode,$pass" = "prog,link"; then
+	if test prog,link = "$linkmode,$pass"; then
 	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	     { { test no = "$prefer_static_libs" ||
+	         test built,yes = "$prefer_static_libs,$installed"; } ||
 	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
+	      case $temp_rpath: in
 	      *"$absdir:"*) ;;
 	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
@@ -6675,9 +8121,9 @@ func_mode_link ()
 	    esac
 	  fi # $linkmode,$pass = prog,link...
 
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
+	  if $alldeplibs &&
+	     { test pass_all = "$deplibs_check_method" ||
+	       { test yes = "$build_libtool_libs" &&
 		 test -n "$library_names"; }; }; then
 	    # We only need to search for static libraries
 	    continue
@@ -6686,19 +8132,19 @@ func_mode_link ()
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
+	if test built = "$use_static_libs" && test yes = "$installed"; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
+	  *cygwin* | *mingw* | *cegcc* | *os2*)
 	      # No point in relinking DLLs because paths are not encoded
 	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
-	    if test "$installed" = no; then
+	    if test no = "$installed"; then
 	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
@@ -6708,24 +8154,24 @@ func_mode_link ()
 
 	  # Warn about portability, can't link against -module's on some
 	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
+	  dlopenmodule=
 	  for dlpremoduletest in $dlprefiles; do
 	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
+	      dlopenmodule=$dlpremoduletest
 	      break
 	    fi
 	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
 	    echo
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
 	    $ECHO "*** $linklib is not portable!"
 	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
+	  if test lib = "$linkmode" &&
+	     test yes = "$hardcode_into_libs"; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -6753,43 +8199,43 @@ func_mode_link ()
 	    # figure out the soname
 	    set dummy $library_names
 	    shift
-	    realname="$1"
+	    realname=$1
 	    shift
 	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
-	      soname="$dlname"
+	      soname=$dlname
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
+	      *cygwin* | mingw* | *cegcc* | *os2*)
 	        func_arith $current - $age
 		major=$func_arith_result
-		versuffix="-$major"
+		versuffix=-$major
 		;;
 	      esac
 	      eval soname=\"$soname_spec\"
 	    else
-	      soname="$realname"
+	      soname=$realname
 	    fi
 
 	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
+	    soroot=$soname
 	    func_basename "$soroot"
-	    soname="$func_basename_result"
+	    soname=$func_basename_result
 	    func_stripname 'lib' '.dll' "$soname"
 	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_verbose "extracting exported symbol list from '$soname'"
 	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
+	      func_verbose "generating import library for '$soname'"
 	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
@@ -6797,58 +8243,58 @@ func_mode_link ()
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    lib_linked=yes
 	    case $hardcode_action in
 	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
+	      if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
 		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
+		    *-*-unixware7*) add_dir=-L$dir ;;
 		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
+		    # if the lib is a (non-dlopened) module then we cannot
 		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
+			 $GREP ": [^:]* bundle" >/dev/null; then
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
+			if test -z "$old_library"; then
 			  echo
 			  echo "*** And there doesn't seem to be a static archive available"
 			  echo "*** The link will probably fail, sorry"
 			else
-			  add="$dir/$old_library"
+			  add=$dir/$old_library
 			fi
 		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
+			add=$dir/$old_library
 		      fi
 		    fi
 		esac
-	      elif test "$hardcode_minus_L" = no; then
+	      elif test no = "$hardcode_minus_L"; then
 		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
+		*-*-sunos*) add_shlibpath=$dir ;;
 		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add_dir=-L$dir
+		add=-l$name
+	      elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
+	      if test yes = "$hardcode_direct" &&
+	         test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	      elif test yes = "$hardcode_minus_L"; then
+		add_dir=-L$absdir
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -6857,10 +8303,10 @@ func_mode_link ()
 		      ;;
 		  esac
 		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add=-l$name
+	      elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	      else
 		lib_linked=no
 	      fi
@@ -6868,7 +8314,7 @@ func_mode_link ()
 	    *) lib_linked=no ;;
 	    esac
 
-	    if test "$lib_linked" != yes; then
+	    if test yes != "$lib_linked"; then
 	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
@@ -6878,15 +8324,15 @@ func_mode_link ()
 	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
+	      if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
 		*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6895,33 +8341,33 @@ func_mode_link ()
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
+	    if test yes = "$hardcode_direct" &&
+	       test no = "$hardcode_direct_absolute"; then
+	      add=$libdir/$linklib
+	    elif test yes = "$hardcode_minus_L"; then
+	      add_dir=-L$libdir
+	      add=-l$name
+	    elif test yes = "$hardcode_shlibpath_var"; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
 	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
+	      add=-l$name
+	    elif test yes = "$hardcode_automatic"; then
 	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
 	      else
-		add="$libdir/$linklib"
+		add=$libdir/$linklib
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+	      add_dir=-L$libdir
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
@@ -6930,10 +8376,10 @@ func_mode_link ()
 		    ;;
 		esac
 	      fi
-	      add="-l$name"
+	      add=-l$name
 	    fi
 
-	    if test "$linkmode" = prog; then
+	    if test prog = "$linkmode"; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -6941,43 +8387,43 @@ func_mode_link ()
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test "$linkmode" = prog; then
+	elif test prog = "$linkmode"; then
 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 	  # is not unsupported.  This is valid on all known static and
 	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
+	  if test unsupported != "$hardcode_direct"; then
+	    test -n "$old_library" && linklib=$old_library
 	    compile_deplibs="$dir/$linklib $compile_deplibs"
 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 	  else
 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 	  fi
-	elif test "$build_libtool_libs" = yes; then
+	elif test yes = "$build_libtool_libs"; then
 	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
+	  if test pass_all != "$deplibs_check_method"; then
 	    # We're trying link a shared library against a static one
 	    # but the system doesn't support it.
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
 	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
 	    echo "*** I have the capability to make that library automatically link in when"
 	    echo "*** you link to this library.  But I can only do this if you have a"
 	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
+	    if test yes = "$module"; then
 	      echo "*** But as you try to build a module library, libtool will still create "
 	      echo "*** a static module, that should work as long as the dlopening application"
 	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
 		echo
 		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	      fi
-	      if test "$build_old_libs" = no; then
+	      if test no = "$build_old_libs"; then
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -6990,11 +8436,11 @@ func_mode_link ()
 	  fi
 	fi # link shared/static library?
 
-	if test "$linkmode" = lib; then
+	if test lib = "$linkmode"; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
+	     { test yes != "$hardcode_into_libs" ||
+	       test yes = "$build_old_libs" ||
+	       test yes = "$link_static"; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
@@ -7008,12 +8454,12 @@ func_mode_link ()
 	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
-	    dependency_libs="$temp_deplibs"
+	    dependency_libs=$temp_deplibs
 	  fi
 
 	  func_append newlib_search_path " $absdir"
 	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
@@ -7023,7 +8469,7 @@ func_mode_link ()
                    func_resolve_sysroot "$func_stripname_result";;
               *) func_resolve_sysroot "$deplib" ;;
             esac
-	    if $opt_preserve_dup_deps ; then
+	    if $opt_preserve_dup_deps; then
 	      case "$tmp_libs " in
 	      *" $func_resolve_sysroot_result "*)
                 func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7032,12 +8478,12 @@ func_mode_link ()
 	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
-	  if test "$link_all_deplibs" != no; then
+	  if test no != "$link_all_deplibs"; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
 	      path=
 	      case $deplib in
-	      -L*) path="$deplib" ;;
+	      -L*) path=$deplib ;;
 	      *.la)
 	        func_resolve_sysroot "$deplib"
 	        deplib=$func_resolve_sysroot_result
@@ -7045,12 +8491,12 @@ func_mode_link ()
 		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
+		    func_warning "cannot determine absolute directory name of '$dir'"
+		    absdir=$dir
 		  fi
 		  ;;
 		esac
@@ -7058,35 +8504,35 @@ func_mode_link ()
 		case $host in
 		*-*-darwin*)
 		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
+		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names"; then
+		    for tmp in $deplibrary_names; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+		    if test -f "$absdir/$objdir/$depdepl"; then
+		      depdepl=$absdir/$objdir/$depdepl
+		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
                       if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 		      path=
 		    fi
 		  fi
 		  ;;
 		*)
-		  path="-L$absdir/$objdir"
+		  path=-L$absdir/$objdir
 		  ;;
 		esac
 		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		    func_fatal_error "'$deplib' is not a valid libtool archive"
 		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
+		    func_warning "'$deplib' seems to be moved"
 
-		  path="-L$absdir"
+		  path=-L$absdir
 		fi
 		;;
 	      esac
@@ -7098,23 +8544,23 @@ func_mode_link ()
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
+      if test link = "$pass"; then
+	if test prog = "$linkmode"; then
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
 	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
+      if test dlopen != "$pass"; then
+	test conv = "$pass" || {
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
@@ -7124,12 +8570,12 @@ func_mode_link ()
 	    esac
 	  done
 	  newlib_search_path=
-	fi
+	}
 
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
+	if test prog,link = "$linkmode,$pass"; then
 	  vars="compile_deplibs finalize_deplibs"
+	else
+	  vars=deplibs
 	fi
 	for var in $vars dependency_libs; do
 	  # Add libraries to $var in reverse order
@@ -7187,62 +8633,93 @@ func_mode_link ()
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
-      for i in $dependency_libs ; do
+      for i in $dependency_libs; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
 	*" $i "*)
-	  i=""
+	  i=
 	  ;;
 	esac
-	if test -n "$i" ; then
+	if test -n "$i"; then
 	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
     done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
     fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
     fi
 
     case $linkmode in
     oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+	func_warning "'-l' and '-L' are ignored for archives" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
+	func_warning "'-rpath' is ignored for archives"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
+	func_warning "'-R' is ignored for archives"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
+	func_warning "'-version-info/-version-number' is ignored for archives"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
+	func_warning "'-release' is ignored for archives"
 
       test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
+	func_warning "'-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
-      oldlibs="$output"
+      oldlibs=$output
       func_append objs "$old_deplibs"
       ;;
 
     lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
+      # Make sure we only generate libraries of the form 'libNAME.la'.
       case $outputname in
       lib*)
 	func_stripname 'lib' '.la' "$outputname"
@@ -7251,10 +8728,10 @@ func_mode_link ()
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+	test no = "$module" \
+	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
 
-	if test "$need_lib_prefix" != no; then
+	if test no != "$need_lib_prefix"; then
 	  # Add the "lib" prefix for modules if required
 	  func_stripname '' '.la' "$outputname"
 	  name=$func_stripname_result
@@ -7268,8 +8745,8 @@ func_mode_link ()
       esac
 
       if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	if test pass_all != "$deplibs_check_method"; then
+	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 	else
 	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7278,21 +8755,21 @@ func_mode_link ()
 	fi
       fi
 
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+      test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
       shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+      test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 
-      install_libdir="$1"
+      install_libdir=$1
 
       oldlibs=
       if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
+	if test yes = "$build_libtool_libs"; then
 	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
+	  # Some compilers have problems with a '.al' extension so
 	  # convenience libraries should have the same extension an
 	  # archive normally would.
 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7301,20 +8778,20 @@ func_mode_link ()
 	fi
 
 	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 
 	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
+	  func_warning "'-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
+	save_ifs=$IFS; IFS=:
 	set dummy $vinfo 0 0 0
 	shift
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
+	  func_fatal_help "too many parameters to '-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -7322,45 +8799,45 @@ func_mode_link ()
 
 	case $vinfo_number in
 	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
+	  number_major=$1
+	  number_minor=$2
+	  number_revision=$3
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
 	  # and those that subtract age and use age as
 	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
+	  # that has an extra 1 added just for fun
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
+	    age=$number_minor
+	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
+	  freebsd-aout|qnx|sunos)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
 	    ;;
 	  irix|nonstopux)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
+	    age=$number_minor
+	    revision=$number_minor
 	    lt_irix_increment=no
 	    ;;
 	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
 	    ;;
 	  esac
 	  ;;
 	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
+	  current=$1
+	  revision=$2
+	  age=$3
 	  ;;
 	esac
 
@@ -7368,30 +8845,30 @@ func_mode_link ()
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "CURRENT '$current' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "REVISION '$revision' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' must be a nonnegative integer"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
+	  func_error "AGE '$age' is greater than the current interface number '$current'"
+	  func_fatal_error "'$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -7406,26 +8883,36 @@ func_mode_link ()
 	  # verstring for coding it into the library header
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
 	  ;;
 
 	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
+	  if test no = "$lt_irix_increment"; then
 	    func_arith $current - $age
 	  else
 	    func_arith $current - $age + 1
@@ -7436,69 +8923,74 @@ func_mode_link ()
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
 	  esac
-	  verstring="$verstring_prefix$major.$revision"
+	  verstring=$verstring_prefix$major.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $revision - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
+	    verstring=$verstring_prefix$major.$iface:$verstring
 	  done
 
-	  # Before this point, $major must not contain `.'.
+	  # Before this point, $major must not contain '.'.
 	  major=.$major
-	  versuffix="$major.$revision"
+	  versuffix=$major.$revision
 	  ;;
 
 	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	osf)
 	  func_arith $current - $age
 	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
+	  versuffix=.$current.$age.$revision
+	  verstring=$current.$age.$revision
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
-	  while test "$loop" -ne 0; do
+	  while test 0 -ne "$loop"; do
 	    func_arith $current - $loop
 	    iface=$func_arith_result
 	    func_arith $loop - 1
 	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
+	    verstring=$verstring:$iface.0
 	  done
 
 	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
+	  func_append verstring ":$current.0"
 	  ;;
 
 	qnx)
-	  major=".$current"
-	  versuffix=".$current"
+	  major=.$current
+	  versuffix=.$current
+	  ;;
+
+	sco)
+	  major=.$current
+	  versuffix=.$current
 	  ;;
 
 	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
+	  major=.$current
+	  versuffix=.$current.$revision
 	  ;;
 
 	windows)
 	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
+	  # extension on DOS 8.3 file systems.
 	  func_arith $current - $age
 	  major=$func_arith_result
-	  versuffix="-$major"
+	  versuffix=-$major
 	  ;;
 
 	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  func_fatal_configuration "unknown library version type '$version_type'"
 	  ;;
 	esac
 
@@ -7512,42 +9004,45 @@ func_mode_link ()
 	    verstring=
 	    ;;
 	  *)
-	    verstring="0.0"
+	    verstring=0.0
 	    ;;
 	  esac
-	  if test "$need_version" = no; then
+	  if test no = "$need_version"; then
 	    versuffix=
 	  else
-	    versuffix=".0.0"
+	    versuffix=.0.0
 	  fi
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test yes,no = "$avoid_version,$need_version"; then
 	  major=
 	  versuffix=
-	  verstring=""
+	  verstring=
 	fi
 
 	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
+	if test yes = "$allow_undefined"; then
+	  if test unsupported = "$allow_undefined_flag"; then
+	    if test yes = "$build_old_libs"; then
+	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	      build_libtool_libs=no
+	    else
+	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	    fi
 	  fi
 	else
 	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
+	  allow_undefined_flag=$no_undefined_flag
 	fi
 
       fi
 
-      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_generate_dlsyms "$libname" "$libname" :
       func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
+      test " " = "$libobjs" && libobjs=
 
-      if test "$opt_mode" != relink; then
+      if test relink != "$opt_mode"; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -7556,8 +9051,8 @@ func_mode_link ()
 	  case $p in
 	    *.$objext | *.gcno)
 	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	       if test -n "$precious_files_regex"; then
 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 		 then
 		   continue
@@ -7573,11 +9068,11 @@ func_mode_link ()
       fi
 
       # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
 	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
@@ -7598,13 +9093,13 @@ func_mode_link ()
 	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 	  dependency_libs="$temp_xrpath $dependency_libs"
 	fi
       fi
 
       # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
+      old_dlfiles=$dlfiles
       dlfiles=
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
@@ -7614,7 +9109,7 @@ func_mode_link ()
       done
 
       # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
+      old_dlprefiles=$dlprefiles
       dlprefiles=
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
@@ -7623,7 +9118,7 @@ func_mode_link ()
 	esac
       done
 
-      if test "$build_libtool_libs" = yes; then
+      if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	  case $host in
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7647,7 +9142,7 @@ func_mode_link ()
 	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
+	    if test yes = "$build_libtool_need_lc"; then
 	      func_append deplibs " -lc"
 	    fi
 	    ;;
@@ -7663,9 +9158,9 @@ func_mode_link ()
 	# I'm not sure if I'm treating the release correctly.  I think
 	# release should show up in the -l (ie -lgmp5) so we don't want to
 	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
+	release=
+	versuffix=
+	major=
 	newdeplibs=
 	droppeddeps=no
 	case $deplibs_check_method in
@@ -7694,20 +9189,20 @@ EOF
 	      -l*)
 		func_stripname -l '' "$i"
 		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
 		    func_append newdeplibs " $i"
-		    i=""
+		    i=
 		    ;;
 		  esac
 		fi
-		if test -n "$i" ; then
+		if test -n "$i"; then
 		  libname=`eval "\\$ECHO \"$libname_spec\""`
 		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
@@ -7737,20 +9232,20 @@ EOF
 		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
 		      func_append newdeplibs " $i"
-		      i=""
+		      i=
 		      ;;
 		    esac
 		  fi
-		  if test -n "$i" ; then
+		  if test -n "$i"; then
 		    libname=`eval "\\$ECHO \"$libname_spec\""`
 		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
@@ -7787,24 +9282,24 @@ EOF
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		if test -n "$file_magic_glob"; then
 		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
 		else
 		  libnameglob=$libname
 		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
+		  if test yes = "$want_nocaseglob"; then
 		    shopt -s nocaseglob
 		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
 		    $nocaseglob
@@ -7822,25 +9317,25 @@ EOF
 		      # We might still enter an endless loop, since a link
 		      # loop can be closed while we follow links,
 		      # but so what?
-		      potlib="$potent_lib"
+		      potlib=$potent_lib
 		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
 			func_append newdeplibs " $a_deplib"
-			a_deplib=""
+			a_deplib=
 			break 2
 		      fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7848,7 +9343,7 @@ EOF
 		echo "*** you link to this library.  But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7871,30 +9366,30 @@ EOF
 	    -l*)
 	      func_stripname -l '' "$a_deplib"
 	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
+		  a_deplib=
 		  ;;
 		esac
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    potlib=$potent_lib # see symlink-check above in file_magic test
 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
 		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
+		      a_deplib=
 		      break 2
 		    fi
 		  done
 		done
 	      fi
-	      if test -n "$a_deplib" ; then
+	      if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7902,7 +9397,7 @@ EOF
 		echo "*** you link to this library.  But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
 		  $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7918,18 +9413,18 @@ EOF
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
-	  newdeplibs=""
+	  newdeplibs=
 	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
+	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	    for i in $predeps $postdeps; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 	    done
 	  fi
 	  case $tmp_deplibs in
 	  *[!\	\ ]*)
 	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
+	    if test none = "$deplibs_check_method"; then
 	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
 	      echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7953,8 +9448,8 @@ EOF
 	  ;;
 	esac
 
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
+	if test yes = "$droppeddeps"; then
+	  if test yes = "$module"; then
 	    echo
 	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
@@ -7963,12 +9458,12 @@ EOF
 	    if test -z "$global_symbol_pipe"; then
 	      echo
 	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
+	    if test no = "$build_old_libs"; then
+	      oldlibs=$output_objdir/$libname.$libext
 	      build_libtool_libs=module
 	      build_old_libs=yes
 	    else
@@ -7979,14 +9474,14 @@ EOF
 	    echo "*** automatically added whenever a program is linked with this library"
 	    echo "*** or is declared to -dlopen it."
 
-	    if test "$allow_undefined" = no; then
+	    if test no = "$allow_undefined"; then
 	      echo
 	      echo "*** Since this library must not contain undefined symbols,"
 	      echo "*** because either the platform does not support them or"
 	      echo "*** it was explicitly requested with -no-undefined,"
 	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
+	      if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
 		build_libtool_libs=module
 		build_old_libs=yes
 	      else
@@ -8032,7 +9527,7 @@ EOF
 	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      deplibs="$new_libs"
+      deplibs=$new_libs
 
       # All the library-specific variables (install_libdir is set above).
       library_names=
@@ -8040,25 +9535,25 @@ EOF
       dlname=
 
       # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
+      if test yes = "$build_libtool_libs"; then
+	# Remove $wl instances when linking with ld.
 	# FIXME: should test the right _cmds variable.
 	case $archive_cmds in
 	  *\$LD\ *) wl= ;;
         esac
-	if test "$hardcode_into_libs" = yes; then
+	if test yes = "$hardcode_into_libs"; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  rpath=$finalize_rpath
+	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
 		func_replace_sysroot "$libdir"
 		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
+		  hardcode_libdirs=$libdir
 		else
 		  # Just accumulate the unique libdirs.
 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8083,7 +9578,7 @@ EOF
 	  # Substitute the hardcoded libdirs into the rpath.
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
+	    libdir=$hardcode_libdirs
 	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8097,8 +9592,8 @@ EOF
 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 	fi
 
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -8108,19 +9603,19 @@ EOF
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	shift
-	realname="$1"
+	realname=$1
 	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
 	else
-	  soname="$realname"
+	  soname=$realname
 	fi
 	if test -z "$dlname"; then
 	  dlname=$soname
 	fi
 
-	lib="$output_objdir/$realname"
+	lib=$output_objdir/$realname
 	linknames=
 	for link
 	do
@@ -8134,7 +9629,7 @@ EOF
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
+	  export_symbols=$output_objdir/$libname.uexp
 	  func_append delfiles " $export_symbols"
 	fi
 
@@ -8143,31 +9638,31 @@ EOF
 	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	    func_dll_def_p "$export_symbols" || {
 	      # and it's NOT already a .def file. Must figure out
 	      # which of the given symbols are data symbols and tag
 	      # them as such. So, trigger use of export_symbols_cmds.
 	      # export_symbols gets reassigned inside the "prepare
 	      # the list of exported symbols" if statement, so the
 	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
+	      orig_export_symbols=$export_symbols
 	      export_symbols=
 	      always_export_symbols=yes
-	    fi
+	    }
 	  fi
 	  ;;
 	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
+	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for '$libname.la'"
+	    export_symbols=$output_objdir/$libname.exp
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
+	      IFS=$save_ifs
 	      # Take the normal branch if the nm_file_list_spec branch
 	      # doesn't work or if tool conversion is not needed.
 	      case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8181,7 +9676,7 @@ EOF
 		  try_normal_branch=no
 		  ;;
 	      esac
-	      if test "$try_normal_branch" = yes \
+	      if test yes = "$try_normal_branch" \
 		 && { test "$len" -lt "$max_cmd_len" \
 		      || test "$max_cmd_len" -le -1; }
 	      then
@@ -8192,7 +9687,7 @@ EOF
 		output_la=$func_basename_result
 		save_libobjs=$libobjs
 		save_output=$output
-		output=${output_objdir}/${output_la}.nm
+		output=$output_objdir/$output_la.nm
 		func_to_tool_file "$output"
 		libobjs=$nm_file_list_spec$func_to_tool_file_result
 		func_append delfiles " $output"
@@ -8215,8 +9710,8 @@ EOF
 		break
 	      fi
 	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	    IFS=$save_ifs
+	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
@@ -8224,16 +9719,16 @@ EOF
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  tmp_export_symbols=$export_symbols
+	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # 's' commands, which not all seds can handle. GNU sed should be fine
 	  # though. Also, the filter scales superlinearly with the number of
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
@@ -8252,11 +9747,11 @@ EOF
 	    ;;
 	  esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
+	    test yes = "$compiler_needs_object" &&
 	    test -z "$libobjs"; then
 	    # extract the archives, so we have objects to list.
 	    # TODO: could optimize this to just extract one archive.
@@ -8267,7 +9762,7 @@ EOF
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	    test "X$libobjs" = "X " && libobjs=
 	  else
-	    gentop="$output_objdir/${outputname}x"
+	    gentop=$output_objdir/${outputname}x
 	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
@@ -8276,18 +9771,18 @@ EOF
 	  fi
 	fi
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
+	if test yes = "$module" && test -n "$module_cmds"; then
 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	    eval test_cmds=\"$module_expsym_cmds\"
 	    cmds=$module_expsym_cmds
@@ -8305,7 +9800,7 @@ EOF
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" &&
+	if test : != "$skipped_export" &&
 	   func_len " $test_cmds" &&
 	   len=$func_len_result &&
 	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8338,8 +9833,8 @@ EOF
 	  last_robj=
 	  k=1
 
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
+	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	    output=$output_objdir/$output_la.lnkscript
 	    func_verbose "creating GNU ld script: $output"
 	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
@@ -8351,14 +9846,14 @@ EOF
 	    func_append delfiles " $output"
 	    func_to_tool_file "$output"
 	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
+	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	    output=$output_objdir/$output_la.lnk
 	    func_verbose "creating linker input file list: $output"
 	    : > $output
 	    set x $save_libobjs
 	    shift
 	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
+	    if test yes = "$compiler_needs_object"; then
 	      firstobj="$1 "
 	      shift
 	    fi
@@ -8373,7 +9868,7 @@ EOF
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
+	      output=$output_objdir/$output_la-$k.$objext
 	      eval test_cmds=\"$reload_cmds\"
 	      func_len " $test_cmds"
 	      len0=$func_len_result
@@ -8385,13 +9880,13 @@ EOF
 		func_len " $obj"
 		func_arith $len + $func_len_result
 		len=$func_arith_result
-		if test "X$objlist" = X ||
+		if test -z "$objlist" ||
 		   test "$len" -lt "$max_cmd_len"; then
 		  func_append objlist " $obj"
 		else
 		  # The command $test_cmds is almost too long, add a
 		  # command to the queue.
-		  if test "$k" -eq 1 ; then
+		  if test 1 -eq "$k"; then
 		    # The first file doesn't have a previous command to add.
 		    reload_objs=$objlist
 		    eval concat_cmds=\"$reload_cmds\"
@@ -8401,10 +9896,10 @@ EOF
 		    reload_objs="$objlist $last_robj"
 		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  last_robj=$output_objdir/$output_la-$k.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
+		  output=$output_objdir/$output_la-$k.$objext
 		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
@@ -8416,9 +9911,9 @@ EOF
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
 	      func_append delfiles " $output"
 
@@ -8426,9 +9921,9 @@ EOF
 	      output=
 	    fi
 
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
+	    ${skipped_export-false} && {
+	      func_verbose "generating symbol list for '$libname.la'"
+	      export_symbols=$output_objdir/$libname.exp
 	      $opt_dry_run || $RM $export_symbols
 	      libobjs=$output
 	      # Append the command to create the export file.
@@ -8437,16 +9932,16 @@ EOF
 	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	    fi
+	    }
 
 	    test -n "$save_libobjs" &&
 	      func_verbose "creating a temporary reloadable object file: $output"
 
 	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
+	    save_ifs=$IFS; IFS='~'
 	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
+	      IFS=$save_ifs
+	      $opt_quiet || {
 		  func_quote_for_expand "$cmd"
 		  eval "func_echo $func_quote_for_expand_result"
 	      }
@@ -8454,7 +9949,7 @@ EOF
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
+		if test relink = "$opt_mode"; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -8463,7 +9958,7 @@ EOF
 		exit $lt_exit
 	      }
 	    done
-	    IFS="$save_ifs"
+	    IFS=$save_ifs
 
 	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8471,18 +9966,18 @@ EOF
 	    fi
 	  fi
 
-          if ${skipped_export-false}; then
+          ${skipped_export-false} && {
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      tmp_export_symbols=$export_symbols
+	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
 	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # 's' commands, which not all seds can handle. GNU sed should be fine
 	      # though. Also, the filter scales superlinearly with the number of
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
@@ -8491,7 +9986,7 @@ EOF
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
-	  fi
+	  }
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -8505,7 +10000,7 @@ EOF
 	  # value of $libobjs for piecewise linking.
 
 	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test yes = "$module" && test -n "$module_cmds"; then
 	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	      cmds=$module_expsym_cmds
 	    else
@@ -8527,7 +10022,7 @@ EOF
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
@@ -8535,11 +10030,12 @@ EOF
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
-	save_ifs="$IFS"; IFS='~'
+	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
-	  IFS="$save_ifs"
+	  IFS=$sp$nl
 	  eval cmd=\"$cmd\"
-	  $opt_silent || {
+	  IFS=$save_ifs
+	  $opt_quiet || {
 	    func_quote_for_expand "$cmd"
 	    eval "func_echo $func_quote_for_expand_result"
 	  }
@@ -8547,7 +10043,7 @@ EOF
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
+	    if test relink = "$opt_mode"; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -8556,10 +10052,10 @@ EOF
 	    exit $lt_exit
 	  }
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -8579,39 +10075,39 @@ EOF
 	done
 
 	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
+	if test yes = "$module" || test yes = "$export_dynamic"; then
 	  # On all known operating systems, these are identical.
-	  dlname="$soname"
+	  dlname=$soname
 	fi
       fi
       ;;
 
     obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
       fi
 
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+	func_warning "'-l' and '-L' are ignored for objects" ;;
       esac
 
       test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
+	func_warning "'-rpath' is ignored for objects"
 
       test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
+	func_warning "'-R' is ignored for objects"
 
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
+	func_warning "'-version-info' is ignored for objects"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
+	func_warning "'-release' is ignored for objects"
 
       case $output in
       *.lo)
 	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
 
 	libobj=$output
 	func_lo2o "$libobj"
@@ -8619,7 +10115,7 @@ EOF
 	;;
       *)
 	libobj=
-	obj="$output"
+	obj=$output
 	;;
       esac
 
@@ -8632,17 +10128,19 @@ EOF
       # the extraction.
       reload_conv_objs=
       gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
-	  gentop="$output_objdir/${obj}x"
+	  gentop=$output_objdir/${obj}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
@@ -8651,12 +10149,12 @@ EOF
       fi
 
       # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 
-      output="$obj"
+      output=$obj
       func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
@@ -8668,7 +10166,7 @@ EOF
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$build_libtool_libs" != yes; then
+      test yes = "$build_libtool_libs" || {
 	if test -n "$gentop"; then
 	  func_show_eval '${RM}r "$gentop"'
 	fi
@@ -8678,12 +10176,12 @@ EOF
 	# $show "echo timestamp > $libobj"
 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
-      fi
+      }
 
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
+	output=$libobj
 	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
@@ -8700,16 +10198,14 @@ EOF
 	          output=$func_stripname_result.exe;;
       esac
       test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+	func_warning "'-version-info' is ignored for programs"
 
       test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
+	func_warning "'-release' is ignored for programs"
 
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+      $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
@@ -8723,11 +10219,11 @@ EOF
       *-*-darwin*)
 	# Don't allow lazy linking, it breaks C++ global constructors
 	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
+	if test CXX = "$tagname"; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
+	      func_append compile_command " $wl-bind_at_load"
+	      func_append finalize_command " $wl-bind_at_load"
 	    ;;
 	  esac
 	fi
@@ -8763,7 +10259,7 @@ EOF
 	*) func_append new_libs " $deplib" ;;
 	esac
       done
-      compile_deplibs="$new_libs"
+      compile_deplibs=$new_libs
 
 
       func_append compile_command " $compile_deplibs"
@@ -8787,7 +10283,7 @@ EOF
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8810,7 +10306,7 @@ EOF
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
@@ -8827,10 +10323,10 @@ EOF
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      compile_rpath="$rpath"
+      compile_rpath=$rpath
 
       rpath=
       hardcode_libdirs=
@@ -8838,7 +10334,7 @@ EOF
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
+	      hardcode_libdirs=$libdir
 	    else
 	      # Just accumulate the unique libdirs.
 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8863,45 +10359,43 @@ EOF
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
-      finalize_rpath="$rpath"
+      finalize_rpath=$rpath
 
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
 	# Transform all the library objects into standard objects.
 	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
       # template prelinking step
       if test -n "$prelink_cmds"; then
 	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      wrappers_required=yes
+      wrappers_required=:
       case $host in
       *cegcc* | *mingw32ce*)
         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
+        wrappers_required=false
         ;;
       *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
+        test yes = "$build_libtool_libs" || wrappers_required=false
         ;;
       *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
         fi
         ;;
       esac
-      if test "$wrappers_required" = no; then
+      $wrappers_required || {
 	# Replace the output file specification.
 	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	link_command=$compile_command$compile_rpath
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
@@ -8914,12 +10408,12 @@ EOF
 	fi
 
 	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 	fi
 
 	exit $exit_status
-      fi
+      }
 
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8949,9 +10443,9 @@ EOF
 	fi
       fi
 
-      if test "$no_install" = yes; then
+      if test yes = "$no_install"; then
 	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
+	link_command=$compile_var$compile_command$compile_rpath
 	# Replace the output file specification.
 	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
@@ -8968,27 +10462,28 @@ EOF
 	exit $EXIT_SUCCESS
       fi
 
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
+      case $hardcode_action,$fast_install in
+        relink,*)
+	  # Fast installation is not supported
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
 
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
+	  func_warning "this platform does not like uninstalled shared libraries"
+	  func_warning "'$output' will be relinked during installation"
+	  ;;
+        *,yes)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+	*,no)
+	  link_command=$compile_var$compile_command$compile_rpath
+	  relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+	*,needless)
+	  link_command=$finalize_var$compile_command$finalize_rpath
+	  relink_command=
+          ;;
+      esac
 
       # Replace the output file specification.
       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9045,8 +10540,8 @@ EOF
 	    func_dirname_and_basename "$output" "" "."
 	    output_name=$func_basename_result
 	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
+	    cwrappersource=$output_path/$objdir/lt-$output_name.c
+	    cwrapper=$output_path/$output_name.exe
 	    $RM $cwrappersource $cwrapper
 	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
@@ -9067,7 +10562,7 @@ EOF
 	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 	    $opt_dry_run || {
 	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
+	      if test "x$build" = "x$host"; then
 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 	      else
 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9090,25 +10585,27 @@ EOF
     # See if we need to build an old-fashioned archive.
     for oldlib in $oldlibs; do
 
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
+      case $build_libtool_libs in
+        convenience)
+	  oldobjs="$libobjs_save $symfileobj"
+	  addlibs=$convenience
 	  build_libtool_libs=no
-	else
+	  ;;
+	module)
+	  oldobjs=$libobjs_save
+	  addlibs=$old_convenience
+	  build_libtool_libs=no
+          ;;
+	*)
 	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
+	  $preload && test -f "$symfileobj" \
+	    && func_append oldobjs " $symfileobj"
+	  addlibs=$old_convenience
+	  ;;
+      esac
 
       if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
+	gentop=$output_objdir/${outputname}x
 	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
@@ -9116,13 +10613,13 @@ EOF
       fi
 
       # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 	cmds=$old_archive_from_new_cmds
       else
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
@@ -9143,7 +10640,7 @@ EOF
 	  :
 	else
 	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
+	  gentop=$output_objdir/${outputname}x
 	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
@@ -9152,7 +10649,7 @@ EOF
 	  for obj in $save_oldobjs
 	  do
 	    func_basename "$obj"
-	    objbase="$func_basename_result"
+	    objbase=$func_basename_result
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -9221,18 +10718,18 @@ EOF
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
+	      if test "$obj" = "$last_oldobj"; then
 		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 	      objlist=
 	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
 	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
+	  if test -z "$oldobjs"; then
 	    eval cmds=\"\$concat_cmds\"
 	  else
 	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9249,7 +10746,7 @@ EOF
     case $output in
     *.la)
       old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      test yes = "$build_old_libs" && old_library=$libname.$libext
       func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
@@ -9264,31 +10761,31 @@ EOF
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
+      if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
 
       # Only create the output if not a dry run.
       $opt_dry_run || {
 	for installed in no yes; do
-	  if test "$installed" = yes; then
+	  if test yes = "$installed"; then
 	    if test -z "$install_libdir"; then
 	      break
 	    fi
-	    output="$output_objdir/$outputname"i
+	    output=$output_objdir/${outputname}i
 	    # Replace all uninstalled libtool libraries with the installed ones
 	    newdependency_libs=
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
 		func_basename "$deplib"
-		name="$func_basename_result"
+		name=$func_basename_result
 		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  func_fatal_error "'$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      -L*)
@@ -9304,23 +10801,23 @@ EOF
 	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
-	    dependency_libs="$newdependency_libs"
+	    dependency_libs=$newdependency_libs
 	    newdlfiles=
 
 	    for lib in $dlfiles; do
 	      case $lib in
 	      *.la)
 	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
@@ -9330,34 +10827,34 @@ EOF
 		# didn't already link the preopened objects directly into
 		# the library:
 		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		  func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
 	      func_append newdlfiles " $abs"
 	    done
-	    dlfiles="$newdlfiles"
+	    dlfiles=$newdlfiles
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
 	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
 	      func_append newdlprefiles " $abs"
 	    done
-	    dlprefiles="$newdlprefiles"
+	    dlprefiles=$newdlprefiles
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
@@ -9373,10 +10870,9 @@ EOF
 	  case $host,$output,$installed,$module,$dlname in
 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
 	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
+	      if test -n "$bindir"; then
 		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
+		tdlname=$func_relative_path_result/$dlname
 	      else
 		# Otherwise fall back on heuristic.
 		tdlname=../bin/$dlname
@@ -9385,7 +10881,7 @@ EOF
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -9399,7 +10895,7 @@ library_names='$library_names'
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
@@ -9425,7 +10921,7 @@ dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
+	  if test no,yes = "$installed,$need_relink"; then
 	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
@@ -9440,27 +10936,29 @@ relink_command=\"$relink_command\""
     exit $EXIT_SUCCESS
 }
 
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
-    $opt_debug
-    RM="$nonopt"
+    $debug_cmd
+
+    RM=$nonopt
     files=
-    rmforce=
+    rmforce=false
     exit_status=0
 
     # This variable tells wrapper scripts just to set variables rather
     # than running their programs.
-    libtool_install_magic="$magic"
+    libtool_install_magic=$magic
 
     for arg
     do
       case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
+      -f) func_append RM " $arg"; rmforce=: ;;
       -*) func_append RM " $arg" ;;
       *) func_append files " $arg" ;;
       esac
@@ -9473,18 +10971,18 @@ func_mode_uninstall ()
 
     for file in $files; do
       func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+	odir=$objdir
       else
-	odir="$dir/$objdir"
+	odir=$dir/$objdir
       fi
       func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
 
       # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
+      if test clean = "$opt_mode"; then
 	case " $rmdirs " in
 	  *" $odir "*) ;;
 	  *) func_append rmdirs " $odir" ;;
@@ -9499,11 +10997,11 @@ func_mode_uninstall ()
       elif test -d "$file"; then
 	exit_status=1
 	continue
-      elif test "$rmforce" = yes; then
+      elif $rmforce; then
 	continue
       fi
 
-      rmfiles="$file"
+      rmfiles=$file
 
       case $name in
       *.la)
@@ -9517,7 +11015,7 @@ func_mode_uninstall ()
 	  done
 	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$opt_mode" in
+	  case $opt_mode in
 	  clean)
 	    case " $library_names " in
 	    *" $dlname "*) ;;
@@ -9528,12 +11026,12 @@ func_mode_uninstall ()
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -9549,21 +11047,19 @@ func_mode_uninstall ()
 	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
+	  if test -n "$pic_object" && test none != "$pic_object"; then
 	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
 	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$opt_mode" = clean ; then
+	if test clean = "$opt_mode"; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -9590,12 +11086,12 @@ func_mode_uninstall ()
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	    if test yes = "$fast_install" && test -n "$relink_command"; then
 	      func_append rmfiles " $odir/lt-$name"
 	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    if test "X$noexename" != "X$name"; then
+	      func_append rmfiles " $odir/lt-$noexename.c"
 	    fi
 	  fi
 	fi
@@ -9604,7 +11100,7 @@ func_mode_uninstall ()
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
 
-    # Try to remove the ${objdir}s in the directories where we deleted files
+    # Try to remove the $objdir's in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
 	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9614,16 +11110,17 @@ func_mode_uninstall ()
     exit $exit_status
 }
 
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
 
 test -z "$opt_mode" && {
-  help="$generic_help"
+  help=$generic_help
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
+  func_fatal_help "invalid operation mode '$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
@@ -9634,7 +11131,7 @@ exit $exit_status
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
+# where we disable both kinds of libraries.  Given conflicting
 # choices, we go for a static library, that is the most portable,
 # since we can't tell whether shared libraries were disabled because
 # the user asked for that or because the platform doesn't support
@@ -9657,5 +11154,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
new file mode 100644
index 0000000..3675543
--- /dev/null
+++ b/m4/gtk-doc.m4
@@ -0,0 +1,88 @@
+dnl -*- mode: autoconf -*-
+
+# serial 2
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+  ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+  AC_MSG_CHECKING([for gtk-doc])
+  PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+  AC_MSG_RESULT($have_gtk_doc)
+
+  if test "$have_gtk_doc" = "no"; then
+      AC_MSG_WARN([
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found.])
+  fi
+
+  dnl check for tools we added during development
+  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+  dnl may not be writable by the user. Currently, automake requires that the
+  dnl test name must end in '.test'.
+  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
+  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH([html-dir],
+    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST([HTML_DIR])
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE([gtk-doc],
+    AS_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [[default=no]]]),,
+    [enable_gtk_doc=no])
+
+  AC_MSG_CHECKING([whether to build gtk-doc documentation])
+  AC_MSG_RESULT($enable_gtk_doc)
+
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    AC_MSG_ERROR([
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '[$]0'.])
+  fi
+
+  dnl don't check for glib if we build glib
+  if test "x$PACKAGE_NAME" != "xglib"; then
+    dnl don't fail if someone does not have glib
+    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
+  fi
+
+  dnl enable/disable output formats
+  AC_ARG_ENABLE([gtk-doc-html],
+    AS_HELP_STRING([--enable-gtk-doc-html],
+                   [build documentation in html format [[default=yes]]]),,
+    [enable_gtk_doc_html=yes])
+    AC_ARG_ENABLE([gtk-doc-pdf],
+      AS_HELP_STRING([--enable-gtk-doc-pdf],
+                     [build documentation in pdf format [[default=no]]]),,
+      [enable_gtk_doc_pdf=no])
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
+
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+  AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+  AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
+  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
diff --git a/m4/intltool.m4 b/m4/intltool.m4
new file mode 100644
index 0000000..c25b7b1
--- /dev/null
+++ b/m4/intltool.m4
@@ -0,0 +1,212 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <mjs@noisehavoc.org>
+##         Kenneth Christiansen <kenneth@gnu.org>
+##
+## 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.
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+   AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 100644
index 0000000..10ab284
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1,8388 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2015 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) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# 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 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 58 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.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+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_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _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
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that 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 set != "${COLLECT_NAMES+set}"; 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\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      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\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      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 0 = "$lt_write_fail" && 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 yes = "$silent" &&
+  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 that 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
+# Generated automatically by $as_me ($PACKAGE) $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.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_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 set != "${COLLECT_NAMES+set}"; 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)
+
+   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'
+    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 0 = "$_lt_result"; 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 0 = "$_lt_result" && $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 yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; 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 no = "$lt_cv_ld_force_load"; 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 yes = "$lt_cv_ld_force_load"; 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*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; 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 yes != "$lt_cv_apple_cc_single_mod"; 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 set = "${lt_cv_aix_libpath+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 that will find a shell with a builtin
+# printf (that 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],
+[AS_HELP_STRING([--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 yes = "$GCC"; 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 where 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 no = "$enable_libtool_lock" || 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 what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  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 what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; 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*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  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*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  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"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  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 yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  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*|x86_64-*-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 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; 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
+  bitrig* | 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"  ## exclude from sc_useless_quotes_in_assignment
+   # 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 yes = "[$]$2"; 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 yes = "[$]$2"; 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;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # 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" && \
+       test undefined != "$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 17 != "$i" # 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 yes = "$cross_compiling"; 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 -fvisibility=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 yes != "$enable_dlopen"; 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
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    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 no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && 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 yes = "$lt_cv_dlopen_self"; 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 no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; 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 no = "$hard_links"; 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 where 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 yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; 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 relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; 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_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _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
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; 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`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  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"
+    elif test -n "$lt_multi_os_dir"; then
+      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
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+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 ia64 = "$host_cpu"; 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
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # 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'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # 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'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    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%'\''`; $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$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      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=no
+  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 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  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 yes = "$lt_cv_prog_gnu_ld"; 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
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # 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
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# 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
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) 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* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  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
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  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'
+  ;;
+
+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 yes = "$with_gnu_ld"; 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=sco
+  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 yes = "$with_gnu_ld"; 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 no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_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], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that 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 that 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 no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; 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 yes = "$with_gnu_ld"; 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 no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && 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 yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; 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_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _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
+# that 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.
+  if ( 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* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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
+  ;;
+os2*)
+  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
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    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 no != "$lt_cv_path_NM"; 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 -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      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 one 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 yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# 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 yes = "$GCC"; 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 ia64 = "$host_cpu"; 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
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# 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"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$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"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/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,
+    # D for any global variable and I for any imported 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};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,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 can'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* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$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 yes = "$pipe_works"; 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_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_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_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_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 yes = "$GXX"; 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 ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    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'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    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 ia64 = "$host_cpu"; 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 ia64 != "$host_cpu"; 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 yes = "$GCC"; 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 ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    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'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    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 ia64 = "$host_cpu"; 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
+      ;;
+
+    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'
+      case $cc_basename in
+      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'
+        ;;
+      esac
+      ;;
+
+    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'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    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'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny 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)='-static'
+	;;
+      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 that 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 GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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 yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    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 yes = "$with_gnu_ld"; 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 yes = "$lt_use_gnu_ld_interface"; 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 | $SED -e 's/([^)]\+)\s\+//' 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 ia64 != "$host_cpu"; 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, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $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 linux-dietlibc = "$host_os"; 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 no = "$tmp_diet"
+      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' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-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 yes = "$supports_anon_versioning"; 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
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	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 yes = "$supports_anon_versioning"; 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 cannot
+*** 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 no = "$_LT_TAGVAR(ld_shlibs, $1)"; 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 yes = "$GCC" && 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 ia64 = "$host_cpu"; 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 GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	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,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; 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 yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	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,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; 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 yes = "$with_gnu_ld"; 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
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $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 yes = "$GCC"; 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 "x$output_objdir/$soname" = "x$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 "x$output_objdir/$soname" = "x$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 yes,no = "$GCC,$with_gnu_ld"; 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 no = "$with_gnu_ld"; 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 yes,no = "$GCC,$with_gnu_ld"; 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 no = "$with_gnu_ld"; 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 yes = "$GCC"; 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 yes = "$lt_cv_irix_exported_symbol"; 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
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      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
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    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* | bitrig*)
+      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__`"; 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
+	  _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'
+	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
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; 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 yes = "$GCC"; 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 yes = "$GCC"; 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 yes = "$GCC"; 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 sequent = "$host_vendor"; 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 yes = "$GCC"; 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 CANNOT 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 yes = "$GCC"; 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 sni = "$host_vendor"; 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 no = "$_LT_TAGVAR(ld_shlibs, $1)" && 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 yes,yes = "$GCC,$enable_shared"; 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 what 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    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 yes = "$enable_shared" || 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 no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); 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 yes != "$_lt_caught_CXX_error"; 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 yes = "$GXX"; 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 yes = "$GXX"; 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 yes = "$with_gnu_ld"; 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 ia64 = "$host_cpu"; 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
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          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
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          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,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; 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 yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          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,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; 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 yes = "$with_gnu_ld"; 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
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $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, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
+      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 "x$output_objdir/$soname" = "x$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 yes = "$GXX"; 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 "x$output_objdir/$soname" = "x$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 no = "$with_gnu_ld"; 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 yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; 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 yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; 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 yes = "$supports_anon_versioning"; 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
+	;;
+
+      openbsd* | bitrig*)
+	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__`"; 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 yes,no = "$GXX,$with_gnu_ld"; 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 yes,no = "$GXX,$with_gnu_ld"; 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 $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 $wl-h $wl$soname -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 $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 $wl-h $wl$soname -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 CANNOT 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 no = "$_LT_TAGVAR(ld_shlibs, $1)" && 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 yes != "$_lt_caught_CXX_error"
+
+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 @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@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 x-L = "$p" ||
+          test x-R = "$p"; 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 no = "$pre_test_object_deps_done"; 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 no = "$pre_test_object_deps_done"; 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)=
+  ;;
+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 no = "$F77"; 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 yes != "$_lt_disable_F77"; 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	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 yes = "$enable_shared" || 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 yes != "$_lt_disable_F77"
+
+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 no = "$FC"; 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 yes != "$_lt_disable_FC"; 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	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 yes = "$enable_shared" || 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 yes != "$_lt_disable_FC"
+
+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 set = "${GCJFLAGS+set}" || 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 10 -lt "$lt_ac_count" && 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],
+[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_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what 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..94b0829
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 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_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _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_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _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=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..48bc934
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 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..fa04b52
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2015 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 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_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..c6b26f8
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 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/missing b/missing
index 86a8fc3..f62bbae 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 4191a45..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/modules/DynamicObject/Makefile.am b/modules/DynamicObject/Makefile.am
index 56536cb..2d60cae 100644
--- a/modules/DynamicObject/Makefile.am
+++ b/modules/DynamicObject/Makefile.am
@@ -19,6 +19,9 @@ libseed_DynamicObject_la_LDFLAGS = \
 	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 	$(SEED_PROFILE_LIBS)
 
+libseed_DynamicObject_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la
+
 endif
 
 
diff --git a/modules/DynamicObject/Makefile.in b/modules/DynamicObject/Makefile.in
index 3565e67..31ef2ab 100644
--- a/modules/DynamicObject/Makefile.in
+++ b/modules/DynamicObject/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/DynamicObject
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -90,7 +131,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(seedlibdir)"
 LTLIBRARIES = $(seedlib_LTLIBRARIES)
-libseed_DynamicObject_la_LIBADD =
+@BUILD_DYNAMICOBJECT_MODULE_TRUE@libseed_DynamicObject_la_DEPENDENCIES = $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la
 am__libseed_DynamicObject_la_SOURCES_DIST = seed-DynamicObject.c
 @BUILD_DYNAMICOBJECT_MODULE_TRUE@am_libseed_DynamicObject_la_OBJECTS =  \
 @BUILD_DYNAMICOBJECT_MODULE_TRUE@	seed-DynamicObject.lo
@@ -99,12 +140,25 @@ libseed_DynamicObject_la_OBJECTS =  \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_DynamicObject_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_DynamicObject_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_DYNAMICOBJECT_MODULE_TRUE@am_libseed_DynamicObject_la_rpath =  \
 @BUILD_DYNAMICOBJECT_MODULE_TRUE@	-rpath $(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -117,20 +171,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_DynamicObject_la_SOURCES)
 DIST_SOURCES = $(am__libseed_DynamicObject_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,8 +188,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -203,6 +271,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -216,6 +286,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -239,8 +310,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -252,6 +332,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -346,6 +427,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -372,6 +454,9 @@ top_srcdir = @top_srcdir@
 @BUILD_DYNAMICOBJECT_MODULE_TRUE@	$(GOBJECT_INTROSPECTION_LDFLAGS) \
 @BUILD_DYNAMICOBJECT_MODULE_TRUE@	$(SEED_PROFILE_LIBS)
 
+@BUILD_DYNAMICOBJECT_MODULE_TRUE@libseed_DynamicObject_la_LIBADD = \
+@BUILD_DYNAMICOBJECT_MODULE_TRUE@	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la
+
 all: all-am
 
 .SUFFIXES:
@@ -388,7 +473,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/DynamicObject/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/DynamicObject/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -406,6 +490,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -432,12 +517,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_DynamicObject.la: $(libseed_DynamicObject_la_OBJECTS) $(libseed_DynamicObject_la_DEPENDENCIES) $(EXTRA_libseed_DynamicObject_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_DynamicObject_la_LINK) $(am_libseed_DynamicObject_la_rpath) $(libseed_DynamicObject_la_OBJECTS) $(libseed_DynamicObject_la_LIBADD) $(LIBS)
 
@@ -454,14 +542,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -476,26 +564,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -507,15 +584,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -524,6 +597,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -668,19 +756,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/DynamicObject/seed-DynamicObject.c b/modules/DynamicObject/seed-DynamicObject.c
index 3b22a12..a14b4bc 100644
--- a/modules/DynamicObject/seed-DynamicObject.c
+++ b/modules/DynamicObject/seed-DynamicObject.c
@@ -5,7 +5,7 @@ this 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 of
 the License, or (at your option) any later version.
- 
+
 Copyright (C) 2010 Jonatan Liljedahl <lijon@kymatica.com>
 
 --------------------------------------------------------------------------------
@@ -13,7 +13,7 @@ Copyright (C) 2010 Jonatan Liljedahl <lijon@kymatica.com>
 Compile with:
 
 gcc -shared -fPIC seed-DynamicObject.c -I/usr/local/include/seed \
-    `pkg-config --cflags --libs glib-2.0 gmodule-2.0 gobject-introspection-1.0` \
+    `pkg-config --cflags --libs glib-2.0 gmodule-2.0 gobject-introspection-1.0`\
     -o libseed_DynamicObject.so
 
 Usage:
@@ -57,137 +57,144 @@ You can also create the object first and set the callbacks later:
 static SeedClass dynamic_object_class;
 
 static SeedValue
-seed_dynamic_object_create (SeedContext ctx,
-                            SeedObject function,
-                            SeedObject this_object,
-                            gsize argument_count,
-                            const SeedValue arguments[],
-                            SeedException *exception)
+seed_dynamic_object_create(SeedContext ctx,
+                           SeedObject function,
+                           SeedObject this_object,
+                           gsize argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-    SeedObject obj = seed_make_object (ctx, dynamic_object_class, NULL);
+    SeedObject obj = seed_make_object(ctx, dynamic_object_class, NULL);
     if (argument_count > 0)
-        seed_object_set_property (ctx, obj, "__proto__", arguments[0]);
+        seed_object_set_property(ctx, obj, "__proto__", arguments[0]);
 
-    return (SeedValue)obj;
+    return (SeedValue) obj;
 }
 
 static SeedValue
-seed_dynamic_object_get_property (SeedContext ctx,
-                                  SeedObject object,
-                                  SeedString property_name,
-                                  SeedException *exception)
+seed_dynamic_object_get_property(SeedContext ctx,
+                                 SeedObject object,
+                                 SeedString property_name,
+                                 SeedException* exception)
 {
-    guint len = seed_string_get_maximum_size (property_name);
-    gchar *prop = g_alloca (len * sizeof (gchar));
-    seed_string_to_utf8_buffer (property_name, prop, len);
+    guint len = seed_string_get_maximum_size(property_name);
+    gchar* prop = g_alloca(len * sizeof(gchar));
+    seed_string_to_utf8_buffer(property_name, prop, len);
 
     // forward these to ordinary property lookup
-    if (!g_strcmp0 (prop, "toString"))
+    if (!g_strcmp0(prop, "toString"))
         return NULL;
-    if (!g_strcmp0 (prop, "valueOf"))
+    if (!g_strcmp0(prop, "valueOf"))
         return NULL;
-    if (!g_strcmp0 (prop, "getProperty"))
+    if (!g_strcmp0(prop, "getProperty"))
         return NULL;
-    if (!g_strcmp0 (prop, "setProperty"))
+    if (!g_strcmp0(prop, "setProperty"))
         return NULL;
-    if (!g_strcmp0 (prop, "deleteProperty"))
+    if (!g_strcmp0(prop, "deleteProperty"))
         return NULL;
-    if (!g_strcmp0 (prop, "callAsFunction"))
+    if (!g_strcmp0(prop, "callAsFunction"))
         return NULL;
-    if (!g_strcmp0 (prop, "callAsConstructor"))
+    if (!g_strcmp0(prop, "callAsConstructor"))
         return NULL;
 
-    SeedValue handler = seed_object_get_property (ctx, object, "getProperty");
-    if (seed_value_is_object (ctx, handler)) {
-        SeedValue args[1] = { seed_value_from_string (ctx, prop, exception) };
-        SeedValue ret = (SeedValue) seed_object_call (ctx, (SeedObject)handler, NULL, 1, args, exception);
-        return seed_value_is_null(ctx,ret)?NULL:ret;
+    SeedValue handler = seed_object_get_property(ctx, object, "getProperty");
+    if (seed_value_is_object(ctx, handler)) {
+        SeedValue args[1] = { seed_value_from_string(ctx, prop, exception) };
+        SeedValue ret = (SeedValue) seed_object_call(ctx, (SeedObject) handler,
+                                                     NULL, 1, args, exception);
+        return seed_value_is_null(ctx, ret) ? NULL : ret;
     }
 
     return NULL;
 }
 
 static gboolean
-seed_dynamic_object_set_property (SeedContext ctx,
-                                  SeedObject object,
-                                  SeedString property_name,
-                                  SeedValue value,
-                                  SeedException *exception)
+seed_dynamic_object_set_property(SeedContext ctx,
+                                 SeedObject object,
+                                 SeedString property_name,
+                                 SeedValue value,
+                                 SeedException* exception)
 {
-    guint len = seed_string_get_maximum_size (property_name);
-    gchar *prop = g_alloca (len * sizeof (gchar));
-    seed_string_to_utf8_buffer (property_name, prop, len);
-
-    SeedValue handler = seed_object_get_property (ctx, object, "setProperty");
-    if (seed_value_is_object (ctx, handler)) {
-        SeedValue args[2] = {
-            seed_value_from_string (ctx, prop, exception),
-            value};
-        SeedValue ret = seed_object_call (ctx, (SeedObject)handler, NULL, 2, args, exception);
-        return seed_value_to_boolean (ctx, ret, exception);
+    guint len = seed_string_get_maximum_size(property_name);
+    gchar* prop = g_alloca(len * sizeof(gchar));
+    seed_string_to_utf8_buffer(property_name, prop, len);
+
+    SeedValue handler = seed_object_get_property(ctx, object, "setProperty");
+    if (seed_value_is_object(ctx, handler)) {
+        SeedValue args[2]
+          = { seed_value_from_string(ctx, prop, exception), value };
+        SeedValue ret = seed_object_call(ctx, (SeedObject) handler, NULL, 2,
+                                         args, exception);
+        return seed_value_to_boolean(ctx, ret, exception);
     }
 
     return FALSE;
 }
 
-static gboolean 
-seed_dynamic_object_delete_property (SeedContext ctx,
-                                     SeedObject object,
-                                     SeedString property_name,
-                                     SeedException *exception)
+static gboolean
+seed_dynamic_object_delete_property(SeedContext ctx,
+                                    SeedObject object,
+                                    SeedString property_name,
+                                    SeedException* exception)
 {
-    guint len = seed_string_get_maximum_size (property_name);
-    gchar *prop = g_alloca (len * sizeof (gchar));
-    seed_string_to_utf8_buffer (property_name, prop, len);
-
-    SeedValue handler = seed_object_get_property (ctx, object, "deleteProperty");
-    if (seed_value_is_object (ctx, handler)) {
-        SeedValue args[1] = { seed_value_from_string (ctx, prop, exception) };
-        SeedValue ret = (SeedValue) seed_object_call (ctx, (SeedObject)handler, NULL, 1, args, exception);
-        return seed_value_to_boolean (ctx, ret, exception);
+    guint len = seed_string_get_maximum_size(property_name);
+    gchar* prop = g_alloca(len * sizeof(gchar));
+    seed_string_to_utf8_buffer(property_name, prop, len);
+
+    SeedValue handler = seed_object_get_property(ctx, object, "deleteProperty");
+    if (seed_value_is_object(ctx, handler)) {
+        SeedValue args[1] = { seed_value_from_string(ctx, prop, exception) };
+        SeedValue ret = (SeedValue) seed_object_call(ctx, (SeedObject) handler,
+                                                     NULL, 1, args, exception);
+        return seed_value_to_boolean(ctx, ret, exception);
     }
     return FALSE;
-
 }
 
 static SeedValue
-seed_dynamic_object_call_as_function (SeedContext ctx,
-                                      SeedObject function,
-                                      SeedObject this_object,
-                                      size_t argument_count,
-                                      const SeedValue arguments[],
-                                      SeedException *exception)
+seed_dynamic_object_call_as_function(SeedContext ctx,
+                                     SeedObject function,
+                                     SeedObject this_object,
+                                     size_t argument_count,
+                                     const SeedValue arguments[],
+                                     SeedException* exception)
 {
-    SeedValue handler = seed_object_get_property (ctx, function, "callAsFunction");
-    if (seed_value_is_object (ctx, handler)) {
-        return (SeedValue) seed_object_call (ctx, (SeedObject)handler, NULL, argument_count, arguments, exception);
+    SeedValue handler
+      = seed_object_get_property(ctx, function, "callAsFunction");
+    if (seed_value_is_object(ctx, handler)) {
+        return (SeedValue) seed_object_call(ctx, (SeedObject) handler, NULL,
+                                            argument_count, arguments,
+                                            exception);
     }
     return NULL;
 }
 
 static SeedValue
-seed_dynamic_object_call_as_constructor (SeedContext ctx,
-                                         SeedObject function,
-                                         size_t argument_count,
-                                         const SeedValue arguments[],
-                                         SeedException *exception)
+seed_dynamic_object_call_as_constructor(SeedContext ctx,
+                                        SeedObject function,
+                                        size_t argument_count,
+                                        const SeedValue arguments[],
+                                        SeedException* exception)
 {
-    SeedValue handler = seed_object_get_property (ctx, function, "callAsConstructor");
-    if (seed_value_is_object (ctx, handler)) {
-        return (SeedValue) seed_object_call (ctx, (SeedObject)handler, NULL, argument_count, arguments, exception);
+    SeedValue handler
+      = seed_object_get_property(ctx, function, "callAsConstructor");
+    if (seed_value_is_object(ctx, handler)) {
+        return (SeedValue) seed_object_call(ctx, (SeedObject) handler, NULL,
+                                            argument_count, arguments,
+                                            exception);
     }
     return NULL;
 }
 
-//static void
-//seed_dynamic_object_get_property_names (SeedContext ctx,
+// static void
+// seed_dynamic_object_get_property_names (SeedContext ctx,
 //                                        SeedObject object,
 //                                        /*wait for API*/ propertyNames)
 
 SeedObject
-seed_module_init (SeedEngine * eng)
+seed_module_init(SeedEngine* eng)
 {
-    SeedObject namespace_ref = seed_make_object (eng->context, NULL, NULL);
+    SeedObject namespace_ref = seed_make_object(eng->context, NULL, NULL);
     seed_class_definition class_def = seed_empty_class;
 
     class_def.class_name = "DynamicObject";
@@ -196,10 +203,11 @@ seed_module_init (SeedEngine * eng)
     class_def.delete_property = seed_dynamic_object_delete_property;
     class_def.call_as_function = seed_dynamic_object_call_as_function;
     class_def.call_as_constructor = seed_dynamic_object_call_as_constructor;
-     
-    dynamic_object_class = seed_create_class (&class_def);
 
-    seed_create_function(eng->context, "create", (SeedFunctionCallback)seed_dynamic_object_create, namespace_ref);
+    dynamic_object_class = seed_create_class(&class_def);
+
+    seed_create_function(eng->context, "create",
+                         (SeedFunctionCallback) seed_dynamic_object_create,
+                         namespace_ref);
     return namespace_ref;
 }
-
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 7a99ba2..d363381 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = example sqlite canvas multiprocessing readline os sandbox dbus libxml cairo gtkbuilder gettext mpfr ffi DynamicObject xorg
+
+SUBDIRS += gjs
diff --git a/modules/Makefile.in b/modules/Makefile.in
index a918c46..b456f48 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,30 +88,41 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -82,12 +130,33 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -176,6 +245,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -189,6 +260,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -212,8 +284,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -225,6 +306,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -319,6 +401,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -327,7 +410,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = example sqlite canvas multiprocessing readline os sandbox dbus libxml cairo gtkbuilder gettext mpfr ffi DynamicObject xorg
+SUBDIRS = example sqlite canvas multiprocessing readline os sandbox \
+	dbus libxml cairo gtkbuilder gettext mpfr ffi DynamicObject \
+	xorg gjs
 all: all-recursive
 
 .SUFFIXES:
@@ -343,7 +428,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -369,22 +453,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -399,57 +486,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -465,12 +507,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -482,15 +519,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -499,6 +532,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -659,22 +707,22 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/cairo/Makefile.in b/modules/cairo/Makefile.in
index 38694d2..b29dcb2 100644
--- a/modules/cairo/Makefile.in
+++ b/modules/cairo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/cairo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -110,12 +151,25 @@ libseed_cairo_la_OBJECTS = $(am_libseed_cairo_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_cairo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_cairo_la_CFLAGS) $(CFLAGS) \
 	$(libseed_cairo_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_CAIRO_MODULE_TRUE@am_libseed_cairo_la_rpath = -rpath \
 @BUILD_CAIRO_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -128,20 +182,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_cairo_la_SOURCES)
 DIST_SOURCES = $(am__libseed_cairo_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -149,8 +199,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -214,6 +282,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -227,6 +297,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -250,8 +321,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -263,6 +343,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -357,6 +438,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -423,7 +505,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/cairo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/cairo/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -441,6 +522,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -467,12 +549,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_cairo.la: $(libseed_cairo_la_OBJECTS) $(libseed_cairo_la_DEPENDENCIES) $(EXTRA_libseed_cairo_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_cairo_la_LINK) $(am_libseed_cairo_la_rpath) $(libseed_cairo_la_OBJECTS) $(libseed_cairo_la_LIBADD) $(LIBS)
 
@@ -495,14 +580,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -566,26 +651,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -597,15 +671,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -614,6 +684,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -758,19 +843,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/cairo/seed-cairo-enums.c b/modules/cairo/seed-cairo-enums.c
index dbc75ff..9afb3b6 100644
--- a/modules/cairo/seed-cairo-enums.c
+++ b/modules/cairo/seed-cairo-enums.c
@@ -21,124 +21,135 @@
 #include <cairo/cairo.h>
 #include "seed-cairo.h"
 
-#define ENUM_MEMBER(holder, name, value)				\
-  seed_object_set_property (ctx, holder, name, seed_value_from_long (ctx, value, NULL))
+#define ENUM_MEMBER(holder, name, value)                                       \
+    seed_object_set_property(ctx, holder, name,                                \
+                             seed_value_from_long(ctx, value, NULL))
 
 SeedValue
-seed_cairo_status_to_string (SeedContext ctx,
-			     SeedObject function,
-			     SeedObject this_object,
-			     gsize argument_count,
-			     const SeedValue arguments[],
-			     SeedException *exception)
+seed_cairo_status_to_string(SeedContext ctx,
+                            SeedObject function,
+                            SeedObject this_object,
+                            gsize argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  cairo_status_t status;
+    cairo_status_t status;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("status_to_string", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("status_to_string", "1 argument");
     }
-  status = seed_value_to_long (ctx, arguments[0], exception);
+    status = seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_string (ctx, cairo_status_to_string (status), exception);
+    return seed_value_from_string(ctx, cairo_status_to_string(status),
+                                  exception);
 }
 
 void
-seed_define_cairo_enums (SeedContext ctx,
-			 SeedObject namespace_ref)
+seed_define_cairo_enums(SeedContext ctx, SeedObject namespace_ref)
 {
-  SeedObject content_holder, format_holder, antialias_holder, fillrule_holder,
-    linecap_holder, linejoin_holder, operator_holder, status_holder;
-
-  content_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Content", content_holder);
-  ENUM_MEMBER(content_holder, "COLOR", CAIRO_CONTENT_COLOR);
-  ENUM_MEMBER(content_holder, "ALPHA", CAIRO_CONTENT_ALPHA);
-  ENUM_MEMBER(content_holder, "COLOR_ALPHA", CAIRO_CONTENT_COLOR_ALPHA);
-
-  format_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Format", format_holder);
-  ENUM_MEMBER(format_holder, "ARGB32", CAIRO_FORMAT_ARGB32);
-  ENUM_MEMBER(format_holder, "RGB23", CAIRO_FORMAT_RGB24);
-  ENUM_MEMBER(format_holder, "A8", CAIRO_FORMAT_A8);
-  ENUM_MEMBER(format_holder, "A1", CAIRO_FORMAT_A1);
-
-  antialias_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Antialias", antialias_holder);
-  ENUM_MEMBER(antialias_holder, "DEFAULT", CAIRO_ANTIALIAS_DEFAULT);
-  ENUM_MEMBER(antialias_holder, "NONE", CAIRO_ANTIALIAS_NONE);
-  ENUM_MEMBER(antialias_holder, "GRAY", CAIRO_ANTIALIAS_GRAY);
-  ENUM_MEMBER(antialias_holder, "SUBPIXEL", CAIRO_ANTIALIAS_SUBPIXEL);
-
-  fillrule_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Fillrule", fillrule_holder);
-  ENUM_MEMBER(fillrule_holder, "WINDING", CAIRO_FILL_RULE_WINDING);
-  ENUM_MEMBER(fillrule_holder, "EVEN_ODD", CAIRO_FILL_RULE_EVEN_ODD);
-
-  linecap_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Linecap", linecap_holder);
-  ENUM_MEMBER(linecap_holder, "BUTT", CAIRO_LINE_CAP_BUTT);
-  ENUM_MEMBER(linecap_holder, "ROUND", CAIRO_LINE_CAP_ROUND);
-  ENUM_MEMBER(linecap_holder, "SQUARE", CAIRO_LINE_CAP_SQUARE);
-
-  linejoin_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Linejoin", linejoin_holder);
-  ENUM_MEMBER(linejoin_holder, "MITER", CAIRO_LINE_JOIN_MITER);
-  ENUM_MEMBER(linejoin_holder, "ROUND", CAIRO_LINE_JOIN_ROUND);
-  ENUM_MEMBER(linejoin_holder, "BEVEL", CAIRO_LINE_JOIN_BEVEL);
-
-
-  operator_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Operator", operator_holder);
-  ENUM_MEMBER(operator_holder, "CLEAR", CAIRO_OPERATOR_CLEAR);
-  ENUM_MEMBER(operator_holder, "SOURCE", CAIRO_OPERATOR_SOURCE);
-  ENUM_MEMBER(operator_holder, "OVER", CAIRO_OPERATOR_OVER);
-  ENUM_MEMBER(operator_holder, "IN", CAIRO_OPERATOR_IN);
-  ENUM_MEMBER(operator_holder, "OUT", CAIRO_OPERATOR_OUT);
-  ENUM_MEMBER(operator_holder, "ATOP", CAIRO_OPERATOR_ATOP);
-  ENUM_MEMBER(operator_holder, "DEST", CAIRO_OPERATOR_DEST);
-  ENUM_MEMBER(operator_holder, "DEST_OVER", CAIRO_OPERATOR_DEST_OVER);
-  ENUM_MEMBER(operator_holder, "DEST_IN", CAIRO_OPERATOR_DEST_IN);
-  ENUM_MEMBER(operator_holder, "DEST_OUT", CAIRO_OPERATOR_DEST_OUT);
-  ENUM_MEMBER(operator_holder, "DEST_ATOP", CAIRO_OPERATOR_DEST_ATOP);
-  ENUM_MEMBER(operator_holder, "XOR", CAIRO_OPERATOR_XOR);
-  ENUM_MEMBER(operator_holder, "ADD", CAIRO_OPERATOR_ADD);
-  ENUM_MEMBER(operator_holder, "SATURATE", CAIRO_OPERATOR_SATURATE);
-
-  status_holder = seed_make_object (ctx, NULL, NULL);
-  seed_object_set_property (ctx, namespace_ref, "Status", status_holder);
-  ENUM_MEMBER(status_holder, "SUCCESS", CAIRO_STATUS_SUCCESS);
-  ENUM_MEMBER(status_holder, "NO_MEMORY", CAIRO_STATUS_NO_MEMORY);
-  ENUM_MEMBER(status_holder, "INVALID_RESTORE", CAIRO_STATUS_INVALID_RESTORE);
-  ENUM_MEMBER(status_holder, "INVALID_POP_GROUP", CAIRO_STATUS_INVALID_POP_GROUP);
-  ENUM_MEMBER(status_holder, "NO_CURRENT_POINT", CAIRO_STATUS_NO_CURRENT_POINT);
-  ENUM_MEMBER(status_holder, "INVALID_MATRIX", CAIRO_STATUS_INVALID_MATRIX);
-  ENUM_MEMBER(status_holder, "INVALID_STATUS", CAIRO_STATUS_INVALID_STATUS);
-  ENUM_MEMBER(status_holder, "NULL_POINTER", CAIRO_STATUS_NULL_POINTER);
-  ENUM_MEMBER(status_holder, "INVALID_STRING", CAIRO_STATUS_INVALID_STRING);
-  ENUM_MEMBER(status_holder, "INVALID_PATH_DATA", CAIRO_STATUS_INVALID_PATH_DATA);
-  ENUM_MEMBER(status_holder, "READ_ERROR", CAIRO_STATUS_READ_ERROR);
-  ENUM_MEMBER(status_holder, "WRITE_ERROR", CAIRO_STATUS_WRITE_ERROR);
-  ENUM_MEMBER(status_holder, "SURFACE_FINISHED", CAIRO_STATUS_SURFACE_FINISHED);
-  ENUM_MEMBER(status_holder, "SURFACE_TYPE_MISMATCH", CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
-  ENUM_MEMBER(status_holder, "PATTERN_TYPE_MISMATCH", CAIRO_STATUS_PATTERN_TYPE_MISMATCH);
-  ENUM_MEMBER(status_holder, "INVALID_CONTENT", CAIRO_STATUS_INVALID_CONTENT);
-  ENUM_MEMBER(status_holder, "INVALID_FORMAT", CAIRO_STATUS_INVALID_FORMAT);
-  ENUM_MEMBER(status_holder, "INVALID_VISUAL", CAIRO_STATUS_INVALID_VISUAL);
-  ENUM_MEMBER(status_holder, "FILE_NOT_FOUND", CAIRO_STATUS_FILE_NOT_FOUND);
-  ENUM_MEMBER(status_holder, "INVALID_DASH", CAIRO_STATUS_INVALID_DASH);
-  ENUM_MEMBER(status_holder, "INVALID_DSC_COMMENT", CAIRO_STATUS_INVALID_DSC_COMMENT);
-  ENUM_MEMBER(status_holder, "INVALID_INDEX", CAIRO_STATUS_INVALID_INDEX);
-  ENUM_MEMBER(status_holder, "CLIP_NOT_REPRESENTABLE", CAIRO_STATUS_CLIP_NOT_REPRESENTABLE);
-  ENUM_MEMBER(status_holder, "TEMP_FILE_ERROR", CAIRO_STATUS_TEMP_FILE_ERROR);
-  ENUM_MEMBER(status_holder, "INVALID_STRIDE", CAIRO_STATUS_INVALID_STRIDE);
-  ENUM_MEMBER(status_holder, "FONT_TYPE_MISMATCH", CAIRO_STATUS_FONT_TYPE_MISMATCH);
-  ENUM_MEMBER(status_holder, "USER_FONT_IMMUTABLE", CAIRO_STATUS_USER_FONT_IMMUTABLE);
-  ENUM_MEMBER(status_holder, "USER_FONT_ERROR", CAIRO_STATUS_USER_FONT_ERROR);
-  ENUM_MEMBER(status_holder, "NEGATIVE_COUNT", CAIRO_STATUS_NEGATIVE_COUNT);
-  ENUM_MEMBER(status_holder, "INVALID_CLUSTERS", CAIRO_STATUS_INVALID_CLUSTERS);
-  ENUM_MEMBER(status_holder, "INVALID_SLANT", CAIRO_STATUS_INVALID_SLANT);
-  ENUM_MEMBER(status_holder, "INVALID_WEIGHT", CAIRO_STATUS_INVALID_WEIGHT);
-
-  seed_create_function (ctx, "to_string", seed_cairo_status_to_string, status_holder);
+    SeedObject content_holder, format_holder, antialias_holder, fillrule_holder,
+      linecap_holder, linejoin_holder, operator_holder, status_holder;
+
+    content_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Content", content_holder);
+    ENUM_MEMBER(content_holder, "COLOR", CAIRO_CONTENT_COLOR);
+    ENUM_MEMBER(content_holder, "ALPHA", CAIRO_CONTENT_ALPHA);
+    ENUM_MEMBER(content_holder, "COLOR_ALPHA", CAIRO_CONTENT_COLOR_ALPHA);
+
+    format_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Format", format_holder);
+    ENUM_MEMBER(format_holder, "ARGB32", CAIRO_FORMAT_ARGB32);
+    ENUM_MEMBER(format_holder, "RGB23", CAIRO_FORMAT_RGB24);
+    ENUM_MEMBER(format_holder, "A8", CAIRO_FORMAT_A8);
+    ENUM_MEMBER(format_holder, "A1", CAIRO_FORMAT_A1);
+
+    antialias_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Antialias", antialias_holder);
+    ENUM_MEMBER(antialias_holder, "DEFAULT", CAIRO_ANTIALIAS_DEFAULT);
+    ENUM_MEMBER(antialias_holder, "NONE", CAIRO_ANTIALIAS_NONE);
+    ENUM_MEMBER(antialias_holder, "GRAY", CAIRO_ANTIALIAS_GRAY);
+    ENUM_MEMBER(antialias_holder, "SUBPIXEL", CAIRO_ANTIALIAS_SUBPIXEL);
+
+    fillrule_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Fillrule", fillrule_holder);
+    ENUM_MEMBER(fillrule_holder, "WINDING", CAIRO_FILL_RULE_WINDING);
+    ENUM_MEMBER(fillrule_holder, "EVEN_ODD", CAIRO_FILL_RULE_EVEN_ODD);
+
+    linecap_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Linecap", linecap_holder);
+    ENUM_MEMBER(linecap_holder, "BUTT", CAIRO_LINE_CAP_BUTT);
+    ENUM_MEMBER(linecap_holder, "ROUND", CAIRO_LINE_CAP_ROUND);
+    ENUM_MEMBER(linecap_holder, "SQUARE", CAIRO_LINE_CAP_SQUARE);
+
+    linejoin_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Linejoin", linejoin_holder);
+    ENUM_MEMBER(linejoin_holder, "MITER", CAIRO_LINE_JOIN_MITER);
+    ENUM_MEMBER(linejoin_holder, "ROUND", CAIRO_LINE_JOIN_ROUND);
+    ENUM_MEMBER(linejoin_holder, "BEVEL", CAIRO_LINE_JOIN_BEVEL);
+
+    operator_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Operator", operator_holder);
+    ENUM_MEMBER(operator_holder, "CLEAR", CAIRO_OPERATOR_CLEAR);
+    ENUM_MEMBER(operator_holder, "SOURCE", CAIRO_OPERATOR_SOURCE);
+    ENUM_MEMBER(operator_holder, "OVER", CAIRO_OPERATOR_OVER);
+    ENUM_MEMBER(operator_holder, "IN", CAIRO_OPERATOR_IN);
+    ENUM_MEMBER(operator_holder, "OUT", CAIRO_OPERATOR_OUT);
+    ENUM_MEMBER(operator_holder, "ATOP", CAIRO_OPERATOR_ATOP);
+    ENUM_MEMBER(operator_holder, "DEST", CAIRO_OPERATOR_DEST);
+    ENUM_MEMBER(operator_holder, "DEST_OVER", CAIRO_OPERATOR_DEST_OVER);
+    ENUM_MEMBER(operator_holder, "DEST_IN", CAIRO_OPERATOR_DEST_IN);
+    ENUM_MEMBER(operator_holder, "DEST_OUT", CAIRO_OPERATOR_DEST_OUT);
+    ENUM_MEMBER(operator_holder, "DEST_ATOP", CAIRO_OPERATOR_DEST_ATOP);
+    ENUM_MEMBER(operator_holder, "XOR", CAIRO_OPERATOR_XOR);
+    ENUM_MEMBER(operator_holder, "ADD", CAIRO_OPERATOR_ADD);
+    ENUM_MEMBER(operator_holder, "SATURATE", CAIRO_OPERATOR_SATURATE);
+
+    status_holder = seed_make_object(ctx, NULL, NULL);
+    seed_object_set_property(ctx, namespace_ref, "Status", status_holder);
+    ENUM_MEMBER(status_holder, "SUCCESS", CAIRO_STATUS_SUCCESS);
+    ENUM_MEMBER(status_holder, "NO_MEMORY", CAIRO_STATUS_NO_MEMORY);
+    ENUM_MEMBER(status_holder, "INVALID_RESTORE", CAIRO_STATUS_INVALID_RESTORE);
+    ENUM_MEMBER(status_holder, "INVALID_POP_GROUP",
+                CAIRO_STATUS_INVALID_POP_GROUP);
+    ENUM_MEMBER(status_holder, "NO_CURRENT_POINT",
+                CAIRO_STATUS_NO_CURRENT_POINT);
+    ENUM_MEMBER(status_holder, "INVALID_MATRIX", CAIRO_STATUS_INVALID_MATRIX);
+    ENUM_MEMBER(status_holder, "INVALID_STATUS", CAIRO_STATUS_INVALID_STATUS);
+    ENUM_MEMBER(status_holder, "NULL_POINTER", CAIRO_STATUS_NULL_POINTER);
+    ENUM_MEMBER(status_holder, "INVALID_STRING", CAIRO_STATUS_INVALID_STRING);
+    ENUM_MEMBER(status_holder, "INVALID_PATH_DATA",
+                CAIRO_STATUS_INVALID_PATH_DATA);
+    ENUM_MEMBER(status_holder, "READ_ERROR", CAIRO_STATUS_READ_ERROR);
+    ENUM_MEMBER(status_holder, "WRITE_ERROR", CAIRO_STATUS_WRITE_ERROR);
+    ENUM_MEMBER(status_holder, "SURFACE_FINISHED",
+                CAIRO_STATUS_SURFACE_FINISHED);
+    ENUM_MEMBER(status_holder, "SURFACE_TYPE_MISMATCH",
+                CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    ENUM_MEMBER(status_holder, "PATTERN_TYPE_MISMATCH",
+                CAIRO_STATUS_PATTERN_TYPE_MISMATCH);
+    ENUM_MEMBER(status_holder, "INVALID_CONTENT", CAIRO_STATUS_INVALID_CONTENT);
+    ENUM_MEMBER(status_holder, "INVALID_FORMAT", CAIRO_STATUS_INVALID_FORMAT);
+    ENUM_MEMBER(status_holder, "INVALID_VISUAL", CAIRO_STATUS_INVALID_VISUAL);
+    ENUM_MEMBER(status_holder, "FILE_NOT_FOUND", CAIRO_STATUS_FILE_NOT_FOUND);
+    ENUM_MEMBER(status_holder, "INVALID_DASH", CAIRO_STATUS_INVALID_DASH);
+    ENUM_MEMBER(status_holder, "INVALID_DSC_COMMENT",
+                CAIRO_STATUS_INVALID_DSC_COMMENT);
+    ENUM_MEMBER(status_holder, "INVALID_INDEX", CAIRO_STATUS_INVALID_INDEX);
+    ENUM_MEMBER(status_holder, "CLIP_NOT_REPRESENTABLE",
+                CAIRO_STATUS_CLIP_NOT_REPRESENTABLE);
+    ENUM_MEMBER(status_holder, "TEMP_FILE_ERROR", CAIRO_STATUS_TEMP_FILE_ERROR);
+    ENUM_MEMBER(status_holder, "INVALID_STRIDE", CAIRO_STATUS_INVALID_STRIDE);
+    ENUM_MEMBER(status_holder, "FONT_TYPE_MISMATCH",
+                CAIRO_STATUS_FONT_TYPE_MISMATCH);
+    ENUM_MEMBER(status_holder, "USER_FONT_IMMUTABLE",
+                CAIRO_STATUS_USER_FONT_IMMUTABLE);
+    ENUM_MEMBER(status_holder, "USER_FONT_ERROR", CAIRO_STATUS_USER_FONT_ERROR);
+    ENUM_MEMBER(status_holder, "NEGATIVE_COUNT", CAIRO_STATUS_NEGATIVE_COUNT);
+    ENUM_MEMBER(status_holder, "INVALID_CLUSTERS",
+                CAIRO_STATUS_INVALID_CLUSTERS);
+    ENUM_MEMBER(status_holder, "INVALID_SLANT", CAIRO_STATUS_INVALID_SLANT);
+    ENUM_MEMBER(status_holder, "INVALID_WEIGHT", CAIRO_STATUS_INVALID_WEIGHT);
+
+    seed_create_function(ctx, "to_string", seed_cairo_status_to_string,
+                         status_holder);
 }
diff --git a/modules/cairo/seed-cairo-enums.h b/modules/cairo/seed-cairo-enums.h
index 4ae0b59..24c6943 100644
--- a/modules/cairo/seed-cairo-enums.h
+++ b/modules/cairo/seed-cairo-enums.h
@@ -1,5 +1,5 @@
 #ifndef _SEED_CAIRO_ENUMS_H
 #define _SEED_CAIRO_ENUMS_H
-void seed_define_cairo_enums (SeedContext ctx, SeedObject namespace_ref);
+void seed_define_cairo_enums(SeedContext ctx, SeedObject namespace_ref);
 
 #endif
diff --git a/modules/cairo/seed-cairo-image-surface.c b/modules/cairo/seed-cairo-image-surface.c
index 1c68abf..ccc871a 100644
--- a/modules/cairo/seed-cairo-image-surface.c
+++ b/modules/cairo/seed-cairo-image-surface.c
@@ -23,131 +23,157 @@
 #include "seed-cairo.h"
 #include "seed-cairo-surface.h"
 
-#define CAIRO_SURFACE_PRIV(obj) ((cairo_surface_t *)seed_object_get_private(obj))
-
-#define CHECK_SURFACE(obj) ({					\
-      if (!seed_object_is_of_class (ctx, obj, seed_cairo_image_surface_class)){	\
-	seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Surface"); \
-	return seed_make_undefined (ctx);					\
-      }									\
-      if (!seed_object_get_private (obj)){				\
-	seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); \
-	return seed_make_undefined (ctx);}})
-
-#define CHECK_THIS() if (!seed_object_get_private (this_object)){	\
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); \
-    return seed_make_undefined (ctx);}
+#define CAIRO_SURFACE_PRIV(obj)                                                \
+    ((cairo_surface_t*) seed_object_get_private(obj))
+
+#define CHECK_SURFACE(obj)                                                     \
+    ({                                                                         \
+        if (!seed_object_is_of_class(ctx, obj,                                 \
+                                     seed_cairo_image_surface_class)) {        \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Object is not a Cairo Surface");              \
+            return seed_make_undefined(ctx);                                   \
+        }                                                                      \
+        if (!seed_object_get_private(obj)) {                                   \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Cairo surface has been destroyed");           \
+            return seed_make_undefined(ctx);                                   \
+        }                                                                      \
+    })
+
+#define CHECK_THIS()                                                           \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo surface has been destroyed");               \
+        return seed_make_undefined(ctx);                                       \
+    }
 
 SeedClass seed_cairo_image_surface_class;
 SeedObject image_surface_constructor_ref;
 
-
 static SeedObject
-seed_object_from_cairo_image_surface (SeedContext ctx, cairo_surface_t *surf)
+seed_object_from_cairo_image_surface(SeedContext ctx, cairo_surface_t* surf)
 {
-  SeedObject jsobj;
+    SeedObject jsobj;
 
-  jsobj = cairo_surface_get_user_data (surf, seed_get_cairo_key());
-  if (jsobj)
-    return jsobj;
+    jsobj = cairo_surface_get_user_data(surf, seed_get_cairo_key());
+    if (jsobj)
+        return jsobj;
 
-  jsobj = seed_make_object (ctx, seed_cairo_image_surface_class, surf);
-  cairo_surface_set_user_data (surf, seed_get_cairo_key(), jsobj, seed_cairo_destroy_func);
-  return jsobj;
+    jsobj = seed_make_object(ctx, seed_cairo_image_surface_class, surf);
+    cairo_surface_set_user_data(surf, seed_get_cairo_key(), jsobj,
+                                seed_cairo_destroy_func);
+    return jsobj;
 }
 
 static SeedValue
-seed_cairo_image_surface_get_format (SeedContext ctx,
-				     SeedObject this_object,
-				     SeedString property_name,
-				     SeedException *exception)
+seed_cairo_image_surface_get_format(SeedContext ctx,
+                                    SeedObject this_object,
+                                    SeedString property_name,
+                                    SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_long (ctx, cairo_image_surface_get_format (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_long(ctx,
+                                cairo_image_surface_get_format(
+                                  seed_object_to_cairo_surface(ctx, this_object,
+                                                               exception)),
+                                exception);
 }
 
 static SeedValue
-seed_cairo_image_surface_get_width (SeedContext ctx,
-				    SeedObject this_object,
-				    SeedString property_name,
-				    SeedException *exception)
+seed_cairo_image_surface_get_width(SeedContext ctx,
+                                   SeedObject this_object,
+                                   SeedString property_name,
+                                   SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_int (ctx, cairo_image_surface_get_width (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_int(ctx,
+                               cairo_image_surface_get_width(
+                                 seed_object_to_cairo_surface(ctx, this_object,
+                                                              exception)),
+                               exception);
 }
 
 static SeedValue
-seed_cairo_image_surface_get_height (SeedContext ctx,
-				     SeedObject this_object,
-				     SeedString property_name,
-				     SeedException *exception)
+seed_cairo_image_surface_get_height(SeedContext ctx,
+                                    SeedObject this_object,
+                                    SeedString property_name,
+                                    SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_int (ctx, cairo_image_surface_get_height (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_int(ctx,
+                               cairo_image_surface_get_height(
+                                 seed_object_to_cairo_surface(ctx, this_object,
+                                                              exception)),
+                               exception);
 }
 
 static SeedValue
-seed_cairo_image_surface_get_stride (SeedContext ctx,
-				     SeedObject this_object,
-				     SeedString property_name,
-				     SeedException *exception)
+seed_cairo_image_surface_get_stride(SeedContext ctx,
+                                    SeedObject this_object,
+                                    SeedString property_name,
+                                    SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_int (ctx, cairo_image_surface_get_stride (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_int(ctx,
+                               cairo_image_surface_get_stride(
+                                 seed_object_to_cairo_surface(ctx, this_object,
+                                                              exception)),
+                               exception);
 }
 
 static SeedObject
-seed_cairo_construct_image_surface (SeedContext ctx,
-				    SeedObject constructor,
-				    size_t argument_count,
-				    const SeedValue arguments[],
-				    SeedException * exception)
+seed_cairo_construct_image_surface(SeedContext ctx,
+                                   SeedObject constructor,
+                                   size_t argument_count,
+                                   const SeedValue arguments[],
+                                   SeedException* exception)
 {
-  cairo_surface_t *ret;
-  gint width, height;
-  cairo_format_t format;
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("ImageSurface", "3 arguments");
+    cairo_surface_t* ret;
+    gint width, height;
+    cairo_format_t format;
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("ImageSurface", "3 arguments");
     }
 
-  format = seed_value_to_long (ctx, arguments[0], exception);
-  width = seed_value_to_int (ctx, arguments[1], exception);
-  height = seed_value_to_int (ctx, arguments[2], exception);
-  ret = cairo_image_surface_create (format, width, height);
+    format = seed_value_to_long(ctx, arguments[0], exception);
+    width = seed_value_to_int(ctx, arguments[1], exception);
+    height = seed_value_to_int(ctx, arguments[2], exception);
+    ret = cairo_image_surface_create(format, width, height);
 
-  return seed_object_from_cairo_image_surface (ctx, ret);
+    return seed_object_from_cairo_image_surface(ctx, ret);
 }
 
 seed_static_value image_surface_values[] = {
-  {"format", seed_cairo_image_surface_get_format, 0, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"width", seed_cairo_image_surface_get_width, 0, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"height", seed_cairo_image_surface_get_height, 0, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"stride", seed_cairo_image_surface_get_stride, 0, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {0, 0, 0, 0}
+    { "format", seed_cairo_image_surface_get_format, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "width", seed_cairo_image_surface_get_width, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "height", seed_cairo_image_surface_get_height, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "stride", seed_cairo_image_surface_get_stride, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { 0, 0, 0, 0 }
 };
 
-
-
-
 void
-seed_define_cairo_image_surface (SeedContext ctx,
-				 SeedObject namespace_ref)
+seed_define_cairo_image_surface(SeedContext ctx, SeedObject namespace_ref)
 {
-  seed_class_definition image_def = seed_empty_class;
-  // TODO: FIX
-  seed_static_function webkit_fail = {0,0,0};
-
-  image_def.class_name = "ImageSurface";
-  image_def.static_values = image_surface_values;
-  image_def.parent_class = seed_get_cairo_surface_class ();
-  // FAIL
-  image_def.static_functions = &webkit_fail;
-  seed_cairo_image_surface_class = seed_create_class (&image_def);
-
-  image_surface_constructor_ref = seed_make_constructor (ctx,
-							 NULL,
-							 //seed_cairo_image_surface_class,
-							 seed_cairo_construct_image_surface);
-  seed_object_set_property (ctx, namespace_ref, "ImageSurface", image_surface_constructor_ref);
+    seed_class_definition image_def = seed_empty_class;
+    // TODO: FIX
+    seed_static_function webkit_fail = { 0, 0, 0 };
+
+    image_def.class_name = "ImageSurface";
+    image_def.static_values = image_surface_values;
+    image_def.parent_class = seed_get_cairo_surface_class();
+    // FAIL
+    image_def.static_functions = &webkit_fail;
+    seed_cairo_image_surface_class = seed_create_class(&image_def);
+
+    image_surface_constructor_ref
+      = seed_make_constructor(ctx, NULL,
+                              // seed_cairo_image_surface_class,
+                              seed_cairo_construct_image_surface);
+    seed_object_set_property(ctx, namespace_ref, "ImageSurface",
+                             image_surface_constructor_ref);
 }
diff --git a/modules/cairo/seed-cairo-image-surface.h b/modules/cairo/seed-cairo-image-surface.h
index c36132b..9e54bcc 100644
--- a/modules/cairo/seed-cairo-image-surface.h
+++ b/modules/cairo/seed-cairo-image-surface.h
@@ -1,9 +1,9 @@
 #ifndef _SEED_CAIRO_IMAGE_SURFACE
-#define _SEED_CAIRO_IMAGE_SURFACe
+#define _SEED_CAIRO_IMAGE_SURFACE
 
 #include <seed.h>
 #include <cairo/cairo.h>
 
-void seed_define_cairo_image_surface (SeedContext ctx, SeedObject namespace_ref);
+void seed_define_cairo_image_surface(SeedContext ctx, SeedObject namespace_ref);
 
 #endif
diff --git a/modules/cairo/seed-cairo-matrix.c b/modules/cairo/seed-cairo-matrix.c
index af12285..7ff0af1 100644
--- a/modules/cairo/seed-cairo-matrix.c
+++ b/modules/cairo/seed-cairo-matrix.c
@@ -16,7 +16,7 @@
  *
  * Copyright (C) Robert Carr 2009 <carrr@rpi.edu>
  */
- 
+
 #include <seed.h>
 #include <cairo/cairo.h>
 
@@ -24,296 +24,307 @@
 SeedClass seed_matrix_class;
 
 SeedValue
-seed_value_from_cairo_matrix (SeedContext ctx,
-			      const cairo_matrix_t *matrix,
-			      SeedException *exception)
+seed_value_from_cairo_matrix(SeedContext ctx,
+                             const cairo_matrix_t* matrix,
+                             SeedException* exception)
 {
-  SeedValue elems[6];
+    SeedValue elems[6];
 
-  elems[0] = seed_value_from_double(ctx, matrix->xx, exception);
-  elems[1] = seed_value_from_double(ctx, matrix->yx, exception);
-  elems[2] = seed_value_from_double(ctx, matrix->xy, exception);
-  elems[3] = seed_value_from_double(ctx, matrix->yy, exception);
-  elems[4] = seed_value_from_double(ctx, matrix->x0, exception);
-  elems[5] = seed_value_from_double(ctx, matrix->y0, exception);
+    elems[0] = seed_value_from_double(ctx, matrix->xx, exception);
+    elems[1] = seed_value_from_double(ctx, matrix->yx, exception);
+    elems[2] = seed_value_from_double(ctx, matrix->xy, exception);
+    elems[3] = seed_value_from_double(ctx, matrix->yy, exception);
+    elems[4] = seed_value_from_double(ctx, matrix->x0, exception);
+    elems[5] = seed_value_from_double(ctx, matrix->y0, exception);
 
-  return seed_make_array (ctx, elems, 6, exception);
+    return seed_make_array(ctx, elems, 6, exception);
 }
 
 gboolean
-seed_value_to_cairo_matrix (SeedContext ctx,
-			    SeedValue value,
-			    cairo_matrix_t *matrix,
-			    SeedException *exception)
+seed_value_to_cairo_matrix(SeedContext ctx,
+                           SeedValue value,
+                           cairo_matrix_t* matrix,
+                           SeedException* exception)
 {
-  if (!seed_value_is_object (ctx, value))
-    return FALSE;
-
-  matrix->xx = seed_value_to_double (ctx, seed_object_get_property_at_index (ctx, (SeedObject) value, 0, exception), exception);
-  matrix->yx = seed_value_to_double (ctx, seed_object_get_property_at_index (ctx, (SeedObject) value, 1, exception), exception);
-  matrix->xy = seed_value_to_double (ctx, seed_object_get_property_at_index (ctx, (SeedObject) value, 2, exception), exception);
-  matrix->yy = seed_value_to_double (ctx, seed_object_get_property_at_index (ctx, (SeedObject) value, 3, exception), exception);
-  matrix->x0 = seed_value_to_double (ctx, seed_object_get_property_at_index (ctx, (SeedObject) value, 4, exception), exception);
-  matrix->y0 = seed_value_to_double (ctx, seed_object_get_property_at_index (ctx, (SeedObject) value, 5, exception), exception);
-
-  return TRUE;
+    if (!seed_value_is_object(ctx, value))
+        return FALSE;
+
+    matrix->xx = seed_value_to_double(
+      ctx,
+      seed_object_get_property_at_index(ctx, (SeedObject) value, 0, exception),
+      exception);
+    matrix->yx = seed_value_to_double(
+      ctx,
+      seed_object_get_property_at_index(ctx, (SeedObject) value, 1, exception),
+      exception);
+    matrix->xy = seed_value_to_double(
+      ctx,
+      seed_object_get_property_at_index(ctx, (SeedObject) value, 2, exception),
+      exception);
+    matrix->yy = seed_value_to_double(
+      ctx,
+      seed_object_get_property_at_index(ctx, (SeedObject) value, 3, exception),
+      exception);
+    matrix->x0 = seed_value_to_double(
+      ctx,
+      seed_object_get_property_at_index(ctx, (SeedObject) value, 4, exception),
+      exception);
+    matrix->y0 = seed_value_to_double(
+      ctx,
+      seed_object_get_property_at_index(ctx, (SeedObject) value, 5, exception),
+      exception);
+
+    return TRUE;
 }
 
 // Should probably be a property?
 static SeedValue
-seed_cairo_matrix_init_identity (SeedContext ctx,
-				 SeedObject function,
-				 SeedObject this_object,
-				 gsize argument_count,
-				 const SeedValue arguments[],
-				 SeedException *exception)
+seed_cairo_matrix_init_identity(SeedContext ctx,
+                                SeedObject function,
+                                SeedObject this_object,
+                                gsize argument_count,
+                                const SeedValue arguments[],
+                                SeedException* exception)
 {
-  cairo_matrix_t m;
+    cairo_matrix_t m;
 
-  cairo_matrix_init_identity (&m);
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    cairo_matrix_init_identity(&m);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_init_translate (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException *exception)
+seed_cairo_matrix_init_translate(SeedContext ctx,
+                                 SeedObject function,
+                                 SeedObject this_object,
+                                 gsize argument_count,
+                                 const SeedValue arguments[],
+                                 SeedException* exception)
 {
-  gdouble x, y;
-  cairo_matrix_t m;
+    gdouble x, y;
+    cairo_matrix_t m;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("init_translate", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("init_translate", "2 arguments");
     }
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_matrix_init_translate (&m, x, y);
+    cairo_matrix_init_translate(&m, x, y);
 
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_translate (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException *exception)
+seed_cairo_matrix_translate(SeedContext ctx,
+                            SeedObject function,
+                            SeedObject this_object,
+                            gsize argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  gdouble x, y;
-  cairo_matrix_t m;
+    gdouble x, y;
+    cairo_matrix_t m;
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("translate", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("translate", "3 arguments");
     }
 
-  if (!seed_value_to_cairo_matrix (ctx, arguments[0], &m, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "translate needs an array [xx, yx, xy, yy, x0, y0]");
+    if (!seed_value_to_cairo_matrix(ctx, arguments[0], &m, exception)) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "translate needs an array [xx, yx, xy, yy, x0, y0]");
     }
-  x = seed_value_to_double (ctx, arguments[1], exception);
-  y = seed_value_to_double (ctx, arguments[2], exception);
+    x = seed_value_to_double(ctx, arguments[1], exception);
+    y = seed_value_to_double(ctx, arguments[2], exception);
 
-  cairo_matrix_translate (&m, x, y);
+    cairo_matrix_translate(&m, x, y);
 
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_init_scale (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException *exception)
+seed_cairo_matrix_init_scale(SeedContext ctx,
+                             SeedObject function,
+                             SeedObject this_object,
+                             gsize argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
 {
-  gdouble x, y;
-  cairo_matrix_t m;
+    gdouble x, y;
+    cairo_matrix_t m;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("init_scale", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("init_scale", "2 arguments");
     }
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_matrix_init_scale (&m, x, y);
+    cairo_matrix_init_scale(&m, x, y);
 
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_scale (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException *exception)
+seed_cairo_matrix_scale(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  gdouble x, y;
-  cairo_matrix_t m;
+    gdouble x, y;
+    cairo_matrix_t m;
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("scale", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("scale", "3 arguments");
     }
 
-  if (!seed_value_to_cairo_matrix (ctx, arguments[0], &m, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "scale needs an array [xx, yx, xy, yy, x0, y0]");
+    if (!seed_value_to_cairo_matrix(ctx, arguments[0], &m, exception)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "scale needs an array [xx, yx, xy, yy, x0, y0]");
     }
-  x = seed_value_to_double (ctx, arguments[1], exception);
-  y = seed_value_to_double (ctx, arguments[2], exception);
+    x = seed_value_to_double(ctx, arguments[1], exception);
+    y = seed_value_to_double(ctx, arguments[2], exception);
 
-  cairo_matrix_scale (&m, x, y);
+    cairo_matrix_scale(&m, x, y);
 
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_init_rotate (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException *exception)
+seed_cairo_matrix_init_rotate(SeedContext ctx,
+                              SeedObject function,
+                              SeedObject this_object,
+                              gsize argument_count,
+                              const SeedValue arguments[],
+                              SeedException* exception)
 {
-  gdouble angle;
-  cairo_matrix_t m;
+    gdouble angle;
+    cairo_matrix_t m;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("init_rotate", "1 arguments");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("init_rotate", "1 arguments");
     }
 
-  angle = seed_value_to_double (ctx, arguments[0], exception);
-  cairo_matrix_init_rotate (&m, angle);
+    angle = seed_value_to_double(ctx, arguments[0], exception);
+    cairo_matrix_init_rotate(&m, angle);
 
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_rotate (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException *exception)
+seed_cairo_matrix_rotate(SeedContext ctx,
+                         SeedObject function,
+                         SeedObject this_object,
+                         gsize argument_count,
+                         const SeedValue arguments[],
+                         SeedException* exception)
 {
-  gdouble angle;
-  cairo_matrix_t m;
+    gdouble angle;
+    cairo_matrix_t m;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("rotate", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("rotate", "2 arguments");
     }
 
-  if (!seed_value_to_cairo_matrix (ctx, arguments[0], &m, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "rotate needs an array [xx, yx, xy, yy, x0, y0]");
+    if (!seed_value_to_cairo_matrix(ctx, arguments[0], &m, exception)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "rotate needs an array [xx, yx, xy, yy, x0, y0]");
     }
-  angle = seed_value_to_double (ctx, arguments[1], exception);
+    angle = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_matrix_rotate (&m, angle);
+    cairo_matrix_rotate(&m, angle);
 
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
-
 static SeedValue
-seed_cairo_matrix_transform_distance (SeedContext ctx,
-				      SeedObject function,
-				      SeedObject this_object,
-				      gsize argument_count,
-				      const SeedValue arguments[],
-				      SeedException *exception)
+seed_cairo_matrix_transform_distance(SeedContext ctx,
+                                     SeedObject function,
+                                     SeedObject this_object,
+                                     gsize argument_count,
+                                     const SeedValue arguments[],
+                                     SeedException* exception)
 {
-  SeedValue ret[2];
-  gdouble x, y;
-  cairo_matrix_t m;
+    SeedValue ret[2];
+    gdouble x, y;
+    cairo_matrix_t m;
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("transform_distance", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("transform_distance", "3 arguments");
     }
 
-  if (!seed_value_to_cairo_matrix (ctx, arguments[0], &m, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "transform_distance needs an array [xx, yx, xy, yy, x0, y0]");
+    if (!seed_value_to_cairo_matrix(ctx, arguments[0], &m, exception)) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "transform_distance needs an array [xx, yx, xy, yy, x0, y0]");
     }
-  x = seed_value_to_double (ctx, arguments[1], exception);
-  y = seed_value_to_double (ctx, arguments[2], exception);
+    x = seed_value_to_double(ctx, arguments[1], exception);
+    y = seed_value_to_double(ctx, arguments[2], exception);
 
-  cairo_matrix_transform_distance (&m, &x, &y);
+    cairo_matrix_transform_distance(&m, &x, &y);
 
-  ret[0] = seed_value_from_double (ctx, x, exception);
-  ret[1] = seed_value_from_double (ctx, y, exception);
+    ret[0] = seed_value_from_double(ctx, x, exception);
+    ret[1] = seed_value_from_double(ctx, y, exception);
 
-  return seed_make_array (ctx, ret, 2, exception);
+    return seed_make_array(ctx, ret, 2, exception);
 }
 
 static SeedValue
-seed_cairo_matrix_transform_point (SeedContext ctx,
-				      SeedObject function,
-				      SeedObject this_object,
-				      gsize argument_count,
-				      const SeedValue arguments[],
-				      SeedException *exception)
+seed_cairo_matrix_transform_point(SeedContext ctx,
+                                  SeedObject function,
+                                  SeedObject this_object,
+                                  gsize argument_count,
+                                  const SeedValue arguments[],
+                                  SeedException* exception)
 {
-  SeedValue ret[2];
-  gdouble x, y;
-  cairo_matrix_t m;
+    SeedValue ret[2];
+    gdouble x, y;
+    cairo_matrix_t m;
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("transform_point", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("transform_point", "3 arguments");
     }
 
-  if (!seed_value_to_cairo_matrix (ctx, arguments[0], &m, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "transform_point needs an array [xx, yx, xy, yy, x0, y0]");
+    if (!seed_value_to_cairo_matrix(ctx, arguments[0], &m, exception)) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "transform_point needs an array [xx, yx, xy, yy, x0, y0]");
     }
-  x = seed_value_to_double (ctx, arguments[1], exception);
-  y = seed_value_to_double (ctx, arguments[2], exception);
+    x = seed_value_to_double(ctx, arguments[1], exception);
+    y = seed_value_to_double(ctx, arguments[2], exception);
 
-  cairo_matrix_transform_point (&m, &x, &y);
+    cairo_matrix_transform_point(&m, &x, &y);
 
-  ret[0] = seed_value_from_double (ctx, x, exception);
-  ret[1] = seed_value_from_double (ctx, y, exception);
+    ret[0] = seed_value_from_double(ctx, x, exception);
+    ret[1] = seed_value_from_double(ctx, y, exception);
 
-  return seed_make_array (ctx, ret, 2, exception);
+    return seed_make_array(ctx, ret, 2, exception);
 }
 
-seed_static_function matrix_funcs[] = {
-  {"init_identity", seed_cairo_matrix_init_identity, 0},
-  {"init_translate", seed_cairo_matrix_init_translate, 0},
-  {"init_scale", seed_cairo_matrix_init_scale, 0},
-  {"init_rotate", seed_cairo_matrix_init_rotate, 0},
-  {"translate", seed_cairo_matrix_translate, 0},
-  {"scale", seed_cairo_matrix_scale, 0},
-  {"rotate", seed_cairo_matrix_rotate, 0},
-  {"transform_point", seed_cairo_matrix_transform_point, 0},
-  {"transform_distance", seed_cairo_matrix_transform_distance, 0},
-  {0, 0, 0}
-};
+seed_static_function matrix_funcs[]
+  = { { "init_identity", seed_cairo_matrix_init_identity, 0 },
+      { "init_translate", seed_cairo_matrix_init_translate, 0 },
+      { "init_scale", seed_cairo_matrix_init_scale, 0 },
+      { "init_rotate", seed_cairo_matrix_init_rotate, 0 },
+      { "translate", seed_cairo_matrix_translate, 0 },
+      { "scale", seed_cairo_matrix_scale, 0 },
+      { "rotate", seed_cairo_matrix_rotate, 0 },
+      { "transform_point", seed_cairo_matrix_transform_point, 0 },
+      { "transform_distance", seed_cairo_matrix_transform_distance, 0 },
+      { 0, 0, 0 } };
 
 void
-seed_define_cairo_matrix (SeedContext ctx,
-			  SeedObject namespace_ref)
+seed_define_cairo_matrix(SeedContext ctx, SeedObject namespace_ref)
 {
-  seed_class_definition matrix_def = seed_empty_class;
+    seed_class_definition matrix_def = seed_empty_class;
 
-  matrix_def.class_name = "Matrix";
-  matrix_def.static_functions = matrix_funcs;
-  seed_matrix_class = seed_create_class (&matrix_def);
+    matrix_def.class_name = "Matrix";
+    matrix_def.static_functions = matrix_funcs;
+    seed_matrix_class = seed_create_class(&matrix_def);
 
-  seed_object_set_property (ctx, namespace_ref, "Matrix", seed_make_object (ctx, seed_matrix_class, NULL));
+    seed_object_set_property(ctx, namespace_ref, "Matrix",
+                             seed_make_object(ctx, seed_matrix_class, NULL));
 }
diff --git a/modules/cairo/seed-cairo-matrix.h b/modules/cairo/seed-cairo-matrix.h
index 4fa23d3..0c57d4c 100644
--- a/modules/cairo/seed-cairo-matrix.h
+++ b/modules/cairo/seed-cairo-matrix.h
@@ -3,12 +3,15 @@
 #include <seed.h>
 #include <cairo/cairo.h>
 
-void seed_define_cairo_matrix (SeedContext ctx, SeedObject namespace_ref);
+void seed_define_cairo_matrix(SeedContext ctx, SeedObject namespace_ref);
 
-gboolean seed_value_to_cairo_matrix (SeedContext ctx, SeedValue value,
-				     cairo_matrix_t *matrix, SeedException *exception);
+gboolean seed_value_to_cairo_matrix(SeedContext ctx,
+                                    SeedValue value,
+                                    cairo_matrix_t* matrix,
+                                    SeedException* exception);
 
-SeedValue seed_value_from_cairo_matrix (SeedContext ctx, const cairo_matrix_t *matrix,
-					       SeedException *exception);
+SeedValue seed_value_from_cairo_matrix(SeedContext ctx,
+                                       const cairo_matrix_t* matrix,
+                                       SeedException* exception);
 
 #endif
diff --git a/modules/cairo/seed-cairo-pattern.c b/modules/cairo/seed-cairo-pattern.c
index 5d664f7..c7291b6 100644
--- a/modules/cairo/seed-cairo-pattern.c
+++ b/modules/cairo/seed-cairo-pattern.c
@@ -23,193 +23,206 @@
 #include "seed-cairo.h"
 #include "seed-cairo-matrix.h"
 
-#define CAIRO_PATTERN_PRIV(obj) ((cairo_pattern_t *)seed_object_get_private(obj))
-
-#define CHECK_PATTERN(obj, res) ({					\
-      if (!seed_object_is_of_class (ctx, obj, seed_cairo_pattern_class)){ \
-	seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Pattern"); \
-	return seed_make_##res (ctx);					\
-      }									\
-      if (!seed_object_get_private (obj)){				\
-	seed_make_exception (ctx, exception, "ArgumentError", "Cairo pattern has been destroyed"); \
-	return seed_make_##res (ctx);}})
-
-#define CHECK_THIS() if (!seed_object_get_private (this_object)){	\
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo pattern has been destroyed"); \
-    return seed_make_undefined (ctx);}
-
-#define CHECK_THIS_BOOL(res) if (!seed_object_get_private (this_object)){ \
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo pattern has been destroyed"); return FALSE;}
-
-
+#define CAIRO_PATTERN_PRIV(obj)                                                \
+    ((cairo_pattern_t*) seed_object_get_private(obj))
+
+#define CHECK_PATTERN(obj, res)                                                \
+    ({                                                                         \
+        if (!seed_object_is_of_class(ctx, obj, seed_cairo_pattern_class)) {    \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Object is not a Cairo Pattern");              \
+            return seed_make_##res(ctx);                                       \
+        }                                                                      \
+        if (!seed_object_get_private(obj)) {                                   \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Cairo pattern has been destroyed");           \
+            return seed_make_##res(ctx);                                       \
+        }                                                                      \
+    })
+
+#define CHECK_THIS()                                                           \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo pattern has been destroyed");               \
+        return seed_make_undefined(ctx);                                       \
+    }
 
+#define CHECK_THIS_BOOL(res)                                                   \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo pattern has been destroyed");               \
+        return FALSE;                                                          \
+    }
 
 SeedClass seed_cairo_pattern_class;
 
 SeedClass
-seed_get_cairo_pattern_class ()
+seed_get_cairo_pattern_class()
 {
-  return seed_cairo_pattern_class;
+    return seed_cairo_pattern_class;
 }
 
 static void
-seed_cairo_pattern_finalize (SeedObject obj)
+seed_cairo_pattern_finalize(SeedObject obj)
 {
-  cairo_pattern_t *s = CAIRO_PATTERN_PRIV(obj);
-  if (s)
-    {
-      cairo_pattern_set_user_data (s, seed_get_cairo_key(), NULL, NULL);
-      cairo_pattern_destroy (s);
+    cairo_pattern_t* s = CAIRO_PATTERN_PRIV(obj);
+    if (s) {
+        cairo_pattern_set_user_data(s, seed_get_cairo_key(), NULL, NULL);
+        cairo_pattern_destroy(s);
     }
 }
 
-cairo_pattern_t *
-seed_object_to_cairo_pattern (SeedContext ctx, SeedObject obj, SeedException *exception)
+cairo_pattern_t*
+seed_object_to_cairo_pattern(SeedContext ctx,
+                             SeedObject obj,
+                             SeedException* exception)
 {
-  if (seed_object_is_of_class (ctx, obj, seed_cairo_pattern_class))
-    return CAIRO_PATTERN_PRIV (obj);
-  seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Pattern");
-  return NULL;
+    if (seed_object_is_of_class(ctx, obj, seed_cairo_pattern_class))
+        return CAIRO_PATTERN_PRIV(obj);
+    seed_make_exception(ctx, exception, "ArgumentError",
+                        "Object is not a Cairo Pattern");
+    return NULL;
 }
 
 SeedObject
-seed_object_from_cairo_pattern (SeedContext ctx, cairo_pattern_t *pat)
+seed_object_from_cairo_pattern(SeedContext ctx, cairo_pattern_t* pat)
 {
-  SeedObject jsobj;
+    SeedObject jsobj;
 
-  jsobj = cairo_pattern_get_user_data (pat, seed_get_cairo_key());
-  if (jsobj)
-    return jsobj;
+    jsobj = cairo_pattern_get_user_data(pat, seed_get_cairo_key());
+    if (jsobj)
+        return jsobj;
 
-  jsobj = seed_make_object (ctx, seed_cairo_pattern_class, pat);
-  cairo_pattern_set_user_data (pat, seed_get_cairo_key(), jsobj, seed_cairo_destroy_func);
-  return jsobj;
+    jsobj = seed_make_object(ctx, seed_cairo_pattern_class, pat);
+    cairo_pattern_set_user_data(pat, seed_get_cairo_key(), jsobj,
+                                seed_cairo_destroy_func);
+    return jsobj;
 }
 
 static SeedObject
-seed_cairo_construct_linear_gradient (SeedContext ctx,
-				      SeedObject constructor,
-				      size_t argument_count,
-				      const SeedValue arguments[],
-				      SeedException * exception)
+seed_cairo_construct_linear_gradient(SeedContext ctx,
+                                     SeedObject constructor,
+                                     size_t argument_count,
+                                     const SeedValue arguments[],
+                                     SeedException* exception)
 {
-  gdouble x0,y0,x1,y1;
+    gdouble x0, y0, x1, y1;
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("LinearGradient constructor", "4 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("LinearGradient constructor", "4 arguments");
     }
 
-  x0 = seed_value_to_double (ctx, arguments[0], exception);
-  y0 = seed_value_to_double (ctx, arguments[1], exception);
-  x1 = seed_value_to_double (ctx, arguments[2], exception);
-  y1 = seed_value_to_double (ctx, arguments[3], exception);
+    x0 = seed_value_to_double(ctx, arguments[0], exception);
+    y0 = seed_value_to_double(ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[2], exception);
+    y1 = seed_value_to_double(ctx, arguments[3], exception);
 
-  return seed_object_from_cairo_pattern (ctx, cairo_pattern_create_linear (x0, y0, x1, y1));
+    return seed_object_from_cairo_pattern(ctx,
+                                          cairo_pattern_create_linear(x0, y0,
+                                                                      x1, y1));
 }
 
 static SeedObject
-seed_cairo_construct_radial_gradient (SeedContext ctx,
-				      SeedObject constructor,
-				      size_t argument_count,
-				      const SeedValue arguments[],
-				      SeedException * exception)
+seed_cairo_construct_radial_gradient(SeedContext ctx,
+                                     SeedObject constructor,
+                                     size_t argument_count,
+                                     const SeedValue arguments[],
+                                     SeedException* exception)
 {
-  gdouble cx0, cy0, r0, cx1, cy1, r1;
+    gdouble cx0, cy0, r0, cx1, cy1, r1;
 
-  if (argument_count != 6)
-    {
-      EXPECTED_EXCEPTION("RadialGradient constructor", "6 arguments");
+    if (argument_count != 6) {
+        EXPECTED_EXCEPTION("RadialGradient constructor", "6 arguments");
     }
 
-  cx0 = seed_value_to_double (ctx, arguments[0], exception);
-  cy0 = seed_value_to_double (ctx, arguments[1], exception);
-  r0 = seed_value_to_double (ctx, arguments[2], exception);
-  cx1 = seed_value_to_double (ctx, arguments[3], exception);
-  cy1 = seed_value_to_double (ctx, arguments[4], exception);
-  r1 = seed_value_to_double (ctx, arguments[5], exception);
-
+    cx0 = seed_value_to_double(ctx, arguments[0], exception);
+    cy0 = seed_value_to_double(ctx, arguments[1], exception);
+    r0 = seed_value_to_double(ctx, arguments[2], exception);
+    cx1 = seed_value_to_double(ctx, arguments[3], exception);
+    cy1 = seed_value_to_double(ctx, arguments[4], exception);
+    r1 = seed_value_to_double(ctx, arguments[5], exception);
 
-  return seed_object_from_cairo_pattern (ctx, cairo_pattern_create_radial (cx0, cy0, r0, cx1, cy1, r1));
+    return seed_object_from_cairo_pattern(
+      ctx, cairo_pattern_create_radial(cx0, cy0, r0, cx1, cy1, r1));
 }
 
 static SeedValue
-seed_cairo_pattern_add_color_stop_rgb (SeedContext ctx,
-				       SeedObject function,
-				       SeedObject this_object,
-				       gsize argument_count,
-				       const SeedValue arguments[],
-				       SeedException *exception)
+seed_cairo_pattern_add_color_stop_rgb(SeedContext ctx,
+                                      SeedObject function,
+                                      SeedObject this_object,
+                                      gsize argument_count,
+                                      const SeedValue arguments[],
+                                      SeedException* exception)
 {
-  gdouble offset, r, g, b;
-  cairo_pattern_t *pat;
-  CHECK_THIS();
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("add_color_stop_rgb", "4 arguments");
+    gdouble offset, r, g, b;
+    cairo_pattern_t* pat;
+    CHECK_THIS();
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("add_color_stop_rgb", "4 arguments");
     }
 
-  pat = seed_object_get_private (this_object);
-  offset = seed_value_to_double (ctx, arguments[0], exception);
-  r = seed_value_to_double (ctx, arguments[1], exception);
-  g = seed_value_to_double (ctx, arguments[2], exception);
-  b = seed_value_to_double (ctx, arguments[3], exception);
+    pat = seed_object_get_private(this_object);
+    offset = seed_value_to_double(ctx, arguments[0], exception);
+    r = seed_value_to_double(ctx, arguments[1], exception);
+    g = seed_value_to_double(ctx, arguments[2], exception);
+    b = seed_value_to_double(ctx, arguments[3], exception);
 
-  cairo_pattern_add_color_stop_rgb (pat, offset, r, g, b);
+    cairo_pattern_add_color_stop_rgb(pat, offset, r, g, b);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_pattern_add_color_stop_rgba (SeedContext ctx,
-				       SeedObject function,
-				       SeedObject this_object,
-				       gsize argument_count,
-				       const SeedValue arguments[],
-				       SeedException *exception)
+seed_cairo_pattern_add_color_stop_rgba(SeedContext ctx,
+                                       SeedObject function,
+                                       SeedObject this_object,
+                                       gsize argument_count,
+                                       const SeedValue arguments[],
+                                       SeedException* exception)
 {
-  gdouble offset, r, g, b, a;
-  cairo_pattern_t *pat;
-  CHECK_THIS();
-  if (argument_count != 5)
-    {
-      EXPECTED_EXCEPTION("add_color_stop_rgba", "5 arguments");
+    gdouble offset, r, g, b, a;
+    cairo_pattern_t* pat;
+    CHECK_THIS();
+    if (argument_count != 5) {
+        EXPECTED_EXCEPTION("add_color_stop_rgba", "5 arguments");
     }
 
-  pat = seed_object_get_private (this_object);
-  offset = seed_value_to_double (ctx, arguments[0], exception);
-  r = seed_value_to_double (ctx, arguments[1], exception);
-  g = seed_value_to_double (ctx, arguments[2], exception);
-  b = seed_value_to_double (ctx, arguments[3], exception);
-  a = seed_value_to_double (ctx, arguments[4], exception);
+    pat = seed_object_get_private(this_object);
+    offset = seed_value_to_double(ctx, arguments[0], exception);
+    r = seed_value_to_double(ctx, arguments[1], exception);
+    g = seed_value_to_double(ctx, arguments[2], exception);
+    b = seed_value_to_double(ctx, arguments[3], exception);
+    a = seed_value_to_double(ctx, arguments[4], exception);
 
-  cairo_pattern_add_color_stop_rgba (pat, offset, r, g, b, a);
+    cairo_pattern_add_color_stop_rgba(pat, offset, r, g, b, a);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
-seed_static_function pattern_funcs[] = {
-  {"add_color_stop_rgb", seed_cairo_pattern_add_color_stop_rgb, 0},
-  {"add_color_stop_rgba", seed_cairo_pattern_add_color_stop_rgba, 0},
-  {0,0,0}
-};
+seed_static_function pattern_funcs[]
+  = { { "add_color_stop_rgb", seed_cairo_pattern_add_color_stop_rgb, 0 },
+      { "add_color_stop_rgba", seed_cairo_pattern_add_color_stop_rgba, 0 },
+      { 0, 0, 0 } };
 
 void
-seed_define_cairo_pattern (SeedContext ctx,
-			   SeedObject namespace_ref)
+seed_define_cairo_pattern(SeedContext ctx, SeedObject namespace_ref)
 {
-  SeedObject linear_constructor, radial_constructor;
-  seed_class_definition pattern_def = seed_empty_class;
+    SeedObject linear_constructor, radial_constructor;
+    seed_class_definition pattern_def = seed_empty_class;
 
-  pattern_def.class_name = "Pattern";
-  pattern_def.finalize = seed_cairo_pattern_finalize;
-  pattern_def.static_functions = pattern_funcs;
+    pattern_def.class_name = "Pattern";
+    pattern_def.finalize = seed_cairo_pattern_finalize;
+    pattern_def.static_functions = pattern_funcs;
 
-  seed_cairo_pattern_class = seed_create_class (&pattern_def);
+    seed_cairo_pattern_class = seed_create_class(&pattern_def);
 
-  linear_constructor = seed_make_constructor (ctx, NULL, seed_cairo_construct_linear_gradient);
-  seed_object_set_property(ctx, namespace_ref, "LinearGradient", linear_constructor);
+    linear_constructor
+      = seed_make_constructor(ctx, NULL, seed_cairo_construct_linear_gradient);
+    seed_object_set_property(ctx, namespace_ref, "LinearGradient",
+                             linear_constructor);
 
-  radial_constructor = seed_make_constructor (ctx, NULL, seed_cairo_construct_radial_gradient);
-  seed_object_set_property(ctx, namespace_ref, "RadialGradient", radial_constructor);
+    radial_constructor
+      = seed_make_constructor(ctx, NULL, seed_cairo_construct_radial_gradient);
+    seed_object_set_property(ctx, namespace_ref, "RadialGradient",
+                             radial_constructor);
 }
diff --git a/modules/cairo/seed-cairo-pattern.h b/modules/cairo/seed-cairo-pattern.h
index 427215a..db793d4 100644
--- a/modules/cairo/seed-cairo-pattern.h
+++ b/modules/cairo/seed-cairo-pattern.h
@@ -4,18 +4,15 @@
 #include <seed.h>
 #include <cairo/cairo.h>
 
-SeedClass
-seed_get_cairo_pattern_class ();
+SeedClass seed_get_cairo_pattern_class();
 
-cairo_pattern_t *
-seed_object_to_cairo_pattern (SeedContext ctx, SeedObject obj, SeedException *exception);
+cairo_pattern_t* seed_object_to_cairo_pattern(SeedContext ctx,
+                                              SeedObject obj,
+                                              SeedException* exception);
 
-SeedObject
-seed_object_from_cairo_pattern (SeedContext ctx, cairo_pattern_t *pat);
-
-void
-seed_define_cairo_pattern (SeedContext ctx,
-			   SeedObject namespace_ref);
+SeedObject seed_object_from_cairo_pattern(SeedContext ctx,
+                                          cairo_pattern_t* pat);
 
+void seed_define_cairo_pattern(SeedContext ctx, SeedObject namespace_ref);
 
 #endif
diff --git a/modules/cairo/seed-cairo-pdf-surface.c b/modules/cairo/seed-cairo-pdf-surface.c
index 4c6648d..d63c892 100644
--- a/modules/cairo/seed-cairo-pdf-surface.c
+++ b/modules/cairo/seed-cairo-pdf-surface.c
@@ -24,116 +24,116 @@
 #include "seed-cairo.h"
 #include "seed-cairo-surface.h"
 
-#define CAIRO_SURFACE_PRIV(obj) ((cairo_surface_t *)seed_object_get_private(obj))
-
-#define CHECK_SURFACE(obj) ({					\
-      if (!seed_object_is_of_class (ctx, obj, seed_cairo_pdf_surface_class)){	\
-	seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Surface"); \
-	return seed_make_undefined (ctx);					\
-      }									\
-      if (!seed_object_get_private (obj)){				\
-	seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); \
-	return seed_make_undefined (ctx);}})
-
-#define CHECK_THIS() if (!seed_object_get_private (this_object)){	\
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); \
-    return seed_make_undefined (ctx);}
+#define CAIRO_SURFACE_PRIV(obj)                                                \
+    ((cairo_surface_t*) seed_object_get_private(obj))
+
+#define CHECK_SURFACE(obj)                                                     \
+    ({                                                                         \
+        if (!seed_object_is_of_class(ctx, obj,                                 \
+                                     seed_cairo_pdf_surface_class)) {          \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Object is not a Cairo Surface");              \
+            return seed_make_undefined(ctx);                                   \
+        }                                                                      \
+        if (!seed_object_get_private(obj)) {                                   \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Cairo surface has been destroyed");           \
+            return seed_make_undefined(ctx);                                   \
+        }                                                                      \
+    })
+
+#define CHECK_THIS()                                                           \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo surface has been destroyed");               \
+        return seed_make_undefined(ctx);                                       \
+    }
 
 SeedClass seed_cairo_pdf_surface_class;
 SeedObject pdf_surface_constructor_ref;
 
-
 static SeedObject
-seed_object_from_cairo_pdf_surface (SeedContext ctx, cairo_surface_t *surf)
+seed_object_from_cairo_pdf_surface(SeedContext ctx, cairo_surface_t* surf)
 {
-  SeedObject jsobj;
+    SeedObject jsobj;
 
-  jsobj = cairo_surface_get_user_data (surf, seed_get_cairo_key());
-  if (jsobj)
-    return jsobj;
+    jsobj = cairo_surface_get_user_data(surf, seed_get_cairo_key());
+    if (jsobj)
+        return jsobj;
 
-  jsobj = seed_make_object (ctx, seed_cairo_pdf_surface_class, surf);
-  cairo_surface_set_user_data (surf, seed_get_cairo_key(), jsobj, seed_cairo_destroy_func);
-  return jsobj;
+    jsobj = seed_make_object(ctx, seed_cairo_pdf_surface_class, surf);
+    cairo_surface_set_user_data(surf, seed_get_cairo_key(), jsobj,
+                                seed_cairo_destroy_func);
+    return jsobj;
 }
 
 static SeedValue
-seed_cairo_pdf_surface_set_size (SeedContext ctx,
-				 SeedObject function,
-				 SeedObject this_object,
-				 gsize argument_count,
-				 const SeedValue arguments[],
-				 SeedException *exception)
+seed_cairo_pdf_surface_set_size(SeedContext ctx,
+                                SeedObject function,
+                                SeedObject this_object,
+                                gsize argument_count,
+                                const SeedValue arguments[],
+                                SeedException* exception)
 {
-  cairo_surface_t *surf;
-  gdouble x, y;
+    cairo_surface_t* surf;
+    gdouble x, y;
 
-  CHECK_THIS();
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("set_size", "2 arguments");
+    CHECK_THIS();
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("set_size", "2 arguments");
     }
-  surf = seed_object_get_private (this_object);
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    surf = seed_object_get_private(this_object);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_pdf_surface_set_size (surf, x, y);
+    cairo_pdf_surface_set_size(surf, x, y);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
-
 static SeedObject
-seed_cairo_construct_pdf_surface (SeedContext ctx,
-				    SeedObject constructor,
-				    size_t argument_count,
-				    const SeedValue arguments[],
-				    SeedException * exception)
+seed_cairo_construct_pdf_surface(SeedContext ctx,
+                                 SeedObject constructor,
+                                 size_t argument_count,
+                                 const SeedValue arguments[],
+                                 SeedException* exception)
 {
-  cairo_surface_t *ret;
-  gchar *filename = NULL;
-  gdouble width, height;
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("PDFSurface", "3 arguments");
+    cairo_surface_t* ret;
+    gchar* filename = NULL;
+    gdouble width, height;
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("PDFSurface", "3 arguments");
     }
 
-  if (!seed_value_is_null (ctx, arguments[0]))
-    filename  = seed_value_to_string (ctx, arguments[0], exception);
-  width = seed_value_to_double (ctx, arguments[1], exception);
-  height = seed_value_to_double (ctx, arguments[2], exception);
-  ret = cairo_pdf_surface_create (filename, width, height);
+    if (!seed_value_is_null(ctx, arguments[0]))
+        filename = seed_value_to_string(ctx, arguments[0], exception);
+    width = seed_value_to_double(ctx, arguments[1], exception);
+    height = seed_value_to_double(ctx, arguments[2], exception);
+    ret = cairo_pdf_surface_create(filename, width, height);
 
-  return seed_object_from_cairo_pdf_surface (ctx, ret);
+    return seed_object_from_cairo_pdf_surface(ctx, ret);
 }
 
-seed_static_value pdf_surface_values[] = {
-  {0, 0, 0, 0}
-};
-
-seed_static_function pdf_surface_funcs[] = {
-  {"set_size", seed_cairo_pdf_surface_set_size, 0},
-  {0, 0, 0}
-};
-
-
+seed_static_value pdf_surface_values[] = { { 0, 0, 0, 0 } };
 
+seed_static_function pdf_surface_funcs[]
+  = { { "set_size", seed_cairo_pdf_surface_set_size, 0 }, { 0, 0, 0 } };
 
 void
-seed_define_cairo_pdf_surface (SeedContext ctx,
-				 SeedObject namespace_ref)
+seed_define_cairo_pdf_surface(SeedContext ctx, SeedObject namespace_ref)
 {
-  seed_class_definition pdf_def = seed_empty_class;
-
-  pdf_def.class_name = "PDFSurface";
-  pdf_def.static_values = pdf_surface_values;
-  pdf_def.parent_class = seed_get_cairo_surface_class ();
-  pdf_def.static_functions = pdf_surface_funcs;
-  seed_cairo_pdf_surface_class = seed_create_class (&pdf_def);
-
-  pdf_surface_constructor_ref = seed_make_constructor (ctx,
-							 NULL,
-							 //seed_cairo_pdf_surface_class,
-							 seed_cairo_construct_pdf_surface);
-  seed_object_set_property (ctx, namespace_ref, "PDFSurface", pdf_surface_constructor_ref);
+    seed_class_definition pdf_def = seed_empty_class;
+
+    pdf_def.class_name = "PDFSurface";
+    pdf_def.static_values = pdf_surface_values;
+    pdf_def.parent_class = seed_get_cairo_surface_class();
+    pdf_def.static_functions = pdf_surface_funcs;
+    seed_cairo_pdf_surface_class = seed_create_class(&pdf_def);
+
+    pdf_surface_constructor_ref
+      = seed_make_constructor(ctx, NULL,
+                              // seed_cairo_pdf_surface_class,
+                              seed_cairo_construct_pdf_surface);
+    seed_object_set_property(ctx, namespace_ref, "PDFSurface",
+                             pdf_surface_constructor_ref);
 }
diff --git a/modules/cairo/seed-cairo-pdf-surface.h b/modules/cairo/seed-cairo-pdf-surface.h
index 6292513..9accf15 100644
--- a/modules/cairo/seed-cairo-pdf-surface.h
+++ b/modules/cairo/seed-cairo-pdf-surface.h
@@ -1,9 +1,9 @@
 #ifndef _SEED_CAIRO_PDF_SURFACE
-#define _SEED_CAIRO_PDF_SURFACe
+#define _SEED_CAIRO_PDF_SURFACE
 
 #include <seed.h>
 #include <cairo/cairo.h>
 
-void seed_define_cairo_pdf_surface (SeedContext ctx, SeedObject namespace_ref);
+void seed_define_cairo_pdf_surface(SeedContext ctx, SeedObject namespace_ref);
 
 #endif
diff --git a/modules/cairo/seed-cairo-surface.c b/modules/cairo/seed-cairo-surface.c
index 55cf4f6..f08ef2a 100644
--- a/modules/cairo/seed-cairo-surface.c
+++ b/modules/cairo/seed-cairo-surface.c
@@ -24,393 +24,432 @@
 #include "seed-cairo-image-surface.h"
 #include "seed-cairo-pdf-surface.h"
 
-#define CAIRO_SURFACE_PRIV(obj) ((cairo_surface_t *)seed_object_get_private(obj))
-
-#define CHECK_SURFACE(obj, res) ({					\
-      if (!seed_object_is_of_class (ctx, obj, seed_cairo_surface_class)){ \
-	seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Surface"); \
-	return seed_make_##res (ctx);					\
-      }									\
-      if (!seed_object_get_private (obj)){				\
-	seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); \
-	return seed_make_##res (ctx);}})
-
-#define CHECK_THIS() if (!seed_object_get_private (this_object)){	\
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); \
-    return seed_make_undefined (ctx);}
-
-#define CHECK_THIS_BOOL(res) if (!seed_object_get_private (this_object)){ \
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo surface has been destroyed"); return FALSE;}
-
-
+#define CAIRO_SURFACE_PRIV(obj)                                                \
+    ((cairo_surface_t*) seed_object_get_private(obj))
+
+#define CHECK_SURFACE(obj, res)                                                \
+    ({                                                                         \
+        if (!seed_object_is_of_class(ctx, obj, seed_cairo_surface_class)) {    \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Object is not a Cairo Surface");              \
+            return seed_make_##res(ctx);                                       \
+        }                                                                      \
+        if (!seed_object_get_private(obj)) {                                   \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Cairo surface has been destroyed");           \
+            return seed_make_##res(ctx);                                       \
+        }                                                                      \
+    })
+
+#define CHECK_THIS()                                                           \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo surface has been destroyed");               \
+        return seed_make_undefined(ctx);                                       \
+    }
 
+#define CHECK_THIS_BOOL(res)                                                   \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo surface has been destroyed");               \
+        return FALSE;                                                          \
+    }
 
 SeedClass seed_cairo_surface_class;
 
 SeedClass
-seed_get_cairo_surface_class ()
+seed_get_cairo_surface_class()
 {
-  return seed_cairo_surface_class;
+    return seed_cairo_surface_class;
 }
 
 static void
-seed_cairo_surface_finalize (SeedObject obj)
+seed_cairo_surface_finalize(SeedObject obj)
 {
-  cairo_surface_t *s = CAIRO_SURFACE_PRIV(obj);
-  if (s)
-    {
-      cairo_surface_set_user_data (s, seed_get_cairo_key(), NULL, NULL);
-      cairo_surface_destroy (s);
-  }
+    cairo_surface_t* s = CAIRO_SURFACE_PRIV(obj);
+    if (s) {
+        cairo_surface_set_user_data(s, seed_get_cairo_key(), NULL, NULL);
+        cairo_surface_destroy(s);
+    }
 }
 
-cairo_surface_t *
-seed_object_to_cairo_surface (SeedContext ctx, SeedObject obj, SeedException *exception)
+cairo_surface_t*
+seed_object_to_cairo_surface(SeedContext ctx,
+                             SeedObject obj,
+                             SeedException* exception)
 {
-  if (seed_object_is_of_class (ctx, obj, seed_cairo_surface_class))
-    return CAIRO_SURFACE_PRIV (obj);
-  seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Surface");
-  return NULL;
+    if (seed_object_is_of_class(ctx, obj, seed_cairo_surface_class))
+        return CAIRO_SURFACE_PRIV(obj);
+    seed_make_exception(ctx, exception, "ArgumentError",
+                        "Object is not a Cairo Surface");
+    return NULL;
 }
 
 SeedObject
-seed_object_from_cairo_surface (SeedContext ctx, cairo_surface_t *surf)
+seed_object_from_cairo_surface(SeedContext ctx, cairo_surface_t* surf)
 {
-  SeedObject jsobj;
+    SeedObject jsobj;
 
-  jsobj = cairo_surface_get_user_data (surf, seed_get_cairo_key());
-  if (jsobj)
-    return jsobj;
+    jsobj = cairo_surface_get_user_data(surf, seed_get_cairo_key());
+    if (jsobj)
+        return jsobj;
 
-  jsobj = seed_make_object (ctx, seed_cairo_surface_class, surf);
-  cairo_surface_set_user_data (surf, seed_get_cairo_key(), jsobj, seed_cairo_destroy_func);
-  return jsobj;
+    jsobj = seed_make_object(ctx, seed_cairo_surface_class, surf);
+    cairo_surface_set_user_data(surf, seed_get_cairo_key(), jsobj,
+                                seed_cairo_destroy_func);
+    return jsobj;
 }
 
 static SeedValue
-seed_cairo_surface_create_similar (SeedContext ctx,
-				   SeedObject function,
-				   SeedObject this_object,
-				   gsize argument_count,
-				   const SeedValue arguments[],
-				   SeedException *exception)
+seed_cairo_surface_create_similar(SeedContext ctx,
+                                  SeedObject function,
+                                  SeedObject this_object,
+                                  gsize argument_count,
+                                  const SeedValue arguments[],
+                                  SeedException* exception)
 {
-  gint width, height;
-  cairo_surface_t *surface, *ret;
-  cairo_content_t content;
-  CHECK_THIS();
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("create_similar", "3 arguments");
+    gint width, height;
+    cairo_surface_t *surface, *ret;
+    cairo_content_t content;
+    CHECK_THIS();
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("create_similar", "3 arguments");
     }
 
-  surface = seed_object_to_cairo_surface (ctx, this_object, exception);
-  if (!surface)
-    return seed_make_undefined (ctx);
-  content = seed_value_to_long (ctx, arguments[0], exception);
-  width = seed_value_to_int (ctx, arguments[1], exception);
-  height = seed_value_to_int (ctx, arguments[2], exception);
+    surface = seed_object_to_cairo_surface(ctx, this_object, exception);
+    if (!surface)
+        return seed_make_undefined(ctx);
+    content = seed_value_to_long(ctx, arguments[0], exception);
+    width = seed_value_to_int(ctx, arguments[1], exception);
+    height = seed_value_to_int(ctx, arguments[2], exception);
 
-  ret = cairo_surface_create_similar (surface, content, width, height);
-  return seed_object_from_cairo_surface (ctx, ret);
+    ret = cairo_surface_create_similar(surface, content, width, height);
+    return seed_object_from_cairo_surface(ctx, ret);
 }
 
 static SeedValue
-seed_cairo_surface_status (SeedContext ctx,
-			   SeedObject this_object,
-			   SeedString property_name,
-			   SeedException *exception)
+seed_cairo_surface_status(SeedContext ctx,
+                          SeedObject this_object,
+                          SeedString property_name,
+                          SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_long (ctx, cairo_surface_status (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_long(ctx,
+                                cairo_surface_status(
+                                  seed_object_to_cairo_surface(ctx, this_object,
+                                                               exception)),
+                                exception);
 }
 
 static SeedValue
-seed_cairo_surface_get_content (SeedContext ctx,
-				SeedObject this_object,
-				SeedString property_name,
-				SeedException *exception)
+seed_cairo_surface_get_content(SeedContext ctx,
+                               SeedObject this_object,
+                               SeedString property_name,
+                               SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_long (ctx, cairo_surface_get_content (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_long(ctx,
+                                cairo_surface_get_content(
+                                  seed_object_to_cairo_surface(ctx, this_object,
+                                                               exception)),
+                                exception);
 }
 
 static SeedValue
-seed_cairo_surface_finish (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_surface_finish(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          gsize argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_surface_finish (seed_object_to_cairo_surface(ctx, this_object, exception));
-  return seed_make_undefined (ctx);
+    CHECK_THIS();
+    cairo_surface_finish(
+      seed_object_to_cairo_surface(ctx, this_object, exception));
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_surface_flush (SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  gsize argument_count,
-			  const SeedValue arguments[],
-			  SeedException *exception)
+seed_cairo_surface_flush(SeedContext ctx,
+                         SeedObject function,
+                         SeedObject this_object,
+                         gsize argument_count,
+                         const SeedValue arguments[],
+                         SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_surface_flush (seed_object_to_cairo_surface(ctx, this_object, exception));
-  return seed_make_undefined (ctx);
+    CHECK_THIS();
+    cairo_surface_flush(
+      seed_object_to_cairo_surface(ctx, this_object, exception));
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
 seed_cairo_surface_mark_dirty_rectangle(SeedContext ctx,
-					SeedObject function,
-					SeedObject this_object,
-					gsize argument_count,
-					const SeedValue arguments[],
-					SeedException *exception)
+                                        SeedObject function,
+                                        SeedObject this_object,
+                                        gsize argument_count,
+                                        const SeedValue arguments[],
+                                        SeedException* exception)
 {
-  cairo_surface_t *surf;
-  guint x, y, width, height;
-  CHECK_THIS();
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("mark_dirty_rectangle", "4 arguments");
+    cairo_surface_t* surf;
+    guint x, y, width, height;
+    CHECK_THIS();
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("mark_dirty_rectangle", "4 arguments");
     }
-  surf = seed_object_to_cairo_surface (ctx, this_object, exception);
-  x = seed_value_to_int (ctx, arguments[0], exception);
-  y = seed_value_to_int (ctx, arguments[1], exception);
-  width = seed_value_to_int (ctx, arguments[2], exception);
-  height = seed_value_to_int (ctx, arguments[3], exception);
+    surf = seed_object_to_cairo_surface(ctx, this_object, exception);
+    x = seed_value_to_int(ctx, arguments[0], exception);
+    y = seed_value_to_int(ctx, arguments[1], exception);
+    width = seed_value_to_int(ctx, arguments[2], exception);
+    height = seed_value_to_int(ctx, arguments[3], exception);
 
-  cairo_surface_mark_dirty_rectangle (surf, x, y, width, height);
+    cairo_surface_mark_dirty_rectangle(surf, x, y, width, height);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_surface_mark_dirty (SeedContext ctx,
-			       SeedObject function,
-			       SeedObject this_object,
-			       gsize argument_count,
-			       const SeedValue arguments[],
-			       SeedException *exception)
+seed_cairo_surface_mark_dirty(SeedContext ctx,
+                              SeedObject function,
+                              SeedObject this_object,
+                              gsize argument_count,
+                              const SeedValue arguments[],
+                              SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_surface_mark_dirty (seed_object_to_cairo_surface(ctx, this_object, exception));
-  return seed_make_undefined (ctx);
+    CHECK_THIS();
+    cairo_surface_mark_dirty(
+      seed_object_to_cairo_surface(ctx, this_object, exception));
+    return seed_make_undefined(ctx);
 }
 
 static gboolean
 seed_cairo_surface_set_device_offset(SeedContext ctx,
-				     SeedObject this_object,
-				     SeedString property_name,
-				     SeedValue value,
-				     SeedException *exception)
+                                     SeedObject this_object,
+                                     SeedString property_name,
+                                     SeedValue value,
+                                     SeedException* exception)
 {
-  cairo_surface_t *surf;
-  gdouble x, y;
-  SeedValue jsx, jsy;
-  CHECK_THIS_BOOL();
-
-  if (!seed_value_is_object (ctx, value))
-    {
-      seed_make_exception(ctx, exception, "ArgumentError", "Cairo.Surface.device_offset must be an array [x,y]");
-      return FALSE;
+    cairo_surface_t* surf;
+    gdouble x, y;
+    SeedValue jsx, jsy;
+    CHECK_THIS_BOOL();
+
+    if (!seed_value_is_object(ctx, value)) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Cairo.Surface.device_offset must be an array [x,y]");
+        return FALSE;
     }
 
-  jsx = seed_object_get_property_at_index (ctx, (SeedObject) value, 0, exception);
-  jsy = seed_object_get_property_at_index (ctx, (SeedObject) value, 1, exception);
+    jsx = seed_object_get_property_at_index(ctx, (SeedObject) value, 0,
+                                            exception);
+    jsy = seed_object_get_property_at_index(ctx, (SeedObject) value, 1,
+                                            exception);
 
-  surf = seed_object_to_cairo_surface (ctx, this_object, exception);
-  x = seed_value_to_double (ctx, jsx, exception);
-  y = seed_value_to_double (ctx, jsy, exception);
+    surf = seed_object_to_cairo_surface(ctx, this_object, exception);
+    x = seed_value_to_double(ctx, jsx, exception);
+    y = seed_value_to_double(ctx, jsy, exception);
 
-  cairo_surface_set_device_offset (surf, x, y);
-  return TRUE;
+    cairo_surface_set_device_offset(surf, x, y);
+    return TRUE;
 }
 
 static SeedValue
 seed_cairo_surface_get_device_offset(SeedContext ctx,
-				     SeedObject this_object,
-				     SeedString property_name,
-				     SeedException *exception)
+                                     SeedObject this_object,
+                                     SeedString property_name,
+                                     SeedException* exception)
 {
-  SeedValue offsets[2];
-  cairo_surface_t *surf;
-  gdouble x, y;
-  CHECK_THIS();
+    SeedValue offsets[2];
+    cairo_surface_t* surf;
+    gdouble x, y;
+    CHECK_THIS();
 
-  surf = seed_object_to_cairo_surface (ctx, this_object, exception);
-  cairo_surface_get_device_offset (surf, &x, &y);
+    surf = seed_object_to_cairo_surface(ctx, this_object, exception);
+    cairo_surface_get_device_offset(surf, &x, &y);
 
-  offsets[0] = seed_value_from_double (ctx, x, exception);
-  offsets[1] = seed_value_from_double (ctx, y, exception);
+    offsets[0] = seed_value_from_double(ctx, x, exception);
+    offsets[1] = seed_value_from_double(ctx, y, exception);
 
-  return seed_make_array (ctx, offsets, 2, exception);
+    return seed_make_array(ctx, offsets, 2, exception);
 }
 
 static gboolean
 seed_cairo_surface_set_fallback_resolution(SeedContext ctx,
-					   SeedObject this_object,
-					   SeedString property_name,
-					   SeedValue value,
-					   SeedException *exception)
+                                           SeedObject this_object,
+                                           SeedString property_name,
+                                           SeedValue value,
+                                           SeedException* exception)
 {
-  cairo_surface_t *surf;
-  gdouble x, y;
-  SeedValue jsx, jsy;
-  CHECK_THIS_BOOL();
-
-  if (!seed_value_is_object (ctx, value))
-    {
-      seed_make_exception(ctx, exception, "ArgumentError", "Cairo.Surface.fallback_resolution must be an array [x,y]");
-      return FALSE;
+    cairo_surface_t* surf;
+    gdouble x, y;
+    SeedValue jsx, jsy;
+    CHECK_THIS_BOOL();
+
+    if (!seed_value_is_object(ctx, value)) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Cairo.Surface.fallback_resolution must be an array [x,y]");
+        return FALSE;
     }
 
-  jsx = seed_object_get_property_at_index (ctx, (SeedObject) value, 0, exception);
-  jsy = seed_object_get_property_at_index (ctx, (SeedObject) value, 1, exception);
+    jsx = seed_object_get_property_at_index(ctx, (SeedObject) value, 0,
+                                            exception);
+    jsy = seed_object_get_property_at_index(ctx, (SeedObject) value, 1,
+                                            exception);
 
-  surf = seed_object_to_cairo_surface (ctx, this_object, exception);
-  x = seed_value_to_double (ctx, jsx, exception);
-  y = seed_value_to_double (ctx, jsy, exception);
+    surf = seed_object_to_cairo_surface(ctx, this_object, exception);
+    x = seed_value_to_double(ctx, jsx, exception);
+    y = seed_value_to_double(ctx, jsy, exception);
 
-  cairo_surface_set_fallback_resolution (surf, x, y);
-  return TRUE;
+    cairo_surface_set_fallback_resolution(surf, x, y);
+    return TRUE;
 }
 
 static SeedValue
 seed_cairo_surface_get_fallback_resolution(SeedContext ctx,
-					   SeedObject this_object,
-					   SeedString property_name,
-					   SeedException *exception)
+                                           SeedObject this_object,
+                                           SeedString property_name,
+                                           SeedException* exception)
 {
-  SeedValue offsets[2];
-  cairo_surface_t *surf;
-  gdouble x, y;
-  CHECK_THIS();
+    SeedValue offsets[2];
+    cairo_surface_t* surf;
+    gdouble x, y;
+    CHECK_THIS();
 
-  surf = seed_object_to_cairo_surface (ctx, this_object, exception);
-  cairo_surface_get_fallback_resolution (surf, &x, &y);
+    surf = seed_object_to_cairo_surface(ctx, this_object, exception);
+    cairo_surface_get_fallback_resolution(surf, &x, &y);
 
-  offsets[0] = seed_value_from_double (ctx, x, exception);
-  offsets[1] = seed_value_from_double (ctx, y, exception);
+    offsets[0] = seed_value_from_double(ctx, x, exception);
+    offsets[1] = seed_value_from_double(ctx, y, exception);
 
-  return seed_make_array (ctx, offsets, 2, exception);
+    return seed_make_array(ctx, offsets, 2, exception);
 }
 
 static SeedValue
-seed_cairo_surface_get_type (SeedContext ctx,
-			     SeedObject this_object,
-			     SeedString property_name,
-			     SeedException *exception)
+seed_cairo_surface_get_type(SeedContext ctx,
+                            SeedObject this_object,
+                            SeedString property_name,
+                            SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_long (ctx, cairo_surface_get_type (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_long(ctx,
+                                cairo_surface_get_type(
+                                  seed_object_to_cairo_surface(ctx, this_object,
+                                                               exception)),
+                                exception);
 }
 
 static SeedValue
-seed_cairo_surface_copy_page (SeedContext ctx,
-			      SeedObject function,
-			      SeedObject this_object,
-			      gsize argument_count,
-			      const SeedValue arguments[],
-			      SeedException *exception)
+seed_cairo_surface_copy_page(SeedContext ctx,
+                             SeedObject function,
+                             SeedObject this_object,
+                             gsize argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_surface_copy_page (seed_object_to_cairo_surface(ctx, this_object, exception));
-  return seed_make_undefined (ctx);
+    CHECK_THIS();
+    cairo_surface_copy_page(
+      seed_object_to_cairo_surface(ctx, this_object, exception));
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_surface_show_page (SeedContext ctx,
-			      SeedObject function,
-			      SeedObject this_object,
-			      gsize argument_count,
-			      const SeedValue arguments[],
-			      SeedException *exception)
+seed_cairo_surface_show_page(SeedContext ctx,
+                             SeedObject function,
+                             SeedObject this_object,
+                             gsize argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_surface_show_page (seed_object_to_cairo_surface(ctx, this_object, exception));
-  return seed_make_undefined (ctx);
+    CHECK_THIS();
+    cairo_surface_show_page(
+      seed_object_to_cairo_surface(ctx, this_object, exception));
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
 seed_cairo_surface_has_show_text_glyphs(SeedContext ctx,
-					SeedObject function,
-					SeedObject this_object,
-					gsize argument_count,
-					const SeedValue arguments[],
-					SeedException *exception)
+                                        SeedObject function,
+                                        SeedObject this_object,
+                                        gsize argument_count,
+                                        const SeedValue arguments[],
+                                        SeedException* exception)
 {
-  CHECK_THIS();
-  return seed_value_from_boolean (ctx,
-				  cairo_surface_has_show_text_glyphs (seed_object_to_cairo_surface(ctx, this_object, exception)), exception);
+    CHECK_THIS();
+    return seed_value_from_boolean(
+      ctx, cairo_surface_has_show_text_glyphs(
+             seed_object_to_cairo_surface(ctx, this_object, exception)),
+      exception);
 }
 
 static SeedValue
-seed_cairo_surface_write_to_png (SeedContext ctx,
-				 SeedObject function,
-				 SeedObject this_object,
-				 gsize argument_count,
-				 const SeedValue arguments[],
-				 SeedException *exception)
+seed_cairo_surface_write_to_png(SeedContext ctx,
+                                SeedObject function,
+                                SeedObject this_object,
+                                gsize argument_count,
+                                const SeedValue arguments[],
+                                SeedException* exception)
 {
-  cairo_status_t ret;
-  cairo_surface_t *surf;
-  gchar *filename;
-  CHECK_THIS();
-
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("write_to_png", "1 argument");
+    cairo_status_t ret;
+    cairo_surface_t* surf;
+    gchar* filename;
+    CHECK_THIS();
+
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("write_to_png", "1 argument");
     }
 
-  surf = seed_object_get_private (this_object);
-  filename = seed_value_to_string (ctx, arguments[0], exception);
+    surf = seed_object_get_private(this_object);
+    filename = seed_value_to_string(ctx, arguments[0], exception);
 
-  ret = cairo_surface_write_to_png (surf, filename);
-  g_free (filename);
+    ret = cairo_surface_write_to_png(surf, filename);
+    g_free(filename);
 
-  return seed_value_from_long (ctx, ret, exception);
+    return seed_value_from_long(ctx, ret, exception);
 }
 
-
-seed_static_function surface_funcs[] = {
-  {"create_similar", seed_cairo_surface_create_similar, 0},
-  {"finish", seed_cairo_surface_finish, 0},
-  {"flush", seed_cairo_surface_flush, 0},
-  //  {"get_font_options", seed_cairo_surface_get_font_options, 0},
-  {"mark_dirty", seed_cairo_surface_mark_dirty, 0},
-  {"mark_dirty_rectangle", seed_cairo_surface_mark_dirty_rectangle, 0},
-  {"copy_page", seed_cairo_surface_copy_page, 0},
-  {"show_page", seed_cairo_surface_show_page, 0},
-  {"has_show_text_glyphs", seed_cairo_surface_has_show_text_glyphs, 0},
-  {"write_to_png", seed_cairo_surface_write_to_png, 0},
-  {0,0,0}
-};
+seed_static_function surface_funcs[]
+  = { { "create_similar", seed_cairo_surface_create_similar, 0 },
+      { "finish", seed_cairo_surface_finish, 0 },
+      { "flush", seed_cairo_surface_flush, 0 },
+      //  {"get_font_options", seed_cairo_surface_get_font_options, 0},
+      { "mark_dirty", seed_cairo_surface_mark_dirty, 0 },
+      { "mark_dirty_rectangle", seed_cairo_surface_mark_dirty_rectangle, 0 },
+      { "copy_page", seed_cairo_surface_copy_page, 0 },
+      { "show_page", seed_cairo_surface_show_page, 0 },
+      { "has_show_text_glyphs", seed_cairo_surface_has_show_text_glyphs, 0 },
+      { "write_to_png", seed_cairo_surface_write_to_png, 0 },
+      { 0, 0, 0 } };
 
 seed_static_value surface_values[] = {
-  {"type", seed_cairo_surface_get_type, 0, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"content", seed_cairo_surface_get_content, 0,  SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"status", seed_cairo_surface_status, 0, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"device_offset", seed_cairo_surface_get_device_offset, seed_cairo_surface_set_device_offset, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"fallback_resolution", seed_cairo_surface_get_fallback_resolution, seed_cairo_surface_set_fallback_resolution, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {0, 0, 0, 0}
+    { "type", seed_cairo_surface_get_type, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "content", seed_cairo_surface_get_content, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "status", seed_cairo_surface_status, 0,
+      SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "device_offset", seed_cairo_surface_get_device_offset,
+      seed_cairo_surface_set_device_offset,
+      SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { "fallback_resolution", seed_cairo_surface_get_fallback_resolution,
+      seed_cairo_surface_set_fallback_resolution,
+      SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+    { 0, 0, 0, 0 }
 };
 
 void
-seed_define_cairo_surface (SeedContext ctx,
-			   SeedObject namespace_ref)
+seed_define_cairo_surface(SeedContext ctx, SeedObject namespace_ref)
 {
-  seed_class_definition surface_def = seed_empty_class;
+    seed_class_definition surface_def = seed_empty_class;
 
-  surface_def.class_name = "Surface";
-  surface_def.finalize = seed_cairo_surface_finalize;
-  surface_def.static_functions = surface_funcs;
-  surface_def.static_values = surface_values;
+    surface_def.class_name = "Surface";
+    surface_def.finalize = seed_cairo_surface_finalize;
+    surface_def.static_functions = surface_funcs;
+    surface_def.static_values = surface_values;
 
-  seed_cairo_surface_class = seed_create_class (&surface_def);
+    seed_cairo_surface_class = seed_create_class(&surface_def);
 
-  seed_define_cairo_image_surface (ctx, namespace_ref);
-  seed_define_cairo_pdf_surface (ctx, namespace_ref);
+    seed_define_cairo_image_surface(ctx, namespace_ref);
+    seed_define_cairo_pdf_surface(ctx, namespace_ref);
 }
diff --git a/modules/cairo/seed-cairo-surface.h b/modules/cairo/seed-cairo-surface.h
index e58e9bb..d08ede6 100644
--- a/modules/cairo/seed-cairo-surface.h
+++ b/modules/cairo/seed-cairo-surface.h
@@ -1,11 +1,14 @@
 #ifndef _SEED_CAIRO_SURFACE_H
 #define _SEED_CAIRO_SURFACE_H
 
-SeedClass seed_get_cairo_surface_class ();
+SeedClass seed_get_cairo_surface_class();
 
-void seed_define_cairo_surface (SeedContext ctx, SeedObject namespace_ref);
+void seed_define_cairo_surface(SeedContext ctx, SeedObject namespace_ref);
 
-cairo_surface_t *seed_object_to_cairo_surface (SeedContext ctx, SeedObject obj, SeedException *exception);
-SeedObject seed_object_from_cairo_surface (SeedContext ctx, cairo_surface_t *surf);
+cairo_surface_t* seed_object_to_cairo_surface(SeedContext ctx,
+                                              SeedObject obj,
+                                              SeedException* exception);
+SeedObject seed_object_from_cairo_surface(SeedContext ctx,
+                                          cairo_surface_t* surf);
 
 #endif
diff --git a/modules/cairo/seed-cairo.c b/modules/cairo/seed-cairo.c
index 09ec4c4..031591c 100644
--- a/modules/cairo/seed-cairo.c
+++ b/modules/cairo/seed-cairo.c
@@ -27,1822 +27,1805 @@
 #include "seed-cairo-matrix.h"
 #include "seed-cairo-pattern.h"
 
-SeedEngine *eng;
-
-#define CAIRO_CONTEXT_PRIV(obj) ((cairo_t *)seed_object_get_private(obj))
-
-#define CHECK_CAIRO(obj) ({						\
-      if (!seed_object_is_of_class (ctx, obj, seed_cairo_class)){	\
-	seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Context"); \
-	return seed_make_undefined (ctx);				\
-      }									\
-      if (!seed_object_get_private (obj)){				\
-	seed_make_exception (ctx, exception, "ArgumentError", "Cairo Context has been destroyed"); \
-	return seed_make_undefined (ctx);}})
-
-#define CHECK_THIS() if (!seed_object_get_private (this_object)){	\
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo Context has been destroyed"); \
-    return seed_make_undefined (ctx);}
+SeedEngine* eng;
+
+#define CAIRO_CONTEXT_PRIV(obj) ((cairo_t*) seed_object_get_private(obj))
+
+#define CHECK_CAIRO(obj)                                                       \
+    ({                                                                         \
+        if (!seed_object_is_of_class(ctx, obj, seed_cairo_class)) {            \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Object is not a Cairo Context");              \
+            return seed_make_undefined(ctx);                                   \
+        }                                                                      \
+        if (!seed_object_get_private(obj)) {                                   \
+            seed_make_exception(ctx, exception, "ArgumentError",               \
+                                "Cairo Context has been destroyed");           \
+            return seed_make_undefined(ctx);                                   \
+        }                                                                      \
+    })
+
+#define CHECK_THIS()                                                           \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo Context has been destroyed");               \
+        return seed_make_undefined(ctx);                                       \
+    }
 
-#define CHECK_THIS_BOOL() if (!seed_object_get_private (this_object)){	\
-    seed_make_exception (ctx, exception, "ArgumentError", "Cairo Context has been destroyed"); \
-    return FALSE;}
+#define CHECK_THIS_BOOL()                                                      \
+    if (!seed_object_get_private(this_object)) {                               \
+        seed_make_exception(ctx, exception, "ArgumentError",                   \
+                            "Cairo Context has been destroyed");               \
+        return FALSE;                                                          \
+    }
 
 SeedClass seed_cairo_context_class;
 
-cairo_user_data_key_t *
-seed_get_cairo_key ()
+cairo_user_data_key_t*
+seed_get_cairo_key()
 {
-  static cairo_user_data_key_t foobaz;
+    static cairo_user_data_key_t foobaz;
 
-  return &foobaz;
+    return &foobaz;
 }
 
 void
-seed_cairo_destroy_func (void *obj)
+seed_cairo_destroy_func(void* obj)
 {
-  SeedObject object = (SeedObject)obj;
-  seed_object_set_private (object, NULL);
+    SeedObject object = (SeedObject) obj;
+    seed_object_set_private(object, NULL);
 }
 
-cairo_t *
-seed_object_to_cairo_context (SeedContext ctx, SeedObject obj, SeedException *exception)
+cairo_t*
+seed_object_to_cairo_context(SeedContext ctx,
+                             SeedObject obj,
+                             SeedException* exception)
 {
-  if (seed_object_is_of_class (ctx, obj, seed_cairo_context_class))
-    return CAIRO_CONTEXT_PRIV (obj);
-  seed_make_exception (ctx, exception, "ArgumentError", "Object is not a Cairo Context");
-  return NULL;
+    if (seed_object_is_of_class(ctx, obj, seed_cairo_context_class))
+        return CAIRO_CONTEXT_PRIV(obj);
+    seed_make_exception(ctx, exception, "ArgumentError",
+                        "Object is not a Cairo Context");
+    return NULL;
 }
 
 SeedObject
-seed_object_from_cairo_context (SeedContext ctx, cairo_t *cr)
+seed_object_from_cairo_context(SeedContext ctx, cairo_t* cr)
 {
-  SeedObject jsobj;
+    SeedObject jsobj;
 
-  jsobj = cairo_get_user_data (cr, seed_get_cairo_key());
-  if (jsobj)
-    return jsobj;
+    jsobj = cairo_get_user_data(cr, seed_get_cairo_key());
+    if (jsobj)
+        return jsobj;
 
-  jsobj = seed_make_object (ctx, seed_cairo_context_class, cr);
-  cairo_set_user_data (cr, seed_get_cairo_key(), jsobj, seed_cairo_destroy_func);
-  return jsobj;
+    jsobj = seed_make_object(ctx, seed_cairo_context_class, cr);
+    cairo_set_user_data(cr, seed_get_cairo_key(), jsobj,
+                        seed_cairo_destroy_func);
+    return jsobj;
 }
 
 void
-seed_cairo_context_finalize (SeedObject obj)
+seed_cairo_context_finalize(SeedObject obj)
 {
-  cairo_t *cr = CAIRO_CONTEXT_PRIV (obj);
-  if (cr)
-    {
-      cairo_set_user_data (cr, seed_get_cairo_key(), NULL, NULL);
-      cairo_destroy (cr);
+    cairo_t* cr = CAIRO_CONTEXT_PRIV(obj);
+    if (cr) {
+        cairo_set_user_data(cr, seed_get_cairo_key(), NULL, NULL);
+        cairo_destroy(cr);
     }
 }
 
 static SeedObject
-seed_cairo_construct_context (SeedContext ctx,
-			      SeedObject constructor,
-			      size_t argument_count,
-			      const SeedValue arguments[],
-			      SeedException * exception)
-{
-  cairo_surface_t *surf;
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("Context", "1 argument");
+seed_cairo_construct_context(SeedContext ctx,
+                             SeedObject constructor,
+                             size_t argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
+{
+    cairo_surface_t* surf;
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("Context", "1 argument");
     }
-  surf = seed_object_to_cairo_surface (ctx, arguments[0], exception);
-  if (!surf)
-    return seed_make_undefined (ctx);
-  return seed_object_from_cairo_context (ctx, cairo_create (surf));
+    surf = seed_object_to_cairo_surface(ctx, arguments[0], exception);
+    if (!surf)
+        return seed_make_undefined(ctx);
+    return seed_object_from_cairo_context(ctx, cairo_create(surf));
 }
 
 static SeedObject
-seed_cairo_construct_context_from_window (SeedContext ctx,
-					    SeedObject constructor,
-					    size_t argument_count,
-					    const SeedValue arguments[],
-					    SeedException * exception)
-{
-  GObject *obj;
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("Context", "1 argument");
+seed_cairo_construct_context_from_window(SeedContext ctx,
+                                         SeedObject constructor,
+                                         size_t argument_count,
+                                         const SeedValue arguments[],
+                                         SeedException* exception)
+{
+    GObject* obj;
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("Context", "1 argument");
     }
-  obj = seed_value_to_object (ctx, arguments[0], exception);
-  if (!GDK_IS_WINDOW(obj))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "Context.from_window requires a GdkWindow argument");
-      return seed_make_null (ctx);
+    obj = seed_value_to_object(ctx, arguments[0], exception);
+    if (!GDK_IS_WINDOW(obj)) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Context.from_window requires a GdkWindow argument");
+        return seed_make_null(ctx);
     }
 
-  return seed_object_from_cairo_context (ctx, gdk_cairo_create (GDK_WINDOW (obj)));
+    return seed_object_from_cairo_context(ctx,
+                                          gdk_cairo_create(GDK_WINDOW(obj)));
 }
 
 static SeedObject
-seed_cairo_construct_context_steal (SeedContext ctx,
-				    SeedObject constructor,
-				    size_t argument_count,
-				    const SeedValue arguments[],
-				    SeedException * exception)
-{
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("Context", "1 argument");
+seed_cairo_construct_context_steal(SeedContext ctx,
+                                   SeedObject constructor,
+                                   size_t argument_count,
+                                   const SeedValue arguments[],
+                                   SeedException* exception)
+{
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("Context", "1 argument");
+    }
+    cairo_t* cr = seed_pointer_get_pointer(ctx, arguments[0]);
+    if (!cr) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Context.steal requires a cairo context argument");
+        return seed_make_null(ctx);
     }
-  cairo_t* cr = seed_pointer_get_pointer(ctx, arguments[0]);
-  if (!cr) {
-    seed_make_exception (ctx, exception, "ArgumentError", "Context.steal requires a cairo context argument");
-	  return seed_make_null (ctx);
-  }
-  return seed_object_from_cairo_context (ctx, cr);
+    return seed_object_from_cairo_context(ctx, cr);
 }
 
 static SeedValue
-seed_cairo_save (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 gsize argument_count,
-		 const SeedValue arguments[],
-		 SeedException *exception)
+seed_cairo_save(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_save(cr);
-  return seed_make_undefined (ctx);
+    cairo_save(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_restore (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
+seed_cairo_restore(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_restore(cr);
-  return seed_make_undefined (ctx);
+    cairo_restore(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_get_target (SeedContext ctx,
-		       SeedObject this_object,
-		       SeedString property_name,
-		       SeedException *exception)
+seed_cairo_get_target(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  return seed_object_from_cairo_surface (ctx, cairo_get_target (cr));
+    return seed_object_from_cairo_surface(ctx, cairo_get_target(cr));
 }
 
 static SeedValue
-seed_cairo_push_group (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       gsize argument_count,
-		       const SeedValue arguments[],
-		       SeedException *exception)
+seed_cairo_push_group(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_push_group(cr);
-  return seed_make_undefined (ctx);
+    cairo_push_group(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_push_group_with_content (SeedContext ctx,
-				    SeedObject function,
-				    SeedObject this_object,
-				    gsize argument_count,
-				    const SeedValue arguments[],
-				    SeedException *exception)
+seed_cairo_push_group_with_content(SeedContext ctx,
+                                   SeedObject function,
+                                   SeedObject this_object,
+                                   gsize argument_count,
+                                   const SeedValue arguments[],
+                                   SeedException* exception)
 {
-  cairo_content_t content;
-  cairo_t *cr;
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("push_group_with_content", "1 argument");
+    cairo_content_t content;
+    cairo_t* cr;
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("push_group_with_content", "1 argument");
     }
 
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
-  content = seed_value_to_long (ctx, arguments[0], exception);
-  cairo_push_group_with_content(cr, content);
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
+    content = seed_value_to_long(ctx, arguments[0], exception);
+    cairo_push_group_with_content(cr, content);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_pop_group_to_source (SeedContext ctx,
-				SeedObject function,
-				SeedObject this_object,
-				gsize argument_count,
-				const SeedValue arguments[],
-				SeedException *exception)
+seed_cairo_pop_group_to_source(SeedContext ctx,
+                               SeedObject function,
+                               SeedObject this_object,
+                               gsize argument_count,
+                               const SeedValue arguments[],
+                               SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_pop_group_to_source(cr);
-  return seed_make_undefined (ctx);
+    cairo_pop_group_to_source(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_get_group_target (SeedContext ctx,
-			     SeedObject function,
-			     SeedObject this_object,
-			     gsize argument_count,
-			     const SeedValue arguments[],
-			     SeedException *exception)
+seed_cairo_get_group_target(SeedContext ctx,
+                            SeedObject function,
+                            SeedObject this_object,
+                            gsize argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  return seed_object_from_cairo_surface (ctx, cairo_get_group_target (cr));
+    return seed_object_from_cairo_surface(ctx, cairo_get_group_target(cr));
 }
 
 static SeedValue
 seed_cairo_set_source_rgb(SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  gsize argument_count,
-			  const SeedValue arguments[],
-			  SeedException *exception)
+                          SeedObject function,
+                          SeedObject this_object,
+                          gsize argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  gdouble r,g,b;
-  cairo_t *cr;
+    gdouble r, g, b;
+    cairo_t* cr;
 
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("set_source_rgb", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("set_source_rgb", "3 arguments");
     }
-  r = seed_value_to_double (ctx, arguments[0], exception);
-  g = seed_value_to_double (ctx, arguments[1], exception);
-  b = seed_value_to_double (ctx, arguments[2], exception);
-  cairo_set_source_rgb (cr, r, g, b);
+    r = seed_value_to_double(ctx, arguments[0], exception);
+    g = seed_value_to_double(ctx, arguments[1], exception);
+    b = seed_value_to_double(ctx, arguments[2], exception);
+    cairo_set_source_rgb(cr, r, g, b);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
 seed_cairo_set_source_rgba(SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+                           SeedObject function,
+                           SeedObject this_object,
+                           gsize argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-  gdouble r,g,b,a;
-  cairo_t *cr;
+    gdouble r, g, b, a;
+    cairo_t* cr;
 
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("set_source_rgba", "4 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("set_source_rgba", "4 arguments");
     }
-  r = seed_value_to_double (ctx, arguments[0], exception);
-  g = seed_value_to_double (ctx, arguments[1], exception);
-  b = seed_value_to_double (ctx, arguments[2], exception);
-  a = seed_value_to_double (ctx, arguments[3], exception);
-  cairo_set_source_rgba (cr, r, g, b, a);
+    r = seed_value_to_double(ctx, arguments[0], exception);
+    g = seed_value_to_double(ctx, arguments[1], exception);
+    b = seed_value_to_double(ctx, arguments[2], exception);
+    a = seed_value_to_double(ctx, arguments[3], exception);
+    cairo_set_source_rgba(cr, r, g, b, a);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_set_source_surface (SeedContext ctx,
-			       SeedObject function,
-			       SeedObject this_object,
-			       gsize argument_count,
-			       const SeedValue arguments[],
-			       SeedException *exception)
+seed_cairo_set_source_surface(SeedContext ctx,
+                              SeedObject function,
+                              SeedObject this_object,
+                              gsize argument_count,
+                              const SeedValue arguments[],
+                              SeedException* exception)
 {
-  gdouble x,y;
-  cairo_surface_t *surface;
-  cairo_t *cr;
+    gdouble x, y;
+    cairo_surface_t* surface;
+    cairo_t* cr;
 
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
-  surface = seed_object_to_cairo_surface (ctx, arguments[0], exception);
-  if (!surface)
-    return seed_make_undefined (ctx);
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
+    surface = seed_object_to_cairo_surface(ctx, arguments[0], exception);
+    if (!surface)
+        return seed_make_undefined(ctx);
 
-  x = seed_value_to_double (ctx, arguments[1], exception);
-  y = seed_value_to_double (ctx, arguments[2], exception);
-  cairo_set_source_surface (cr, surface, x, y);
+    x = seed_value_to_double(ctx, arguments[1], exception);
+    y = seed_value_to_double(ctx, arguments[2], exception);
+    cairo_set_source_surface(cr, surface, x, y);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static gboolean
-seed_cairo_set_antialias (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value,
-			  SeedException *exception)
+seed_cairo_set_antialias(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedValue value,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  cairo_antialias_t antialias;
+    cairo_t* cr;
+    cairo_antialias_t antialias;
 
-  CHECK_THIS_BOOL();
-  cr = seed_object_get_private (this_object);
-  antialias = seed_value_to_long (ctx, value, exception);
+    CHECK_THIS_BOOL();
+    cr = seed_object_get_private(this_object);
+    antialias = seed_value_to_long(ctx, value, exception);
 
-  cairo_set_antialias (cr, antialias);
-  return TRUE;
+    cairo_set_antialias(cr, antialias);
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_get_antialias (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_cairo_get_antialias(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedException* exception)
 {
-  cairo_antialias_t antialias;
-  cairo_t *cr;
+    cairo_antialias_t antialias;
+    cairo_t* cr;
 
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
-  antialias = cairo_get_antialias (cr);
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
+    antialias = cairo_get_antialias(cr);
 
-  return seed_value_from_long (ctx, antialias, exception);
+    return seed_value_from_long(ctx, antialias, exception);
 }
 
 static SeedValue
 seed_cairo_set_dash(SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
-{
-  SeedValue length;
-  cairo_t *cr;
-  gdouble *dashes, offset;
-  gint num_dashes, i;
-
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
-
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("set_dash", "2 arguments");
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
+{
+    SeedValue length;
+    cairo_t* cr;
+    gdouble *dashes, offset;
+    gint num_dashes, i;
+
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
+
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("set_dash", "2 arguments");
     }
-  length = seed_object_get_property (ctx, arguments[0], "length");
-  num_dashes = seed_value_to_int (ctx, length, exception);
-  dashes = g_alloca (num_dashes * sizeof(gdouble));
-  for (i = 0; i < num_dashes; i++)
-    {
-      dashes[i] = seed_value_to_double(ctx,
-				       seed_object_get_property_at_index (ctx,
-									  arguments[0],
-									  i,
-									  exception),
-				       exception);
-
+    length = seed_object_get_property(ctx, arguments[0], "length");
+    num_dashes = seed_value_to_int(ctx, length, exception);
+    dashes = g_alloca(num_dashes * sizeof(gdouble));
+    for (i = 0; i < num_dashes; i++) {
+        dashes[i] = seed_value_to_double(
+          ctx,
+          seed_object_get_property_at_index(ctx, arguments[0], i, exception),
+          exception);
     }
-  offset = seed_value_to_double (ctx, arguments[1], exception);
-  cairo_set_dash (cr, dashes, num_dashes, offset);
+    offset = seed_value_to_double(ctx, arguments[1], exception);
+    cairo_set_dash(cr, dashes, num_dashes, offset);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_pop_group (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_pop_group(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
+    cr = seed_object_get_private(this_object);
 
-  return seed_object_from_cairo_pattern (ctx, cairo_pop_group (cr));
+    return seed_object_from_cairo_pattern(ctx, cairo_pop_group(cr));
 }
 
 static SeedValue
-seed_cairo_get_dash_count (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_get_dash_count(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          gsize argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  cairo_t *cr;
-  gint dash_count;
-  CHECK_THIS();
+    cairo_t* cr;
+    gint dash_count;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  dash_count = cairo_get_dash_count (cr);
+    cr = seed_object_get_private(this_object);
+    dash_count = cairo_get_dash_count(cr);
 
-  return seed_value_from_int (ctx, dash_count, exception);
+    return seed_value_from_int(ctx, dash_count, exception);
 }
 
 static SeedValue
-seed_cairo_get_dash (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     gsize argument_count,
-		     const SeedValue arguments[],
-		     SeedException *exception)
+seed_cairo_get_dash(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  SeedValue ret[2], *jsdashes;
-  cairo_t *cr;
-  gint dash_count, i;
-  gdouble *dashes, offset;
+    SeedValue ret[2], *jsdashes;
+    cairo_t* cr;
+    gint dash_count, i;
+    gdouble *dashes, offset;
 
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
-  dash_count = cairo_get_dash_count (cr);
-  dashes = g_alloca (dash_count * sizeof(gdouble));
-  jsdashes = g_alloca (dash_count * sizeof(SeedValue));
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
+    dash_count = cairo_get_dash_count(cr);
+    dashes = g_alloca(dash_count * sizeof(gdouble));
+    jsdashes = g_alloca(dash_count * sizeof(SeedValue));
 
-  cairo_get_dash (cr, dashes, &offset);
-  for (i = 0; i < dash_count; i++)
-    {
-      jsdashes[i] = seed_value_from_double (ctx, dashes[i], exception);
+    cairo_get_dash(cr, dashes, &offset);
+    for (i = 0; i < dash_count; i++) {
+        jsdashes[i] = seed_value_from_double(ctx, dashes[i], exception);
     }
-  ret[0] = seed_make_array (ctx, jsdashes, dash_count, exception);
-  ret[1] = seed_value_from_double (ctx, offset, exception);
+    ret[0] = seed_make_array(ctx, jsdashes, dash_count, exception);
+    ret[1] = seed_value_from_double(ctx, offset, exception);
 
-  return seed_make_array (ctx, ret, 2, exception);
+    return seed_make_array(ctx, ret, 2, exception);
 }
 
 static SeedValue
-seed_cairo_get_fill_rule (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_cairo_get_fill_rule(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_long (ctx, cairo_get_fill_rule (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_long(ctx, cairo_get_fill_rule(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_fill_rule (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value,
-			  SeedException *exception)
+seed_cairo_set_fill_rule(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedValue value,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_fill_rule (cr, seed_value_to_long (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_fill_rule(cr, seed_value_to_long(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
-
 static SeedValue
-seed_cairo_get_line_cap (SeedContext ctx,
-			 SeedObject this_object,
-			 SeedString property_name,
-			 SeedException *exception)
+seed_cairo_get_line_cap(SeedContext ctx,
+                        SeedObject this_object,
+                        SeedString property_name,
+                        SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_long (ctx, cairo_get_line_cap (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_long(ctx, cairo_get_line_cap(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_line_cap (SeedContext ctx,
-			 SeedObject this_object,
-			 SeedString property_name,
-			 SeedValue value,
-			 SeedException *exception)
+seed_cairo_set_line_cap(SeedContext ctx,
+                        SeedObject this_object,
+                        SeedString property_name,
+                        SeedValue value,
+                        SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_line_cap (cr, seed_value_to_long (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_line_cap(cr, seed_value_to_long(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_get_line_join (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_cairo_get_line_join(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_long (ctx, cairo_get_line_join (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_long(ctx, cairo_get_line_join(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_line_join (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value,
-			  SeedException *exception)
+seed_cairo_set_line_join(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedValue value,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_line_join (cr, seed_value_to_long (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_line_join(cr, seed_value_to_long(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
-
 static SeedValue
-seed_cairo_get_line_width (SeedContext ctx,
-			   SeedObject this_object,
-			   SeedString property_name,
-			   SeedException *exception)
+seed_cairo_get_line_width(SeedContext ctx,
+                          SeedObject this_object,
+                          SeedString property_name,
+                          SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_double (ctx, cairo_get_line_width (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_double(ctx, cairo_get_line_width(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_line_width (SeedContext ctx,
-			   SeedObject this_object,
-			   SeedString property_name,
-			   SeedValue value,
-			   SeedException *exception)
+seed_cairo_set_line_width(SeedContext ctx,
+                          SeedObject this_object,
+                          SeedString property_name,
+                          SeedValue value,
+                          SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_line_width (cr, seed_value_to_double (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_line_width(cr, seed_value_to_double(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_get_miter_limit (SeedContext ctx,
-			    SeedObject this_object,
-			    SeedString property_name,
-			    SeedException *exception)
+seed_cairo_get_miter_limit(SeedContext ctx,
+                           SeedObject this_object,
+                           SeedString property_name,
+                           SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_double (ctx, cairo_get_miter_limit (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_double(ctx, cairo_get_miter_limit(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_miter_limit (SeedContext ctx,
-			    SeedObject this_object,
-			    SeedString property_name,
-			    SeedValue value,
-			    SeedException *exception)
+seed_cairo_set_miter_limit(SeedContext ctx,
+                           SeedObject this_object,
+                           SeedString property_name,
+                           SeedValue value,
+                           SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_miter_limit (cr, seed_value_to_double (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_miter_limit(cr, seed_value_to_double(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_get_operator (SeedContext ctx,
-			 SeedObject this_object,
-			 SeedString property_name,
-			 SeedException *exception)
+seed_cairo_get_operator(SeedContext ctx,
+                        SeedObject this_object,
+                        SeedString property_name,
+                        SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_long (ctx, cairo_get_operator (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_long(ctx, cairo_get_operator(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_operator (SeedContext ctx,
-			 SeedObject this_object,
-			 SeedString property_name,
-			 SeedValue value,
-			 SeedException *exception)
+seed_cairo_set_operator(SeedContext ctx,
+                        SeedObject this_object,
+                        SeedString property_name,
+                        SeedValue value,
+                        SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_operator (cr, seed_value_to_long (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_operator(cr, seed_value_to_long(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_get_tolerance (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_cairo_get_tolerance(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  return seed_value_from_double (ctx, cairo_get_tolerance (cr), exception);
+    cr = seed_object_get_private(this_object);
+    return seed_value_from_double(ctx, cairo_get_tolerance(cr), exception);
 }
 
 static gboolean
-seed_cairo_set_tolerance (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value,
-			  SeedException *exception)
+seed_cairo_set_tolerance(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedValue value,
+                         SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_tolerance (cr, seed_value_to_double (ctx, value, exception));
+    cr = seed_object_get_private(this_object);
+    cairo_set_tolerance(cr, seed_value_to_double(ctx, value, exception));
 
-  return TRUE;
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_clip (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 gsize argument_count,
-		 const SeedValue arguments[],
-		 SeedException *exception)
+seed_cairo_clip(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_clip(cr);
-  return seed_make_undefined (ctx);
+    cairo_clip(cr);
+    return seed_make_undefined(ctx);
 }
 
-
 static SeedValue
-seed_cairo_clip_preserve (SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  gsize argument_count,
-			  const SeedValue arguments[],
-			  SeedException *exception)
+seed_cairo_clip_preserve(SeedContext ctx,
+                         SeedObject function,
+                         SeedObject this_object,
+                         gsize argument_count,
+                         const SeedValue arguments[],
+                         SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_clip_preserve(cr);
-  return seed_make_undefined (ctx);
+    cairo_clip_preserve(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_reset_clip (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       gsize argument_count,
-		       const SeedValue arguments[],
-		       SeedException *exception)
+seed_cairo_reset_clip(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_reset_clip(cr);
-  return seed_make_undefined (ctx);
+    cairo_reset_clip(cr);
+    return seed_make_undefined(ctx);
 }
 
-
 static SeedValue
-seed_cairo_clip_extents (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_clip_extents(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  SeedValue jsextents[4];
-  gdouble extents[4];
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    SeedValue jsextents[4];
+    gdouble extents[4];
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("clip_extents", "4 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("clip_extents", "4 arguments");
     }
 
-  cairo_clip_extents (cr, &extents[0], &extents[1], &extents[2], &extents[3]);
-  jsextents[0] = seed_value_from_double (ctx, extents[0], exception);
-  jsextents[1] = seed_value_from_double (ctx, extents[1], exception);
-  jsextents[2] = seed_value_from_double (ctx, extents[2], exception);
-  jsextents[3] = seed_value_from_double (ctx, extents[3], exception);
+    cairo_clip_extents(cr, &extents[0], &extents[1], &extents[2], &extents[3]);
+    jsextents[0] = seed_value_from_double(ctx, extents[0], exception);
+    jsextents[1] = seed_value_from_double(ctx, extents[1], exception);
+    jsextents[2] = seed_value_from_double(ctx, extents[2], exception);
+    jsextents[3] = seed_value_from_double(ctx, extents[3], exception);
 
-  return seed_make_array (ctx, jsextents, 4, exception);
+    return seed_make_array(ctx, jsextents, 4, exception);
 }
 
-
 static SeedValue
-seed_cairo_fill (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 gsize argument_count,
-		 const SeedValue arguments[],
-		 SeedException *exception)
+seed_cairo_fill(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_fill(cr);
-  return seed_make_undefined (ctx);
+    cairo_fill(cr);
+    return seed_make_undefined(ctx);
 }
 
-
 static SeedValue
-seed_cairo_fill_preserve (SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  gsize argument_count,
-			  const SeedValue arguments[],
-			  SeedException *exception)
+seed_cairo_fill_preserve(SeedContext ctx,
+                         SeedObject function,
+                         SeedObject this_object,
+                         gsize argument_count,
+                         const SeedValue arguments[],
+                         SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_fill_preserve(cr);
-  return seed_make_undefined (ctx);
+    cairo_fill_preserve(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_fill_extents (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_fill_extents(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  SeedValue jsextents[4];
-  gdouble extents[4];
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    SeedValue jsextents[4];
+    gdouble extents[4];
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("clip_extents", "4 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("clip_extents", "4 arguments");
     }
 
-  cairo_fill_extents (cr, &extents[0], &extents[1], &extents[2], &extents[3]);
-  jsextents[0] = seed_value_from_double (ctx, extents[0], exception);
-  jsextents[1] = seed_value_from_double (ctx, extents[1], exception);
-  jsextents[2] = seed_value_from_double (ctx, extents[2], exception);
-  jsextents[3] = seed_value_from_double (ctx, extents[3], exception);
+    cairo_fill_extents(cr, &extents[0], &extents[1], &extents[2], &extents[3]);
+    jsextents[0] = seed_value_from_double(ctx, extents[0], exception);
+    jsextents[1] = seed_value_from_double(ctx, extents[1], exception);
+    jsextents[2] = seed_value_from_double(ctx, extents[2], exception);
+    jsextents[3] = seed_value_from_double(ctx, extents[3], exception);
 
-  return seed_make_array (ctx, jsextents, 4, exception);
+    return seed_make_array(ctx, jsextents, 4, exception);
 }
 
 static SeedValue
-seed_cairo_in_fill (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
+seed_cairo_in_fill(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  gdouble x, y;
-  cairo_t *cr;
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
+    gdouble x, y;
+    cairo_t* cr;
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("in_fill", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("in_fill", "2 arguments");
     }
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  return seed_value_from_boolean (ctx, cairo_in_fill (cr, x, y), exception);
+    return seed_value_from_boolean(ctx, cairo_in_fill(cr, x, y), exception);
 }
 
 static SeedValue
-seed_cairo_mask_surface (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_mask_surface(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  gdouble x,y;
-  cairo_surface_t *surface;
-  cairo_t *cr;
+    gdouble x, y;
+    cairo_surface_t* surface;
+    cairo_t* cr;
 
-  cr = seed_object_get_private (this_object);
-  surface = seed_object_to_cairo_surface (ctx, arguments[0], exception);
-  if (!surface)
-    return seed_make_undefined (ctx);
+    cr = seed_object_get_private(this_object);
+    surface = seed_object_to_cairo_surface(ctx, arguments[0], exception);
+    if (!surface)
+        return seed_make_undefined(ctx);
 
-  x = seed_value_to_double (ctx, arguments[1], exception);
-  y = seed_value_to_double (ctx, arguments[2], exception);
-  cairo_mask_surface (cr, surface, x, y);
+    x = seed_value_to_double(ctx, arguments[1], exception);
+    y = seed_value_to_double(ctx, arguments[2], exception);
+    cairo_mask_surface(cr, surface, x, y);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_mask (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 gsize argument_count,
-		 const SeedValue arguments[],
-		 SeedException *exception)
+seed_cairo_mask(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  cairo_t *cr;
-  cairo_pattern_t *pat;
+    cairo_t* cr;
+    cairo_pattern_t* pat;
 
-  CHECK_THIS();
-  if (argument_count != 1 && argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("mask", "1 or 3 arguments");
+    CHECK_THIS();
+    if (argument_count != 1 && argument_count != 3) {
+        EXPECTED_EXCEPTION("mask", "1 or 3 arguments");
     }
-  if (argument_count == 3)
-    return seed_cairo_mask_surface (ctx, function, this_object, argument_count, arguments, exception);
-  cr = seed_object_get_private (this_object);
-  pat = seed_object_to_cairo_pattern (ctx, arguments[0], exception);
-  if (!pat)
-    {
-      seed_make_exception (ctx, arguments[0], "ArgumentError", "First argument should be a cairo_pattern"
-			   " (or cairo surface if there are three arguments)");
-      return seed_make_undefined (ctx);
+    if (argument_count == 3)
+        return seed_cairo_mask_surface(ctx, function, this_object,
+                                       argument_count, arguments, exception);
+    cr = seed_object_get_private(this_object);
+    pat = seed_object_to_cairo_pattern(ctx, arguments[0], exception);
+    if (!pat) {
+        seed_make_exception(ctx, arguments[0], "ArgumentError",
+                            "First argument should be a cairo_pattern"
+                            " (or cairo surface if there are three arguments)");
+        return seed_make_undefined(ctx);
     }
-  cairo_mask (cr, pat);
-  return seed_make_undefined (ctx);
+    cairo_mask(cr, pat);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_paint (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  gsize argument_count,
-		  const SeedValue arguments[],
-		  SeedException *exception)
+seed_cairo_paint(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 gsize argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_paint(cr);
-  return seed_make_undefined (ctx);
+    cairo_paint(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_paint_with_alpha (SeedContext ctx,
-			     SeedObject function,
-			     SeedObject this_object,
-			     gsize argument_count,
-			     const SeedValue arguments[],
-			     SeedException *exception)
+seed_cairo_paint_with_alpha(SeedContext ctx,
+                            SeedObject function,
+                            SeedObject this_object,
+                            gsize argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_t* cr;
+    CHECK_THIS();
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("paint_with_alpha", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("paint_with_alpha", "1 argument");
     }
 
-  cr = seed_object_get_private (this_object);
-  cairo_paint_with_alpha (cr, seed_value_to_double (ctx, arguments[0], exception));
+    cr = seed_object_get_private(this_object);
+    cairo_paint_with_alpha(cr,
+                           seed_value_to_double(ctx, arguments[0], exception));
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_stroke (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   gsize argument_count,
-		   const SeedValue arguments[],
-		   SeedException *exception)
+seed_cairo_stroke(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_stroke(cr);
-  return seed_make_undefined (ctx);
+    cairo_stroke(cr);
+    return seed_make_undefined(ctx);
 }
 
-
 static SeedValue
-seed_cairo_stroke_preserve (SeedContext ctx,
-			    SeedObject function,
-			    SeedObject this_object,
-			    gsize argument_count,
-			    const SeedValue arguments[],
-			    SeedException *exception)
+seed_cairo_stroke_preserve(SeedContext ctx,
+                           SeedObject function,
+                           SeedObject this_object,
+                           gsize argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_stroke_preserve(cr);
-  return seed_make_undefined (ctx);
+    cairo_stroke_preserve(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_stroke_extents (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_stroke_extents(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          gsize argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  SeedValue jsextents[4];
-  gdouble extents[4];
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    SeedValue jsextents[4];
+    gdouble extents[4];
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("clip_extents", "4 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("clip_extents", "4 arguments");
     }
 
-  cairo_stroke_extents (cr, &extents[0], &extents[1], &extents[2], &extents[3]);
-  jsextents[0] = seed_value_from_double (ctx, extents[0], exception);
-  jsextents[1] = seed_value_from_double (ctx, extents[1], exception);
-  jsextents[2] = seed_value_from_double (ctx, extents[2], exception);
-  jsextents[3] = seed_value_from_double (ctx, extents[3], exception);
+    cairo_stroke_extents(cr, &extents[0], &extents[1], &extents[2],
+                         &extents[3]);
+    jsextents[0] = seed_value_from_double(ctx, extents[0], exception);
+    jsextents[1] = seed_value_from_double(ctx, extents[1], exception);
+    jsextents[2] = seed_value_from_double(ctx, extents[2], exception);
+    jsextents[3] = seed_value_from_double(ctx, extents[3], exception);
 
-  return seed_make_array (ctx, jsextents, 4, exception);
+    return seed_make_array(ctx, jsextents, 4, exception);
 }
 
 static SeedValue
-seed_cairo_in_stroke (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_in_stroke(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  gdouble x, y;
-  cairo_t *cr;
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
+    gdouble x, y;
+    cairo_t* cr;
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("in_stroke", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("in_stroke", "2 arguments");
     }
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  return seed_value_from_boolean (ctx, cairo_in_stroke (cr, x, y), exception);
+    return seed_value_from_boolean(ctx, cairo_in_stroke(cr, x, y), exception);
 }
 
 static SeedValue
-seed_cairo_copy_page (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_copy_page(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_copy_page(cr);
-  return seed_make_undefined (ctx);
+    cairo_copy_page(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_show_page (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_show_page(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_show_page(cr);
-  return seed_make_undefined (ctx);
+    cairo_show_page(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_has_current_point (SeedContext ctx,
-			      SeedObject function,
-			      SeedObject this_object,
-			      gsize argument_count,
-			      const SeedValue arguments[],
-			      SeedException *exception)
+seed_cairo_has_current_point(SeedContext ctx,
+                             SeedObject function,
+                             SeedObject this_object,
+                             gsize argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  return seed_value_from_boolean (ctx, cairo_has_current_point(cr), exception);
+    return seed_value_from_boolean(ctx, cairo_has_current_point(cr), exception);
 }
 
 static SeedValue
-seed_cairo_get_current_point (SeedContext ctx,
-			      SeedObject function,
-			      SeedObject this_object,
-			      gsize argument_count,
-			      const SeedValue arguments[],
-			      SeedException *exception)
+seed_cairo_get_current_point(SeedContext ctx,
+                             SeedObject function,
+                             SeedObject this_object,
+                             gsize argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
 {
-  SeedValue points[2];
-  gdouble x, y;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    SeedValue points[2];
+    gdouble x, y;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_get_current_point (cr, &x, &y);
-  points[0] = seed_value_from_double (ctx, x, exception);
-  points[1] = seed_value_from_double (ctx, y, exception);
+    cairo_get_current_point(cr, &x, &y);
+    points[0] = seed_value_from_double(ctx, x, exception);
+    points[1] = seed_value_from_double(ctx, y, exception);
 
-  return seed_make_array (ctx, points, 2, exception);
+    return seed_make_array(ctx, points, 2, exception);
 }
 
 static SeedValue
-seed_cairo_new_path (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     gsize argument_count,
-		     const SeedValue arguments[],
-		     SeedException *exception)
+seed_cairo_new_path(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_new_path(cr);
-  return seed_make_undefined (ctx);
+    cairo_new_path(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_new_sub_path (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_new_sub_path(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_new_sub_path(cr);
-  return seed_make_undefined (ctx);
+    cairo_new_sub_path(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_close_path (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       gsize argument_count,
-		       const SeedValue arguments[],
-		       SeedException *exception)
+seed_cairo_close_path(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_close_path(cr);
-  return seed_make_undefined (ctx);
+    cairo_close_path(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_arc (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		gsize argument_count,
-		const SeedValue arguments[],
-		SeedException *exception)
+seed_cairo_arc(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gdouble xc, yc, radius, angle1, angle2;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble xc, yc, radius, angle1, angle2;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 5)
-    {
-      EXPECTED_EXCEPTION ("arc", "5 arguments");
+    if (argument_count != 5) {
+        EXPECTED_EXCEPTION("arc", "5 arguments");
     }
-  xc = seed_value_to_double (ctx, arguments[0], exception);
-  yc = seed_value_to_double (ctx, arguments[1], exception);
-  radius = seed_value_to_double (ctx, arguments[2], exception);
-  angle1 = seed_value_to_double (ctx, arguments[3], exception);
-  angle2 = seed_value_to_double (ctx, arguments[4], exception);
+    xc = seed_value_to_double(ctx, arguments[0], exception);
+    yc = seed_value_to_double(ctx, arguments[1], exception);
+    radius = seed_value_to_double(ctx, arguments[2], exception);
+    angle1 = seed_value_to_double(ctx, arguments[3], exception);
+    angle2 = seed_value_to_double(ctx, arguments[4], exception);
 
-  cairo_arc (cr, xc, yc, radius, angle1, angle2);
-  return seed_make_undefined (ctx);
+    cairo_arc(cr, xc, yc, radius, angle1, angle2);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_arc_negative (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_arc_negative(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  gdouble xc, yc, radius, angle1, angle2;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble xc, yc, radius, angle1, angle2;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 5)
-    {
-      EXPECTED_EXCEPTION ("arc_negative", "5 arguments");
+    if (argument_count != 5) {
+        EXPECTED_EXCEPTION("arc_negative", "5 arguments");
     }
-  xc = seed_value_to_double (ctx, arguments[0], exception);
-  yc = seed_value_to_double (ctx, arguments[1], exception);
-  radius = seed_value_to_double (ctx, arguments[2], exception);
-  angle1 = seed_value_to_double (ctx, arguments[3], exception);
-  angle2 = seed_value_to_double (ctx, arguments[4], exception);
+    xc = seed_value_to_double(ctx, arguments[0], exception);
+    yc = seed_value_to_double(ctx, arguments[1], exception);
+    radius = seed_value_to_double(ctx, arguments[2], exception);
+    angle1 = seed_value_to_double(ctx, arguments[3], exception);
+    angle2 = seed_value_to_double(ctx, arguments[4], exception);
 
-  cairo_arc_negative (cr, xc, yc, radius, angle1, angle2);
-  return seed_make_undefined (ctx);
+    cairo_arc_negative(cr, xc, yc, radius, angle1, angle2);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_curve_to (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     gsize argument_count,
-		     const SeedValue arguments[],
-		     SeedException *exception)
+seed_cairo_curve_to(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  gdouble x1,y1,x2,y2,x3,y3;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1, x2, y2, x3, y3;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 6)
-    {
-      EXPECTED_EXCEPTION ("curve_to", "6 arguments");
+    if (argument_count != 6) {
+        EXPECTED_EXCEPTION("curve_to", "6 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
-  x2 = seed_value_to_double (ctx, arguments[2], exception);
-  y2 = seed_value_to_double (ctx, arguments[3], exception);
-  x3 = seed_value_to_double (ctx, arguments[4], exception);
-  y3 = seed_value_to_double (ctx, arguments[5], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
+    x2 = seed_value_to_double(ctx, arguments[2], exception);
+    y2 = seed_value_to_double(ctx, arguments[3], exception);
+    x3 = seed_value_to_double(ctx, arguments[4], exception);
+    y3 = seed_value_to_double(ctx, arguments[5], exception);
 
-  cairo_curve_to (cr, x1, y2, x2, y2, x3, y3);
-  return seed_make_undefined (ctx);
+    cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_rel_curve_to (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_rel_curve_to(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  gdouble x1,y1,x2,y2,x3,y3;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1, x2, y2, x3, y3;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 6)
-    {
-      EXPECTED_EXCEPTION ("rel_curve_to", "6 arguments");
+    if (argument_count != 6) {
+        EXPECTED_EXCEPTION("rel_curve_to", "6 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
-  x2 = seed_value_to_double (ctx, arguments[2], exception);
-  y2 = seed_value_to_double (ctx, arguments[3], exception);
-  x3 = seed_value_to_double (ctx, arguments[4], exception);
-  y3 = seed_value_to_double (ctx, arguments[5], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
+    x2 = seed_value_to_double(ctx, arguments[2], exception);
+    y2 = seed_value_to_double(ctx, arguments[3], exception);
+    x3 = seed_value_to_double(ctx, arguments[4], exception);
+    y3 = seed_value_to_double(ctx, arguments[5], exception);
 
-  cairo_rel_curve_to (cr, x1, y2, x2, y2, x3, y3);
-  return seed_make_undefined (ctx);
+    cairo_rel_curve_to(cr, x1, y1, x2, y2, x3, y3);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_line_to (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
+seed_cairo_line_to(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  gdouble x1,y1;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("line_to", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("line_to", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_line_to (cr, x1, y1);
-  return seed_make_undefined (ctx);
+    cairo_line_to(cr, x1, y1);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_rel_line_to (SeedContext ctx,
-			SeedObject function,
-			SeedObject this_object,
-			gsize argument_count,
-			const SeedValue arguments[],
-			SeedException *exception)
+seed_cairo_rel_line_to(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue arguments[],
+                       SeedException* exception)
 {
-  gdouble x1,y1;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("rel_line_to", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("rel_line_to", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_rel_line_to (cr, x1, y1);
-  return seed_make_undefined (ctx);
+    cairo_rel_line_to(cr, x1, y1);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_move_to (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
+seed_cairo_move_to(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  gdouble x1,y1;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("move_to", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("move_to", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_move_to (cr, x1, y1);
-  return seed_make_undefined (ctx);
+    cairo_move_to(cr, x1, y1);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_rel_move_to (SeedContext ctx,
-			SeedObject function,
-			SeedObject this_object,
-			gsize argument_count,
-			const SeedValue arguments[],
-			SeedException *exception)
+seed_cairo_rel_move_to(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue arguments[],
+                       SeedException* exception)
 {
-  gdouble x1,y1;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("rel_move_to", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("rel_move_to", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_rel_move_to (cr, x1, y1);
-  return seed_make_undefined (ctx);
+    cairo_rel_move_to(cr, x1, y1);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_rectangle (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_rectangle(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  gdouble x1,y1, width, height;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1, width, height;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION ("rectangle", "2 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("rectangle", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
-  width = seed_value_to_double (ctx, arguments[2], exception);
-  height = seed_value_to_double (ctx, arguments[3], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
+    width = seed_value_to_double(ctx, arguments[2], exception);
+    height = seed_value_to_double(ctx, arguments[3], exception);
 
-  cairo_rectangle (cr, x1, y1, width, height);
-  return seed_make_undefined (ctx);
+    cairo_rectangle(cr, x1, y1, width, height);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_text_path (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_text_path(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  cairo_t *cr;
-  gchar *text;
-  CHECK_THIS();
-  cr = seed_object_get_private (this_object);
+    cairo_t* cr;
+    gchar* text;
+    CHECK_THIS();
+    cr = seed_object_get_private(this_object);
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("text_path", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("text_path", "1 argument");
     }
-  text = seed_value_to_string (ctx, arguments[0], exception);
-  cairo_text_path (cr, text);
-  g_free (text);
+    text = seed_value_to_string(ctx, arguments[0], exception);
+    cairo_text_path(cr, text);
+    g_free(text);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_path_extents (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 gsize argument_count,
-			 const SeedValue arguments[],
-			 SeedException *exception)
+seed_cairo_path_extents(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  SeedValue jsextents[4];
-  gdouble extents[4];
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    SeedValue jsextents[4];
+    gdouble extents[4];
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 4)
-    {
-      EXPECTED_EXCEPTION("path_extents", "4 arguments");
+    if (argument_count != 4) {
+        EXPECTED_EXCEPTION("path_extents", "4 arguments");
     }
 
-  cairo_path_extents (cr, &extents[0], &extents[1], &extents[2], &extents[3]);
-  jsextents[0] = seed_value_from_double (ctx, extents[0], exception);
-  jsextents[1] = seed_value_from_double (ctx, extents[1], exception);
-  jsextents[2] = seed_value_from_double (ctx, extents[2], exception);
-  jsextents[3] = seed_value_from_double (ctx, extents[3], exception);
+    cairo_path_extents(cr, &extents[0], &extents[1], &extents[2], &extents[3]);
+    jsextents[0] = seed_value_from_double(ctx, extents[0], exception);
+    jsextents[1] = seed_value_from_double(ctx, extents[1], exception);
+    jsextents[2] = seed_value_from_double(ctx, extents[2], exception);
+    jsextents[3] = seed_value_from_double(ctx, extents[3], exception);
 
-  return seed_make_array (ctx, jsextents, 4, exception);
+    return seed_make_array(ctx, jsextents, 4, exception);
 }
 
 static SeedValue
-seed_cairo_translate (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_translate(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  gdouble x1,y1;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("translate", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("translate", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_translate (cr, x1, y1);
-  return seed_make_undefined (ctx);
+    cairo_translate(cr, x1, y1);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_scale (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  gsize argument_count,
-		  const SeedValue arguments[],
-		  SeedException *exception)
+seed_cairo_scale(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 gsize argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  gdouble x1,y1;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble x1, y1;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("scale", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("scale", "2 arguments");
     }
-  x1 = seed_value_to_double (ctx, arguments[0], exception);
-  y1 = seed_value_to_double (ctx, arguments[1], exception);
+    x1 = seed_value_to_double(ctx, arguments[0], exception);
+    y1 = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_scale (cr, x1, y1);
-  return seed_make_undefined (ctx);
+    cairo_scale(cr, x1, y1);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_rotate (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   gsize argument_count,
-		   const SeedValue arguments[],
-		   SeedException *exception)
+seed_cairo_rotate(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  gdouble angle;
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    gdouble angle;
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("rotate", "1 arguments");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("rotate", "1 arguments");
     }
-  angle = seed_value_to_double (ctx, arguments[0], exception);
+    angle = seed_value_to_double(ctx, arguments[0], exception);
 
-
-  cairo_rotate (cr, angle);
-  return seed_make_undefined (ctx);
+    cairo_rotate(cr, angle);
+    return seed_make_undefined(ctx);
 }
 
-
-
-
 static SeedValue
-seed_cairo_transform (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      gsize argument_count,
-		      const SeedValue arguments[],
-		      SeedException *exception)
+seed_cairo_transform(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  cairo_matrix_t matrix;
-  cairo_t *cr;
-  CHECK_THIS();
+    cairo_matrix_t matrix;
+    cairo_t* cr;
+    CHECK_THIS();
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("transform", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("transform", "1 argument");
     }
-  if (!seed_value_to_cairo_matrix (ctx, arguments[0], &matrix, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "transform expects an array [xx,yx,xy,yy,x0,y0]");
-      return seed_make_undefined (ctx);
+    if (!seed_value_to_cairo_matrix(ctx, arguments[0], &matrix, exception)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "transform expects an array [xx,yx,xy,yy,x0,y0]");
+        return seed_make_undefined(ctx);
     }
-  cr = seed_object_get_private (this_object);
+    cr = seed_object_get_private(this_object);
 
-  cairo_transform (cr, &matrix);
-  return seed_make_undefined (ctx);
+    cairo_transform(cr, &matrix);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_get_matrix (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_cairo_get_matrix(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
-  cairo_t *cr;
-  cairo_matrix_t m;
-  CHECK_THIS();
+    cairo_t* cr;
+    cairo_matrix_t m;
+    CHECK_THIS();
 
-  cr = seed_object_get_private (this_object);
-  cairo_get_matrix (cr, &m);
-  return seed_value_from_cairo_matrix (ctx, &m, exception);
+    cr = seed_object_get_private(this_object);
+    cairo_get_matrix(cr, &m);
+    return seed_value_from_cairo_matrix(ctx, &m, exception);
 }
 
 static gboolean
-seed_cairo_set_matrix (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value,
-			  SeedException *exception)
-{
-  cairo_matrix_t m;
-  cairo_t *cr;
-  CHECK_THIS_BOOL();
-
-  cr = seed_object_get_private (this_object);
-  if (!seed_value_to_cairo_matrix (ctx, value, &m, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "matrix must be an array [xx,yx,xy,yy,x0,y0]");
-      return FALSE;
+seed_cairo_set_matrix(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedValue value,
+                      SeedException* exception)
+{
+    cairo_matrix_t m;
+    cairo_t* cr;
+    CHECK_THIS_BOOL();
+
+    cr = seed_object_get_private(this_object);
+    if (!seed_value_to_cairo_matrix(ctx, value, &m, exception)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "matrix must be an array [xx,yx,xy,yy,x0,y0]");
+        return FALSE;
     }
-  cairo_set_matrix (cr, &m);
+    cairo_set_matrix(cr, &m);
 
-  return TRUE;
+    return TRUE;
 }
 
 static SeedValue
-seed_cairo_identity_matrix (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 gsize argument_count,
-		 const SeedValue arguments[],
-		 SeedException *exception)
+seed_cairo_identity_matrix(SeedContext ctx,
+                           SeedObject function,
+                           SeedObject this_object,
+                           gsize argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-  CHECK_THIS();
-  cairo_t *cr = seed_object_get_private (this_object);
+    CHECK_THIS();
+    cairo_t* cr = seed_object_get_private(this_object);
 
-  cairo_identity_matrix(cr);
-  return seed_make_undefined (ctx);
+    cairo_identity_matrix(cr);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_cairo_user_to_device (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_user_to_device(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          gsize argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  SeedValue out[2];
-  cairo_t *cr;
-  double ix, iy;
+    SeedValue out[2];
+    cairo_t* cr;
+    double ix, iy;
 
-  CHECK_THIS();
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("user_to_device", "2 arguments");
+    CHECK_THIS();
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("user_to_device", "2 arguments");
     }
-  cr = seed_object_get_private (this_object);
-  ix = seed_value_to_double (ctx, arguments[0], exception);
-  iy = seed_value_to_double (ctx, arguments[1], exception);
+    cr = seed_object_get_private(this_object);
+    ix = seed_value_to_double(ctx, arguments[0], exception);
+    iy = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_user_to_device (cr, &ix, &iy);
-  out[0] = seed_value_from_double (ctx, ix, exception);
-  out[1] = seed_value_from_double (ctx, iy, exception);
+    cairo_user_to_device(cr, &ix, &iy);
+    out[0] = seed_value_from_double(ctx, ix, exception);
+    out[1] = seed_value_from_double(ctx, iy, exception);
 
-  return seed_make_array (ctx, out, 2, exception);
+    return seed_make_array(ctx, out, 2, exception);
 }
 
-
 static SeedValue
-seed_cairo_user_to_device_distance (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_user_to_device_distance(SeedContext ctx,
+                                   SeedObject function,
+                                   SeedObject this_object,
+                                   gsize argument_count,
+                                   const SeedValue arguments[],
+                                   SeedException* exception)
 {
-  SeedValue out[2];
-  cairo_t *cr;
-  double ix, iy;
+    SeedValue out[2];
+    cairo_t* cr;
+    double ix, iy;
 
-  CHECK_THIS();
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("user_to_device_distance", "2 arguments");
+    CHECK_THIS();
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("user_to_device_distance", "2 arguments");
     }
-  cr = seed_object_get_private (this_object);
-  ix = seed_value_to_double (ctx, arguments[0], exception);
-  iy = seed_value_to_double (ctx, arguments[1], exception);
+    cr = seed_object_get_private(this_object);
+    ix = seed_value_to_double(ctx, arguments[0], exception);
+    iy = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_user_to_device_distance (cr, &ix, &iy);
-  out[0] = seed_value_from_double (ctx, ix, exception);
-  out[1] = seed_value_from_double (ctx, iy, exception);
+    cairo_user_to_device_distance(cr, &ix, &iy);
+    out[0] = seed_value_from_double(ctx, ix, exception);
+    out[1] = seed_value_from_double(ctx, iy, exception);
 
-  return seed_make_array (ctx, out, 2, exception);
+    return seed_make_array(ctx, out, 2, exception);
 }
 
 static SeedValue
-seed_cairo_device_to_user (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_device_to_user(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          gsize argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  SeedValue out[2];
-  cairo_t *cr;
-  double ix, iy;
+    SeedValue out[2];
+    cairo_t* cr;
+    double ix, iy;
 
-  CHECK_THIS();
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("device_to_user", "2 arguments");
+    CHECK_THIS();
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("device_to_user", "2 arguments");
     }
-  cr = seed_object_get_private (this_object);
-  ix = seed_value_to_double (ctx, arguments[0], exception);
-  iy = seed_value_to_double (ctx, arguments[1], exception);
+    cr = seed_object_get_private(this_object);
+    ix = seed_value_to_double(ctx, arguments[0], exception);
+    iy = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_device_to_user (cr, &ix, &iy);
-  out[0] = seed_value_from_double (ctx, ix, exception);
-  out[1] = seed_value_from_double (ctx, iy, exception);
+    cairo_device_to_user(cr, &ix, &iy);
+    out[0] = seed_value_from_double(ctx, ix, exception);
+    out[1] = seed_value_from_double(ctx, iy, exception);
 
-  return seed_make_array (ctx, out, 2, exception);
+    return seed_make_array(ctx, out, 2, exception);
 }
 
 static SeedValue
-seed_cairo_device_to_user_distance (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   gsize argument_count,
-			   const SeedValue arguments[],
-			   SeedException *exception)
+seed_cairo_device_to_user_distance(SeedContext ctx,
+                                   SeedObject function,
+                                   SeedObject this_object,
+                                   gsize argument_count,
+                                   const SeedValue arguments[],
+                                   SeedException* exception)
 {
-  SeedValue out[2];
-  cairo_t *cr;
-  double ix, iy;
+    SeedValue out[2];
+    cairo_t* cr;
+    double ix, iy;
 
-  CHECK_THIS();
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("device_to_user_distance", "2 arguments");
+    CHECK_THIS();
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("device_to_user_distance", "2 arguments");
     }
-  cr = seed_object_get_private (this_object);
-  ix = seed_value_to_double (ctx, arguments[0], exception);
-  iy = seed_value_to_double (ctx, arguments[1], exception);
+    cr = seed_object_get_private(this_object);
+    ix = seed_value_to_double(ctx, arguments[0], exception);
+    iy = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_device_to_user_distance (cr, &ix, &iy);
-  out[0] = seed_value_from_double (ctx, ix, exception);
-  out[1] = seed_value_from_double (ctx, iy, exception);
+    cairo_device_to_user_distance(cr, &ix, &iy);
+    out[0] = seed_value_from_double(ctx, ix, exception);
+    out[1] = seed_value_from_double(ctx, iy, exception);
 
-  return seed_make_array (ctx, out, 2, exception);
+    return seed_make_array(ctx, out, 2, exception);
 }
 
 static SeedValue
-seed_cairo_set_source (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       gsize argument_count,
-		       const SeedValue arguments[],
-		       SeedException *exception)
+seed_cairo_set_source(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  cairo_t *cr;
-  cairo_pattern_t *pat;
+    cairo_t* cr;
+    cairo_pattern_t* pat;
 
-  CHECK_THIS();
-  if (argument_count != 1 && argument_count != 3)
-    {
-      EXPECTED_EXCEPTION("set_source", "1 or 3 arguments");
+    CHECK_THIS();
+    if (argument_count != 1 && argument_count != 3) {
+        EXPECTED_EXCEPTION("set_source", "1 or 3 arguments");
     }
 
-  if (argument_count == 3)
-    return seed_cairo_set_source_surface (ctx, function, this_object, argument_count, arguments, exception);
-  pat = seed_object_to_cairo_pattern (ctx, arguments[0], exception);
-  if (!pat)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "set_source needs a Cairo Pattern  as argument");
-      return seed_make_undefined (ctx);
+    if (argument_count == 3)
+        return seed_cairo_set_source_surface(ctx, function, this_object,
+                                             argument_count, arguments,
+                                             exception);
+    pat = seed_object_to_cairo_pattern(ctx, arguments[0], exception);
+    if (!pat) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "set_source needs a Cairo Pattern  as argument");
+        return seed_make_undefined(ctx);
     }
 
-  cr = seed_object_get_private (this_object);
-  cairo_set_source (cr,pat);
-
-  return seed_make_undefined (ctx);
-}
-
-static SeedValue
-seed_cairo_get_source (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       gsize argument_count,
-		       const SeedValue arguments[],
-		       SeedException *exception)
-{
-  cairo_t *cr;
-  CHECK_THIS();
-
-  cr = seed_object_get_private (this_object);
-
-  return seed_object_from_cairo_pattern (ctx, cairo_get_source(cr));
-}
-
-static SeedValue
-seed_cairo_destroy (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
-{
-  seed_cairo_context_finalize(this_object);
-  return seed_make_undefined (ctx);
-}
-
-seed_static_value cairo_values[] = {
-  {"antialias", seed_cairo_get_antialias, seed_cairo_set_antialias, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"fill_rule", seed_cairo_get_fill_rule, seed_cairo_set_fill_rule, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"line_cap", seed_cairo_get_line_cap, seed_cairo_set_line_cap, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"line_join", seed_cairo_get_line_join, seed_cairo_set_line_join, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"line_width", seed_cairo_get_line_width, seed_cairo_set_line_width, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"miter_limit", seed_cairo_get_miter_limit, seed_cairo_set_miter_limit, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"operator", seed_cairo_get_operator, seed_cairo_set_operator, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"tolerance", seed_cairo_get_tolerance, seed_cairo_set_tolerance, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"matrix", seed_cairo_get_matrix, seed_cairo_set_matrix, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {"target", seed_cairo_get_target, NULL, SEED_PROPERTY_ATTRIBUTE_READ_ONLY | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {NULL, NULL, NULL, 0}
-};
-
-seed_static_function cairo_funcs[] = {
-  {"save", seed_cairo_save, 0},
-  {"restore", seed_cairo_restore, 0},
-  {"push_group", seed_cairo_push_group, 0},
-  {"push_group_with_content", seed_cairo_push_group_with_content, 0},
-  {"set_dash", seed_cairo_set_dash, 0},
-  {"get_dash_count", seed_cairo_get_dash_count, 0},
-  {"get_dash", seed_cairo_get_dash, 0},
-  {"pop_group", seed_cairo_pop_group, 0},
-  {"pop_group_to_source", seed_cairo_pop_group_to_source, 0},
-  {"get_group_target", seed_cairo_get_group_target, 0},
-  {"set_source_rgb", seed_cairo_set_source_rgb, 0},
-  {"set_source_rgba", seed_cairo_set_source_rgba, 0},
-  {"set_source", seed_cairo_set_source, 0},
-  {"set_source_surface", seed_cairo_set_source_surface, 0},
-  {"get_source", seed_cairo_get_source, 0},
-  {"clip", seed_cairo_clip, 0},
-  {"clip_preserve", seed_cairo_clip_preserve, 0},
-  {"reset_clip", seed_cairo_reset_clip, 0},
-  {"clip_extents", seed_cairo_clip_extents, 0},
-  // Rectangle list stuff?
-  {"fill", seed_cairo_fill, 0},
-  {"fill_preserve", seed_cairo_fill_preserve, 0},
-  {"fill_extents", seed_cairo_fill_extents, 0},
-  {"mask", seed_cairo_mask, 0},
-  {"in_fill", seed_cairo_in_fill, 0},
-  {"paint", seed_cairo_paint, 0},
-  {"paint_with_alpha", seed_cairo_paint_with_alpha, 0},
-  {"stroke", seed_cairo_stroke, 0},
-  {"stroke_preserve", seed_cairo_stroke_preserve, 0},
-  {"stroke_extents", seed_cairo_stroke_extents, 0},
-  {"in_stroke", seed_cairo_in_stroke, 0},
-  {"copy_page", seed_cairo_copy_page, 0},
-  {"show_page", seed_cairo_show_page, 0},
-  {"has_current_point", seed_cairo_has_current_point, 0},
-  {"get_current_point", seed_cairo_get_current_point, 0},
-  {"new_path", seed_cairo_new_path, 0},
-  {"new_sub_path", seed_cairo_new_sub_path, 0},
-  {"close_path", seed_cairo_close_path, 0},
-  {"arc", seed_cairo_arc, 0},
-  {"arc_negative", seed_cairo_arc_negative, 0},
-  {"curve_to", seed_cairo_curve_to, 0},
-  {"line_to", seed_cairo_line_to, 0},
-  {"move_to", seed_cairo_move_to, 0},
-  {"rectangle", seed_cairo_rectangle, 0},
-  //{"cairo_glpyh_path", seed_cairo_glyph_path, 0},
-  {"text_path", seed_cairo_text_path, 0},
-  {"rel_curve_to", seed_cairo_rel_curve_to, 0},
-  {"rel_line_to", seed_cairo_rel_line_to, 0},
-  {"rel_move_to", seed_cairo_rel_move_to, 0},
-  {"path_extents", seed_cairo_path_extents, 0},
-  {"translate", seed_cairo_translate, 0},
-  {"scale", seed_cairo_scale, 0},
-  {"rotate", seed_cairo_rotate, 0},
-  {"transform", seed_cairo_transform, 0},
-  {"identify_matrix", seed_cairo_identity_matrix, 0},
-  {"user_to_device", seed_cairo_user_to_device, 0},
-  {"user_to_device_distance", seed_cairo_user_to_device_distance, 0},
-  {"device_to_user", seed_cairo_device_to_user, 0},
-  {"device_to_user_distance", seed_cairo_device_to_user_distance, 0},
-  {"destroy", seed_cairo_destroy, 0},
-  {NULL, NULL, 0}
-};
+    cr = seed_object_get_private(this_object);
+    cairo_set_source(cr, pat);
+
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+seed_cairo_get_source(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
+{
+    cairo_t* cr;
+    CHECK_THIS();
+
+    cr = seed_object_get_private(this_object);
+
+    return seed_object_from_cairo_pattern(ctx, cairo_get_source(cr));
+}
+
+static SeedValue
+seed_cairo_destroy(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
+{
+    seed_cairo_context_finalize(this_object);
+    return seed_make_undefined(ctx);
+}
+
+seed_static_value cairo_values[]
+  = { { "antialias", seed_cairo_get_antialias, seed_cairo_set_antialias,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "fill_rule", seed_cairo_get_fill_rule, seed_cairo_set_fill_rule,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "line_cap", seed_cairo_get_line_cap, seed_cairo_set_line_cap,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "line_join", seed_cairo_get_line_join, seed_cairo_set_line_join,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "line_width", seed_cairo_get_line_width, seed_cairo_set_line_width,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "miter_limit", seed_cairo_get_miter_limit, seed_cairo_set_miter_limit,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "operator", seed_cairo_get_operator, seed_cairo_set_operator,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "tolerance", seed_cairo_get_tolerance, seed_cairo_set_tolerance,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "matrix", seed_cairo_get_matrix, seed_cairo_set_matrix,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "target", seed_cairo_get_target, NULL,
+        SEED_PROPERTY_ATTRIBUTE_READ_ONLY
+          | SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { NULL, NULL, NULL, 0 } };
+
+seed_static_function cairo_funcs[]
+  = { { "save", seed_cairo_save, 0 },
+      { "restore", seed_cairo_restore, 0 },
+      { "push_group", seed_cairo_push_group, 0 },
+      { "push_group_with_content", seed_cairo_push_group_with_content, 0 },
+      { "set_dash", seed_cairo_set_dash, 0 },
+      { "get_dash_count", seed_cairo_get_dash_count, 0 },
+      { "get_dash", seed_cairo_get_dash, 0 },
+      { "pop_group", seed_cairo_pop_group, 0 },
+      { "pop_group_to_source", seed_cairo_pop_group_to_source, 0 },
+      { "get_group_target", seed_cairo_get_group_target, 0 },
+      { "set_source_rgb", seed_cairo_set_source_rgb, 0 },
+      { "set_source_rgba", seed_cairo_set_source_rgba, 0 },
+      { "set_source", seed_cairo_set_source, 0 },
+      { "set_source_surface", seed_cairo_set_source_surface, 0 },
+      { "get_source", seed_cairo_get_source, 0 },
+      { "clip", seed_cairo_clip, 0 },
+      { "clip_preserve", seed_cairo_clip_preserve, 0 },
+      { "reset_clip", seed_cairo_reset_clip, 0 },
+      { "clip_extents", seed_cairo_clip_extents, 0 },
+      // Rectangle list stuff?
+      { "fill", seed_cairo_fill, 0 },
+      { "fill_preserve", seed_cairo_fill_preserve, 0 },
+      { "fill_extents", seed_cairo_fill_extents, 0 },
+      { "mask", seed_cairo_mask, 0 },
+      { "in_fill", seed_cairo_in_fill, 0 },
+      { "paint", seed_cairo_paint, 0 },
+      { "paint_with_alpha", seed_cairo_paint_with_alpha, 0 },
+      { "stroke", seed_cairo_stroke, 0 },
+      { "stroke_preserve", seed_cairo_stroke_preserve, 0 },
+      { "stroke_extents", seed_cairo_stroke_extents, 0 },
+      { "in_stroke", seed_cairo_in_stroke, 0 },
+      { "copy_page", seed_cairo_copy_page, 0 },
+      { "show_page", seed_cairo_show_page, 0 },
+      { "has_current_point", seed_cairo_has_current_point, 0 },
+      { "get_current_point", seed_cairo_get_current_point, 0 },
+      { "new_path", seed_cairo_new_path, 0 },
+      { "new_sub_path", seed_cairo_new_sub_path, 0 },
+      { "close_path", seed_cairo_close_path, 0 },
+      { "arc", seed_cairo_arc, 0 },
+      { "arc_negative", seed_cairo_arc_negative, 0 },
+      { "curve_to", seed_cairo_curve_to, 0 },
+      { "line_to", seed_cairo_line_to, 0 },
+      { "move_to", seed_cairo_move_to, 0 },
+      { "rectangle", seed_cairo_rectangle, 0 },
+      //{"cairo_glpyh_path", seed_cairo_glyph_path, 0},
+      { "text_path", seed_cairo_text_path, 0 },
+      { "rel_curve_to", seed_cairo_rel_curve_to, 0 },
+      { "rel_line_to", seed_cairo_rel_line_to, 0 },
+      { "rel_move_to", seed_cairo_rel_move_to, 0 },
+      { "path_extents", seed_cairo_path_extents, 0 },
+      { "translate", seed_cairo_translate, 0 },
+      { "scale", seed_cairo_scale, 0 },
+      { "rotate", seed_cairo_rotate, 0 },
+      { "transform", seed_cairo_transform, 0 },
+      { "identify_matrix", seed_cairo_identity_matrix, 0 },
+      { "user_to_device", seed_cairo_user_to_device, 0 },
+      { "user_to_device_distance", seed_cairo_user_to_device_distance, 0 },
+      { "device_to_user", seed_cairo_device_to_user, 0 },
+      { "device_to_user_distance", seed_cairo_device_to_user_distance, 0 },
+      { "destroy", seed_cairo_destroy, 0 },
+      { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine * local_eng)
-{
-  SeedObject context_constructor_ref;
-  SeedObject gdk_context_constructor_ref;
-  SeedObject steal_context_constructor_ref;
-  SeedObject namespace_ref;
-  seed_class_definition cairo_def = seed_empty_class;
-  eng = local_eng;
-  namespace_ref = seed_make_object (eng->context, NULL, NULL);
-
-  // Temporary hack until API changes.
-  seed_value_protect (eng->context, namespace_ref);
-
-  seed_define_cairo_enums (eng->context, namespace_ref);
-  seed_define_cairo_surface (eng->context, namespace_ref);
-  seed_define_cairo_matrix (eng->context, namespace_ref);
-  seed_define_cairo_pattern (eng->context, namespace_ref);
-
-  cairo_def.class_name = "Context";
-  cairo_def.static_functions = cairo_funcs;
-  cairo_def.static_values = cairo_values;
-  cairo_def.finalize = seed_cairo_context_finalize;
-  seed_cairo_context_class = seed_create_class (&cairo_def);
-  // Hack around WebKit GC bug.
-  context_constructor_ref = seed_make_constructor (eng->context,
-						   NULL,
-						   //				   seed_cairo_context_class,
-						   seed_cairo_construct_context);
-  gdk_context_constructor_ref = seed_make_constructor (eng->context,
-						       NULL,
-						       //				   seed_cairo_context_class,
-						       seed_cairo_construct_context_from_window);
-  steal_context_constructor_ref = seed_make_constructor (eng->context,
-						       NULL,
-						       //				   seed_cairo_context_class,
-						       seed_cairo_construct_context_steal);
-
-  seed_object_set_property (eng->context, namespace_ref, "Context", context_constructor_ref);
-  seed_object_set_property (eng->context, context_constructor_ref, "from_window", gdk_context_constructor_ref);
-  seed_object_set_property (eng->context, context_constructor_ref, "steal", steal_context_constructor_ref);
-
-  return namespace_ref;
+seed_module_init(SeedEngine* local_eng)
+{
+    SeedObject context_constructor_ref;
+    SeedObject gdk_context_constructor_ref;
+    SeedObject steal_context_constructor_ref;
+    SeedObject namespace_ref;
+    seed_class_definition cairo_def = seed_empty_class;
+    eng = local_eng;
+    namespace_ref = seed_make_object(eng->context, NULL, NULL);
+
+    // Temporary hack until API changes.
+    seed_value_protect(eng->context, namespace_ref);
+
+    seed_define_cairo_enums(eng->context, namespace_ref);
+    seed_define_cairo_surface(eng->context, namespace_ref);
+    seed_define_cairo_matrix(eng->context, namespace_ref);
+    seed_define_cairo_pattern(eng->context, namespace_ref);
+
+    cairo_def.class_name = "Context";
+    cairo_def.static_functions = cairo_funcs;
+    cairo_def.static_values = cairo_values;
+    cairo_def.finalize = seed_cairo_context_finalize;
+    seed_cairo_context_class = seed_create_class(&cairo_def);
+    // Hack around WebKit GC bug.
+    context_constructor_ref = seed_make_constructor(
+      eng->context, NULL,
+      //				   seed_cairo_context_class,
+      seed_cairo_construct_context);
+    gdk_context_constructor_ref = seed_make_constructor(
+      eng->context, NULL,
+      //				   seed_cairo_context_class,
+      seed_cairo_construct_context_from_window);
+    steal_context_constructor_ref = seed_make_constructor(
+      eng->context, NULL,
+      //				   seed_cairo_context_class,
+      seed_cairo_construct_context_steal);
+
+    seed_object_set_property(eng->context, namespace_ref, "Context",
+                             context_constructor_ref);
+    seed_object_set_property(eng->context, context_constructor_ref,
+                             "from_window", gdk_context_constructor_ref);
+    seed_object_set_property(eng->context, context_constructor_ref, "steal",
+                             steal_context_constructor_ref);
+
+    return namespace_ref;
 }
diff --git a/modules/cairo/seed-cairo.h b/modules/cairo/seed-cairo.h
index 719fb8f..e0836d1 100644
--- a/modules/cairo/seed-cairo.h
+++ b/modules/cairo/seed-cairo.h
@@ -3,11 +3,12 @@
 #include <seed.h>
 #include <cairo/cairo.h>
 
-#define EXPECTED_EXCEPTION(name, argnum)				\
-  seed_make_exception (ctx, exception, "ArgumentError", name " expected " argnum " got %Zd", argument_count); \
-  return seed_make_undefined (ctx);
+#define EXPECTED_EXCEPTION(name, argnum)                                       \
+    seed_make_exception(ctx, exception, "ArgumentError",                       \
+                        name " expected " argnum " got %zd", argument_count);  \
+    return seed_make_undefined(ctx);
 
-cairo_user_data_key_t *seed_get_cairo_key ();
-void seed_cairo_destroy_func (void *obj);
+cairo_user_data_key_t* seed_get_cairo_key();
+void seed_cairo_destroy_func(void* obj);
 
 #endif
diff --git a/modules/canvas/Makefile.in b/modules/canvas/Makefile.in
index 70c27f1..18d9c6a 100644
--- a/modules/canvas/Makefile.in
+++ b/modules/canvas/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/canvas
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -101,12 +142,25 @@ libseed_canvas_la_OBJECTS = $(am_libseed_canvas_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_canvas_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_canvas_la_CFLAGS) $(CFLAGS) \
 	$(libseed_canvas_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_CANVAS_MODULE_TRUE@am_libseed_canvas_la_rpath = -rpath \
 @BUILD_CANVAS_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -119,20 +173,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_canvas_la_SOURCES)
 DIST_SOURCES = $(am__libseed_canvas_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -140,8 +190,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -205,6 +273,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -218,6 +288,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -241,8 +312,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -254,6 +334,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -348,6 +429,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -397,7 +479,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/canvas/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/canvas/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -415,6 +496,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -441,12 +523,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_canvas.la: $(libseed_canvas_la_OBJECTS) $(libseed_canvas_la_DEPENDENCIES) $(EXTRA_libseed_canvas_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_canvas_la_LINK) $(am_libseed_canvas_la_rpath) $(libseed_canvas_la_OBJECTS) $(libseed_canvas_la_LIBADD) $(LIBS)
 
@@ -463,14 +548,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -492,26 +577,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -523,15 +597,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -540,6 +610,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -684,19 +769,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/canvas/seed-canvas.c b/modules/canvas/seed-canvas.c
index aafac85..9ec9022 100644
--- a/modules/canvas/seed-canvas.c
+++ b/modules/canvas/seed-canvas.c
@@ -27,1069 +27,1068 @@
 
 SeedObject namespace_ref;
 SeedClass canvas_class;
-SeedEngine *eng;
+SeedEngine* eng;
 
-typedef struct _SeedCanvasColor {
-  gdouble r;
-  gdouble g;
-  gdouble b;
-  gdouble a;
+typedef struct _SeedCanvasColor
+{
+    gdouble r;
+    gdouble g;
+    gdouble b;
+    gdouble a;
 } SeedCanvasColor;
 
-typedef struct _SeedCanvasStyle {
-  SeedCanvasColor fill;
-  SeedCanvasColor stroke;
+typedef struct _SeedCanvasStyle
+{
+    SeedCanvasColor fill;
+    SeedCanvasColor stroke;
 
-  gdouble global_opacity;
-  cairo_operator_t operator;
+    gdouble global_opacity;
+    cairo_operator_t operator;
 } SeedCanvasStyle;
 
-typedef struct _SeedCanvasPrivates {
-  cairo_t *cr;
+typedef struct _SeedCanvasPrivates
+{
+    cairo_t* cr;
 
-  GSList *styles;
+    GSList* styles;
 } SeedCanvasPrivates;
 
-#define GET_CR  \
-  SeedCanvasPrivates *priv = seed_object_get_private(this_object);	\
-  cairo_t *cr = priv->cr
-
+#define GET_CR                                                                 \
+    SeedCanvasPrivates* priv = seed_object_get_private(this_object);           \
+    cairo_t* cr = priv->cr
 
 SeedObject
-canvas_construct_canvas_from_cairo (SeedContext ctx, cairo_t * cr,
-				    SeedException * exception)
+canvas_construct_canvas_from_cairo(SeedContext ctx,
+                                   cairo_t* cr,
+                                   SeedException* exception)
 {
-  SeedObject obj;
-  SeedCanvasPrivates *priv = g_slice_alloc(sizeof(SeedCanvasPrivates));
-
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_set_miter_limit (cr, 10);
-
-  priv->cr = cr;
-  priv->styles = NULL;
-
-  obj = seed_make_object (ctx, canvas_class, priv);
-
-  seed_object_set_property (ctx, obj, "globalAlpha",
-			    seed_value_from_double (ctx, 1.0, exception));
-  seed_object_set_property (ctx, obj, "lineWidth",
-			    seed_value_from_double (ctx, 1.0, exception));
-  seed_object_set_property (ctx, obj, "miterLimit",
-			    seed_value_from_double (ctx, 10, exception));
-  seed_object_set_property (ctx, obj, "lineCap",
-			    seed_value_from_string (ctx, "butt", exception));
-  seed_object_set_property (ctx, obj, "lineJoin",
-			    seed_value_from_string (ctx, "miter", exception));
-  seed_object_set_property (ctx, obj, "cairo",
-			    (SeedValue) seed_make_pointer (ctx, cr));
-
-  return obj;
+    SeedObject obj;
+    SeedCanvasPrivates* priv = g_slice_alloc(sizeof(SeedCanvasPrivates));
+
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_set_miter_limit(cr, 10);
+
+    priv->cr = cr;
+    priv->styles = NULL;
+
+    obj = seed_make_object(ctx, canvas_class, priv);
+
+    seed_object_set_property(ctx, obj, "globalAlpha",
+                             seed_value_from_double(ctx, 1.0, exception));
+    seed_object_set_property(ctx, obj, "lineWidth",
+                             seed_value_from_double(ctx, 1.0, exception));
+    seed_object_set_property(ctx, obj, "miterLimit",
+                             seed_value_from_double(ctx, 10, exception));
+    seed_object_set_property(ctx, obj, "lineCap",
+                             seed_value_from_string(ctx, "butt", exception));
+    seed_object_set_property(ctx, obj, "lineJoin",
+                             seed_value_from_string(ctx, "miter", exception));
+    seed_object_set_property(ctx, obj, "cairo",
+                             (SeedValue) seed_make_pointer(ctx, cr));
+
+    return obj;
 }
 
 SeedObject
-seed_construct_image_canvas (SeedContext ctx,
-			     SeedObject constructor,
-			     size_t argument_count,
-			     const SeedValue arguments[],
-			     SeedException * exception)
+seed_construct_image_canvas(SeedContext ctx,
+                            SeedObject constructor,
+                            size_t argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  SeedObject obj;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  gchar *filename;
-  gdouble width, height;
-
-  if (argument_count != 3)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Canvas.PDFCanvas constructor expected"
-			   "3 arguments");
-      return (SeedObject) seed_make_null (ctx);
+    SeedObject obj;
+    cairo_surface_t* surface;
+    cairo_t* cr;
+    gchar* filename;
+    gdouble width, height;
+
+    if (argument_count != 3) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Canvas.PDFCanvas constructor expected"
+                            "3 arguments");
+        return (SeedObject) seed_make_null(ctx);
     }
 
-  filename = seed_value_to_string (ctx, arguments[0], exception);
+    filename = seed_value_to_string(ctx, arguments[0], exception);
 
-  width = seed_value_to_double (ctx, arguments[1], exception);
-  height = seed_value_to_double (ctx, arguments[2], exception);
+    width = seed_value_to_double(ctx, arguments[1], exception);
+    height = seed_value_to_double(ctx, arguments[2], exception);
 
-  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-  cr = cairo_create (surface);
-  cairo_surface_destroy (surface);
+    surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+    cr = cairo_create(surface);
+    cairo_surface_destroy(surface);
 
-  obj = canvas_construct_canvas_from_cairo (ctx, cr, exception);
+    obj = canvas_construct_canvas_from_cairo(ctx, cr, exception);
 
-  return obj;
+    return obj;
 }
 
 SeedObject
-canvas_construct_pdf_canvas (SeedContext ctx,
-			     SeedObject constructor,
-			     size_t argument_count,
-			     const SeedValue arguments[],
-			     SeedException * exception)
+canvas_construct_pdf_canvas(SeedContext ctx,
+                            SeedObject constructor,
+                            size_t argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  SeedObject obj;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  gchar *filename;
-  gdouble width, height;
-
-  if (argument_count != 3)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Canvas.PDFCanvas constructor expected"
-			   "3 arguments");
-      return (SeedObject) seed_make_null (ctx);
+    SeedObject obj;
+    cairo_surface_t* surface;
+    cairo_t* cr;
+    gchar* filename;
+    gdouble width, height;
+
+    if (argument_count != 3) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Canvas.PDFCanvas constructor expected"
+                            "3 arguments");
+        return (SeedObject) seed_make_null(ctx);
     }
 
-  filename = seed_value_to_string (ctx, arguments[0], exception);
+    filename = seed_value_to_string(ctx, arguments[0], exception);
 
-  width = seed_value_to_double (ctx, arguments[1], exception);
-  height = seed_value_to_double (ctx, arguments[2], exception);
+    width = seed_value_to_double(ctx, arguments[1], exception);
+    height = seed_value_to_double(ctx, arguments[2], exception);
 
-  surface = cairo_pdf_surface_create (filename, width, height);
-  cr = cairo_create (surface);
-  cairo_surface_destroy (surface);
+    surface = cairo_pdf_surface_create(filename, width, height);
+    cr = cairo_create(surface);
+    cairo_surface_destroy(surface);
 
-  obj = canvas_construct_canvas_from_cairo (ctx, cr, exception);
+    obj = canvas_construct_canvas_from_cairo(ctx, cr, exception);
 
-  return obj;
+    return obj;
 }
 
 SeedObject
-canvas_construct_svg_canvas (SeedContext ctx,
-			     SeedObject constructor,
-			     size_t argument_count,
-			     const SeedValue arguments[],
-			     SeedException * exception)
+canvas_construct_svg_canvas(SeedContext ctx,
+                            SeedObject constructor,
+                            size_t argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  SeedObject obj;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  gchar *filename;
-  gdouble width, height;
-
-  if (argument_count != 3)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Canvas.PDFCanvas constructor expected"
-			   "3 arguments");
-      return (SeedObject) seed_make_null (ctx);
+    SeedObject obj;
+    cairo_surface_t* surface;
+    cairo_t* cr;
+    gchar* filename;
+    gdouble width, height;
+
+    if (argument_count != 3) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Canvas.PDFCanvas constructor expected"
+                            "3 arguments");
+        return (SeedObject) seed_make_null(ctx);
     }
 
-  filename = seed_value_to_string (ctx, arguments[0], exception);
+    filename = seed_value_to_string(ctx, arguments[0], exception);
 
-  width = seed_value_to_double (ctx, arguments[1], exception);
-  height = seed_value_to_double (ctx, arguments[2], exception);
+    width = seed_value_to_double(ctx, arguments[1], exception);
+    height = seed_value_to_double(ctx, arguments[2], exception);
 
-  surface = cairo_svg_surface_create (filename, width, height);
-  cr = cairo_create (surface);
-  cairo_surface_destroy (surface);
+    surface = cairo_svg_surface_create(filename, width, height);
+    cr = cairo_create(surface);
+    cairo_surface_destroy(surface);
 
-  obj = canvas_construct_canvas_from_cairo (ctx, cr, exception);
+    obj = canvas_construct_canvas_from_cairo(ctx, cr, exception);
 
-  return obj;
+    return obj;
 }
 
 SeedObject
-canvas_construct_canvas (SeedContext ctx,
-			 SeedObject constructor,
-			 size_t argument_count,
-			 const SeedValue arguments[],
-			 SeedException * exception)
+canvas_construct_canvas(SeedContext ctx,
+                        SeedObject constructor,
+                        size_t argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  SeedObject obj;
-  cairo_t *cr;
-  if (argument_count != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Canvas.CairoCanvas constructor"
-			   "expected 1 argument");
-      return (SeedObject) seed_make_null (ctx);
+    SeedObject obj;
+    cairo_t* cr;
+    if (argument_count != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Canvas.CairoCanvas constructor"
+                            "expected 1 argument");
+        return (SeedObject) seed_make_null(ctx);
     }
 
-  cr = seed_pointer_get_pointer (ctx, arguments[0]);
+    cr = seed_pointer_get_pointer(ctx, arguments[0]);
 
-  obj = canvas_construct_canvas_from_cairo (ctx, cr, exception);
+    obj = canvas_construct_canvas_from_cairo(ctx, cr, exception);
 
-  return obj;
+    return obj;
 }
 
 void
-seed_canvas_parse_color (SeedCanvasColor *color,
-			 gchar *spec)
+seed_canvas_parse_color(SeedCanvasColor* color, gchar* spec)
 {
-  if (*spec == '#')
-    {
-      guint r = 0, g = 0, b = 0, a = 0, found;
-
-      if (strlen (spec) > 4)
-	found = sscanf(spec, "#%2x%2x%2x%2x", &r, &g, &b, &a);
-      else
-	{
-	  found = sscanf (spec, "#%1x%1x%1x%1x", &r, &g, &b, &a);
-	  r *= 17;
-	  g *= 17;
-	  b *= 17;
-	  a *= 17;
-	}
-      if (found < 4)
-	a = 0xff;
-
-      color->r = r / 255.0;
-      color->g = g / 255.0;
-      color->b = b / 255.0;
-      color->a = a / 255.0;
-
-      return;
-    }
-  else if (*spec == 'r')
-    {
-      switch (*(spec + 3))
-	{
-	case 'a':
-	  {
-	    gdouble r, g, b;
-	    gfloat a;
-
-	    sscanf (spec, "rgba(%lf,%lf,%lf,%f)", &r, &g, &b, &a);
-
-	    color->r = r/255.0;
-	    color->g = g/255.0;
-	    color->b = b/255.0;
-	    color->a = a;
-
-	    return;
-	  }
-	case '(':
-	  {
-	    gdouble r, g, b;
-
-	    sscanf (spec, "rgb(%lf,%lf,%lf)", &r, &g, &b);
-
-	    color->r = r / 255.0;
-	    color->g = g / 255.0;
-	    color->b = b / 255.0;
-	    color->a = 1.0;
-
-	    return;
-	  }
-	}
-    }
-  else if (*spec == '[')
-    {
-      color->r = color->b = color->g = 0;
-      color->a = 1;
+    if (*spec == '#') {
+        guint r = 0, g = 0, b = 0, a = 0, found;
+
+        if (strlen(spec) > 4)
+            found = sscanf(spec, "#%2x%2x%2x%2x", &r, &g, &b, &a);
+        else {
+            found = sscanf(spec, "#%1x%1x%1x%1x", &r, &g, &b, &a);
+            r *= 17;
+            g *= 17;
+            b *= 17;
+            a *= 17;
+        }
+        if (found < 4)
+            a = 0xff;
+
+        color->r = r / 255.0;
+        color->g = g / 255.0;
+        color->b = b / 255.0;
+        color->a = a / 255.0;
+
+        return;
+    } else if (*spec == 'r') {
+        switch (*(spec + 3)) {
+            case 'a': {
+                gdouble r, g, b;
+                gfloat a;
+
+                sscanf(spec, "rgba(%lf,%lf,%lf,%f)", &r, &g, &b, &a);
+
+                color->r = r / 255.0;
+                color->g = g / 255.0;
+                color->b = b / 255.0;
+                color->a = a;
+
+                return;
+            }
+            case '(': {
+                gdouble r, g, b;
+
+                sscanf(spec, "rgb(%lf,%lf,%lf)", &r, &g, &b);
+
+                color->r = r / 255.0;
+                color->g = g / 255.0;
+                color->b = b / 255.0;
+                color->a = 1.0;
+
+                return;
+            }
+        }
+    } else if (*spec == '[') {
+        color->r = color->b = color->g = 0;
+        color->a = 1;
     }
 }
 
 gboolean
-seed_canvas_update_stroke_style (SeedContext ctx,
-				 SeedObject this_object,
-				 SeedString property_name,
-				 SeedValue value,
-				 SeedException * e)
+seed_canvas_update_stroke_style(SeedContext ctx,
+                                SeedObject this_object,
+                                SeedString property_name,
+                                SeedValue value,
+                                SeedException* e)
 {
-  SeedCanvasStyle *style;
-  SeedCanvasPrivates *priv = seed_object_get_private(this_object);
+    SeedCanvasStyle* style;
+    SeedCanvasPrivates* priv = seed_object_get_private(this_object);
 
-  gchar *stroke_style = seed_value_to_string (ctx, value, e);
+    gchar* stroke_style = seed_value_to_string(ctx, value, e);
 
-  if (!priv->styles)
-    {
-      priv->styles = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
-      ((SeedCanvasStyle *) priv->styles->data)->global_opacity = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->fill.a = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->operator = CAIRO_OPERATOR_OVER;
+    if (!priv->styles) {
+        priv->styles
+          = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
+        ((SeedCanvasStyle*) priv->styles->data)->global_opacity = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->fill.a = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->operator= CAIRO_OPERATOR_OVER;
     }
 
-  style = (SeedCanvasStyle *)priv->styles->data;
+    style = (SeedCanvasStyle*) priv->styles->data;
 
-  seed_canvas_parse_color (&style->stroke, stroke_style);
+    seed_canvas_parse_color(&style->stroke, stroke_style);
 
-  g_free(stroke_style);
+    g_free(stroke_style);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 gboolean
-seed_canvas_update_fill_style (SeedContext ctx,
-				 SeedObject this_object,
-				 SeedString property_name,
-				 SeedValue value, SeedException * e)
+seed_canvas_update_fill_style(SeedContext ctx,
+                              SeedObject this_object,
+                              SeedString property_name,
+                              SeedValue value,
+                              SeedException* e)
 {
-  SeedCanvasStyle *style;
-  SeedCanvasPrivates *priv = seed_object_get_private(this_object);
+    SeedCanvasStyle* style;
+    SeedCanvasPrivates* priv = seed_object_get_private(this_object);
 
-  gchar *fill_style = seed_value_to_string (ctx, value, e);
+    gchar* fill_style = seed_value_to_string(ctx, value, e);
 
-  if (!priv->styles)
-    {
-      priv->styles = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
-      ((SeedCanvasStyle *) priv->styles->data)->global_opacity = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->stroke.a = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->operator = CAIRO_OPERATOR_OVER;
+    if (!priv->styles) {
+        priv->styles
+          = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
+        ((SeedCanvasStyle*) priv->styles->data)->global_opacity = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->stroke.a = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->operator= CAIRO_OPERATOR_OVER;
     }
 
-  style = (SeedCanvasStyle *)priv->styles->data;
-
+    style = (SeedCanvasStyle*) priv->styles->data;
 
-  seed_canvas_parse_color (&style->fill, fill_style);
+    seed_canvas_parse_color(&style->fill, fill_style);
 
-  g_free(fill_style);
+    g_free(fill_style);
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_canvas_update_global_alpha (SeedContext ctx,
-				 SeedObject this_object,
-				 SeedString property_name,
-				 SeedValue value, SeedException * e)
+seed_canvas_update_global_alpha(SeedContext ctx,
+                                SeedObject this_object,
+                                SeedString property_name,
+                                SeedValue value,
+                                SeedException* e)
 {
-  SeedCanvasStyle *style;
-  SeedCanvasPrivates *priv = seed_object_get_private(this_object);
-
-  gdouble global_alpha = seed_value_to_double (ctx, value, e);
-
-  if (!priv->styles)
-    {
-      priv->styles = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
-      ((SeedCanvasStyle *) priv->styles->data)->global_opacity = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->stroke.a = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->fill.a = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->operator = CAIRO_OPERATOR_OVER;
+    SeedCanvasStyle* style;
+    SeedCanvasPrivates* priv = seed_object_get_private(this_object);
+
+    gdouble global_alpha = seed_value_to_double(ctx, value, e);
+
+    if (!priv->styles) {
+        priv->styles
+          = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
+        ((SeedCanvasStyle*) priv->styles->data)->global_opacity = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->stroke.a = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->fill.a = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->operator= CAIRO_OPERATOR_OVER;
     }
 
-  style = (SeedCanvasStyle *)priv->styles->data;
+    style = (SeedCanvasStyle*) priv->styles->data;
 
-  style->global_opacity = global_alpha;
+    style->global_opacity = global_alpha;
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_canvas_update_global_composite (SeedContext ctx,
-				     SeedObject this_object,
-				     SeedString property_name,
-				     SeedValue value, SeedException * e)
+seed_canvas_update_global_composite(SeedContext ctx,
+                                    SeedObject this_object,
+                                    SeedString property_name,
+                                    SeedValue value,
+                                    SeedException* e)
 {
-  SeedCanvasStyle *style;
-  GET_CR;
-  gchar *composite_op = seed_value_to_string (ctx, value, e);
-
-  if (!priv->styles)
-    {
-      priv->styles = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
-      ((SeedCanvasStyle *) priv->styles->data)->global_opacity = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->stroke.a = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->fill.a = 1;
-      ((SeedCanvasStyle *) priv->styles->data)->operator = CAIRO_OPERATOR_OVER;
+    SeedCanvasStyle* style;
+    GET_CR;
+    gchar* composite_op = seed_value_to_string(ctx, value, e);
+
+    if (!priv->styles) {
+        priv->styles
+          = g_slist_prepend(priv->styles, g_new0(SeedCanvasStyle, 1));
+        ((SeedCanvasStyle*) priv->styles->data)->global_opacity = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->stroke.a = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->fill.a = 1;
+        ((SeedCanvasStyle*) priv->styles->data)->operator= CAIRO_OPERATOR_OVER;
     }
 
-  style = (SeedCanvasStyle *)priv->styles->data;
-
-  if (!strcmp (composite_op, "copy"))
-    style->operator = CAIRO_OPERATOR_SOURCE;
-  else if (!strcmp (composite_op, "source-over"))
-    style->operator = CAIRO_OPERATOR_OVER;
-  else if (!strcmp (composite_op, "source-in"))
-    style->operator = CAIRO_OPERATOR_IN;
-  else if (!strcmp (composite_op, "source-out"))
-    style->operator = CAIRO_OPERATOR_OUT;
-  else if (!strcmp (composite_op, "source-atop"))
-    style->operator = CAIRO_OPERATOR_ATOP;
-  else if (!strcmp (composite_op, "destination-over"))
-    style->operator = CAIRO_OPERATOR_DEST_OVER;
-  else if (!strcmp (composite_op, "destination-in"))
-    style->operator = CAIRO_OPERATOR_DEST_IN;
-  else if (!strcmp (composite_op, "destination-out"))
-    style->operator = CAIRO_OPERATOR_DEST_OVER;
-  else if (!strcmp (composite_op, "destination-atop"))
-    style->operator = CAIRO_OPERATOR_DEST_ATOP;
-  else if (!strcmp (composite_op, "xor"))
-    style->operator = CAIRO_OPERATOR_XOR;
-  else if (!strcmp (composite_op, "darker"))
-    style->operator = CAIRO_OPERATOR_SATURATE;
-  else if (!strcmp (composite_op, "lighter"))
-    style->operator = CAIRO_OPERATOR_ADD;
-  else
-    style->operator = CAIRO_OPERATOR_OVER;
-
-  cairo_set_operator (cr, style->operator);
-
-  g_free (composite_op);
-
-  return TRUE;
+    style = (SeedCanvasStyle*) priv->styles->data;
+
+    if (!strcmp(composite_op, "copy"))
+        style->operator= CAIRO_OPERATOR_SOURCE;
+    else if (!strcmp(composite_op, "source-over"))
+        style->operator= CAIRO_OPERATOR_OVER;
+    else if (!strcmp(composite_op, "source-in"))
+        style->operator= CAIRO_OPERATOR_IN;
+    else if (!strcmp(composite_op, "source-out"))
+        style->operator= CAIRO_OPERATOR_OUT;
+    else if (!strcmp(composite_op, "source-atop"))
+        style->operator= CAIRO_OPERATOR_ATOP;
+    else if (!strcmp(composite_op, "destination-over"))
+        style->operator= CAIRO_OPERATOR_DEST_OVER;
+    else if (!strcmp(composite_op, "destination-in"))
+        style->operator= CAIRO_OPERATOR_DEST_IN;
+    else if (!strcmp(composite_op, "destination-out"))
+        style->operator= CAIRO_OPERATOR_DEST_OVER;
+    else if (!strcmp(composite_op, "destination-atop"))
+        style->operator= CAIRO_OPERATOR_DEST_ATOP;
+    else if (!strcmp(composite_op, "xor"))
+        style->operator= CAIRO_OPERATOR_XOR;
+    else if (!strcmp(composite_op, "darker"))
+        style->operator= CAIRO_OPERATOR_SATURATE;
+    else if (!strcmp(composite_op, "lighter"))
+        style->operator= CAIRO_OPERATOR_ADD;
+    else
+        style->operator= CAIRO_OPERATOR_OVER;
+
+    cairo_set_operator(cr, style->operator);
+
+    g_free(composite_op);
+
+    return TRUE;
 }
 
 gboolean
-seed_canvas_set_linewidth (SeedContext ctx,
-			   SeedObject this_object,
-			   SeedString property_name,
-			   SeedValue value, SeedException * e)
+seed_canvas_set_linewidth(SeedContext ctx,
+                          SeedObject this_object,
+                          SeedString property_name,
+                          SeedValue value,
+                          SeedException* e)
 {
-  GET_CR;
-  gdouble line_width = seed_value_to_double (ctx, value, e);
+    GET_CR;
+    gdouble line_width = seed_value_to_double(ctx, value, e);
 
-  cairo_set_line_width (cr, line_width);
-  return TRUE;
+    cairo_set_line_width(cr, line_width);
+    return TRUE;
 }
 
 gboolean
-seed_canvas_set_miterlimit (SeedContext ctx,
-			    SeedObject this_object,
-			    SeedString property_name,
-			    SeedValue value, SeedException * e)
+seed_canvas_set_miterlimit(SeedContext ctx,
+                           SeedObject this_object,
+                           SeedString property_name,
+                           SeedValue value,
+                           SeedException* e)
 {
-  GET_CR;
+    GET_CR;
 
-  cairo_set_miter_limit (cr, seed_value_to_double (ctx, value, e));
-  return TRUE;
+    cairo_set_miter_limit(cr, seed_value_to_double(ctx, value, e));
+    return TRUE;
 }
 
 gboolean
-seed_canvas_set_linecap (SeedContext ctx,
-			 SeedObject this_object,
-			 SeedString property_name,
-			 SeedValue value, SeedException * e)
+seed_canvas_set_linecap(SeedContext ctx,
+                        SeedObject this_object,
+                        SeedString property_name,
+                        SeedValue value,
+                        SeedException* e)
 {
-  GET_CR;
-  cairo_line_cap_t cap = CAIRO_LINE_CAP_BUTT;
-  gchar *line_cap = seed_value_to_string (ctx, value, e);
+    GET_CR;
+    cairo_line_cap_t cap = CAIRO_LINE_CAP_BUTT;
+    gchar* line_cap = seed_value_to_string(ctx, value, e);
 
-  if (!strcmp (line_cap, "round"))
-    cap = CAIRO_LINE_CAP_ROUND;
-  else if (!strcmp (line_cap, "square"))
-    cap = CAIRO_LINE_CAP_SQUARE;
+    if (!strcmp(line_cap, "round"))
+        cap = CAIRO_LINE_CAP_ROUND;
+    else if (!strcmp(line_cap, "square"))
+        cap = CAIRO_LINE_CAP_SQUARE;
 
-  g_free (line_cap);
+    g_free(line_cap);
 
-  cairo_set_line_cap (cr, cap);
-  return TRUE;
+    cairo_set_line_cap(cr, cap);
+    return TRUE;
 }
 
 gboolean
-seed_canvas_set_linejoin (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value, SeedException * e)
+seed_canvas_set_linejoin(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedValue value,
+                         SeedException* e)
 {
-  GET_CR;
-  cairo_line_join_t join = CAIRO_LINE_JOIN_MITER;
-  gchar *line_join = seed_value_to_string (ctx, value, e);
+    GET_CR;
+    cairo_line_join_t join = CAIRO_LINE_JOIN_MITER;
+    gchar* line_join = seed_value_to_string(ctx, value, e);
 
-  if (!strcmp (line_join, "round"))
-    join = CAIRO_LINE_JOIN_ROUND;
-  else if (!strcmp (line_join, "bevel"))
-    join = CAIRO_LINE_JOIN_BEVEL;
+    if (!strcmp(line_join, "round"))
+        join = CAIRO_LINE_JOIN_ROUND;
+    else if (!strcmp(line_join, "bevel"))
+        join = CAIRO_LINE_JOIN_BEVEL;
 
-  g_free (line_join);
+    g_free(line_join);
 
-  cairo_set_line_join (cr, join);
-  return TRUE;
+    cairo_set_line_join(cr, join);
+    return TRUE;
 }
 
 void
-seed_canvas_apply_stroke_style (SeedCanvasStyle *style,
-				cairo_t * cr)
+seed_canvas_apply_stroke_style(SeedCanvasStyle* style, cairo_t* cr)
 {
-  cairo_set_source_rgba(cr,
-			style->stroke.r,
-			style->stroke.g,
-			style->stroke.b,
-			style->stroke.a * style->global_opacity);
-  cairo_set_operator (cr, style->operator);
+    cairo_set_source_rgba(cr, style->stroke.r, style->stroke.g, style->stroke.b,
+                          style->stroke.a * style->global_opacity);
+    cairo_set_operator(cr, style->operator);
 }
 
 void
-seed_canvas_apply_fill_style (SeedCanvasStyle *style,
-				cairo_t * cr)
+seed_canvas_apply_fill_style(SeedCanvasStyle* style, cairo_t* cr)
 {
-  cairo_set_source_rgba(cr,
-			style->fill.r,
-			style->fill.g,
-			style->fill.b,
-			style->fill.a * style->global_opacity);
-  cairo_set_operator (cr, style->operator);
+    cairo_set_source_rgba(cr, style->fill.r, style->fill.g, style->fill.b,
+                          style->fill.a * style->global_opacity);
+    cairo_set_operator(cr, style->operator);
 }
 
 SeedValue
-seed_canvas_save (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[], SeedException * exception)
+seed_canvas_save(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  GET_CR;
+    GET_CR;
 
-  SeedCanvasStyle *old_style = (SeedCanvasStyle *)priv->styles->data;
+    SeedCanvasStyle* old_style = (SeedCanvasStyle*) priv->styles->data;
 
-  cairo_save (cr);
+    cairo_save(cr);
 
-  priv->styles = g_slist_prepend(priv->styles, g_new(SeedCanvasStyle, 1));
+    priv->styles = g_slist_prepend(priv->styles, g_new(SeedCanvasStyle, 1));
 
-  memcpy(priv->styles->data, old_style, sizeof(SeedCanvasStyle));
+    memcpy(priv->styles->data, old_style, sizeof(SeedCanvasStyle));
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_restore (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     size_t argument_count,
-		     const SeedValue arguments[], SeedException * exception)
+seed_canvas_restore(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    size_t argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  GET_CR;
+    GET_CR;
 
-  SeedCanvasStyle *style;
+    SeedCanvasStyle* style;
 
-  style = (SeedCanvasStyle *)priv->styles->data;
-  priv->styles = g_slist_delete_link(priv->styles, priv->styles);
-  g_free(style);
+    style = (SeedCanvasStyle*) priv->styles->data;
+    priv->styles = g_slist_delete_link(priv->styles, priv->styles);
+    g_free(style);
 
-  cairo_restore (cr);
+    cairo_restore(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_scale (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[], SeedException * exception)
+seed_canvas_scale(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  GET_CR;
-  gdouble x = seed_value_to_double (ctx, arguments[0], exception);
-  gdouble y = seed_value_to_double (ctx, arguments[1], exception);
+    GET_CR;
+    gdouble x = seed_value_to_double(ctx, arguments[0], exception);
+    gdouble y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_scale (cr, x, y);
+    cairo_scale(cr, x, y);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_translate (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       size_t argument_count,
-		       const SeedValue arguments[], SeedException * exception)
+seed_canvas_translate(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      size_t argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  GET_CR;
-  gdouble x = seed_value_to_double (ctx, arguments[0], exception);
-  gdouble y = seed_value_to_double (ctx, arguments[1], exception);
+    GET_CR;
+    gdouble x = seed_value_to_double(ctx, arguments[0], exception);
+    gdouble y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_translate (cr, x, y);
+    cairo_translate(cr, x, y);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_rotate (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    size_t argument_count,
-		    const SeedValue arguments[], SeedException * exception)
+seed_canvas_rotate(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   size_t argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  GET_CR;
-  gdouble x = seed_value_to_double (ctx, arguments[0], exception);
+    GET_CR;
+    gdouble x = seed_value_to_double(ctx, arguments[0], exception);
 
-  cairo_rotate (cr, x);
+    cairo_rotate(cr, x);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_transform (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       size_t argument_count,
-		       const SeedValue arguments[], SeedException * exception)
+seed_canvas_transform(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      size_t argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  GET_CR;
-  cairo_matrix_t matrix;
-  gdouble xx, yx, xy, yy, x0, y0;
+    GET_CR;
+    cairo_matrix_t matrix;
+    gdouble xx, yx, xy, yy, x0, y0;
 
-  xx = seed_value_to_double (ctx, arguments[0], exception);
-  yx = seed_value_to_double (ctx, arguments[1], exception);
-  xy = seed_value_to_double (ctx, arguments[2], exception);
-  yy = seed_value_to_double (ctx, arguments[3], exception);
-  x0 = seed_value_to_double (ctx, arguments[4], exception);
-  y0 = seed_value_to_double (ctx, arguments[5], exception);
+    xx = seed_value_to_double(ctx, arguments[0], exception);
+    yx = seed_value_to_double(ctx, arguments[1], exception);
+    xy = seed_value_to_double(ctx, arguments[2], exception);
+    yy = seed_value_to_double(ctx, arguments[3], exception);
+    x0 = seed_value_to_double(ctx, arguments[4], exception);
+    y0 = seed_value_to_double(ctx, arguments[5], exception);
 
-  cairo_matrix_init (&matrix, xx, yx, xy, yy, x0, y0);
-  cairo_transform (cr, &matrix);
+    cairo_matrix_init(&matrix, xx, yx, xy, yy, x0, y0);
+    cairo_transform(cr, &matrix);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_set_transform (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   size_t argument_count,
-			   const SeedValue arguments[],
-			   SeedException * exception)
+seed_canvas_set_transform(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          size_t argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  GET_CR;
-  cairo_matrix_t matrix;
-  gdouble xx, yx, xy, yy, x0, y0;
+    GET_CR;
+    cairo_matrix_t matrix;
+    gdouble xx, yx, xy, yy, x0, y0;
 
-  cairo_identity_matrix (cr);
+    cairo_identity_matrix(cr);
 
-  xx = seed_value_to_double (ctx, arguments[0], exception);
-  yx = seed_value_to_double (ctx, arguments[1], exception);
-  xy = seed_value_to_double (ctx, arguments[2], exception);
-  yy = seed_value_to_double (ctx, arguments[3], exception);
-  x0 = seed_value_to_double (ctx, arguments[4], exception);
-  y0 = seed_value_to_double (ctx, arguments[5], exception);
+    xx = seed_value_to_double(ctx, arguments[0], exception);
+    yx = seed_value_to_double(ctx, arguments[1], exception);
+    xy = seed_value_to_double(ctx, arguments[2], exception);
+    yy = seed_value_to_double(ctx, arguments[3], exception);
+    x0 = seed_value_to_double(ctx, arguments[4], exception);
+    y0 = seed_value_to_double(ctx, arguments[5], exception);
 
-  cairo_matrix_init (&matrix, xx, yx, xy, yy, x0, y0);
-  cairo_transform (cr, &matrix);
+    cairo_matrix_init(&matrix, xx, yx, xy, yy, x0, y0);
+    cairo_transform(cr, &matrix);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_clear_rect (SeedContext ctx,
-			SeedObject function,
-			SeedObject this_object,
-			size_t argument_count,
-			const SeedValue arguments[],
-			SeedException * exception)
+seed_canvas_clear_rect(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       size_t argument_count,
+                       const SeedValue arguments[],
+                       SeedException* exception)
 {
-  GET_CR;
-  gdouble x, y, width, height;
+    GET_CR;
+    gdouble x, y, width, height;
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
-  width = seed_value_to_double (ctx, arguments[2], exception);
-  height = seed_value_to_double (ctx, arguments[3], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
+    width = seed_value_to_double(ctx, arguments[2], exception);
+    height = seed_value_to_double(ctx, arguments[3], exception);
 
-  cairo_save (cr);
+    cairo_save(cr);
 
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, x, y, width, height);
+    cairo_set_source_rgb(cr, 1, 1, 1);
+    cairo_rectangle(cr, x, y, width, height);
 
-  cairo_fill (cr);
+    cairo_fill(cr);
 
-  cairo_restore (cr);
+    cairo_restore(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_stroke_rect (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 size_t argument_count,
-			 const SeedValue arguments[],
-			 SeedException * exception)
+seed_canvas_stroke_rect(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        size_t argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  GET_CR;
-  gdouble x, y, width, height;
+    GET_CR;
+    gdouble x, y, width, height;
 
-  seed_canvas_apply_stroke_style ((SeedCanvasStyle *)priv->styles->data, cr);
+    seed_canvas_apply_stroke_style((SeedCanvasStyle*) priv->styles->data, cr);
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
-  width = seed_value_to_double (ctx, arguments[2], exception);
-  height = seed_value_to_double (ctx, arguments[3], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
+    width = seed_value_to_double(ctx, arguments[2], exception);
+    height = seed_value_to_double(ctx, arguments[3], exception);
 
-  cairo_rectangle (cr, x, y, width, height);
-  cairo_stroke (cr);
+    cairo_rectangle(cr, x, y, width, height);
+    cairo_stroke(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_fill_rect (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       size_t argument_count,
-		       const SeedValue arguments[], SeedException * exception)
+seed_canvas_fill_rect(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      size_t argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  GET_CR;
-  gdouble x, y, width, height;
-  seed_canvas_apply_fill_style ((SeedCanvasStyle *)priv->styles->data, cr);
+    GET_CR;
+    gdouble x, y, width, height;
+    seed_canvas_apply_fill_style((SeedCanvasStyle*) priv->styles->data, cr);
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
-  width = seed_value_to_double (ctx, arguments[2], exception);
-  height = seed_value_to_double (ctx, arguments[3], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
+    width = seed_value_to_double(ctx, arguments[2], exception);
+    height = seed_value_to_double(ctx, arguments[3], exception);
 
-  cairo_rectangle (cr, x, y, width, height);
-  cairo_fill (cr);
+    cairo_rectangle(cr, x, y, width, height);
+    cairo_fill(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_end_path (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      size_t argument_count,
-		      const SeedValue arguments[], SeedException * exception)
+seed_canvas_end_path(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     size_t argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-  GET_CR;
+    GET_CR;
 
-  cairo_close_path (cr);
+    cairo_close_path(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_begin_path (SeedContext ctx,
-			SeedObject function,
-			SeedObject this_object,
-			size_t argument_count,
-			const SeedValue arguments[],
-			SeedException * exception)
+seed_canvas_begin_path(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       size_t argument_count,
+                       const SeedValue arguments[],
+                       SeedException* exception)
 {
-  GET_CR;
+    GET_CR;
 
-  cairo_new_path (cr);
+    cairo_new_path(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_move_to (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     size_t argument_count,
-		     const SeedValue arguments[], SeedException * exception)
+seed_canvas_move_to(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    size_t argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  GET_CR;
-  gdouble x, y;
+    GET_CR;
+    gdouble x, y;
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_move_to (cr, x, y);
+    cairo_move_to(cr, x, y);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_line_to (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     size_t argument_count,
-		     const SeedValue arguments[], SeedException * exception)
+seed_canvas_line_to(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    size_t argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  GET_CR;
-  gdouble x, y;
+    GET_CR;
+    gdouble x, y;
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
 
-  cairo_line_to (cr, x, y);
+    cairo_line_to(cr, x, y);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_stroke (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    size_t argument_count,
-		    const SeedValue arguments[], SeedException * exception)
+seed_canvas_stroke(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   size_t argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  GET_CR;
+    GET_CR;
 
-  seed_canvas_apply_stroke_style ((SeedCanvasStyle *)priv->styles->data,
-				  cr);
+    seed_canvas_apply_stroke_style((SeedCanvasStyle*) priv->styles->data, cr);
 
-  cairo_stroke (cr);
+    cairo_stroke(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_clip (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[], SeedException * exception)
+seed_canvas_clip(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  GET_CR;
+    GET_CR;
 
-  cairo_clip (cr);
+    cairo_clip(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_fill (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[], SeedException * exception)
+seed_canvas_fill(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  GET_CR;
-  seed_canvas_apply_fill_style ((SeedCanvasStyle *)priv->styles->data, cr);
+    GET_CR;
+    seed_canvas_apply_fill_style((SeedCanvasStyle*) priv->styles->data, cr);
 
-  cairo_fill (cr);
+    cairo_fill(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_arc (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[], SeedException * exception)
+seed_canvas_arc(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  GET_CR;
-  gdouble xc, yc, radius, start, end;
-  gboolean counter_clockwise;
-
-  xc = seed_value_to_double (ctx, arguments[0], exception);
-  yc = seed_value_to_double (ctx, arguments[1], exception);
-  radius = seed_value_to_double (ctx, arguments[2], exception);
-  start = seed_value_to_double (ctx, arguments[3], exception);
-  end = seed_value_to_double (ctx, arguments[4], exception);
-  counter_clockwise = seed_value_to_boolean (ctx, arguments[5], exception);
-
-  if (counter_clockwise)
-    cairo_arc_negative (cr, xc, yc, radius, end, start);
-  else
-    cairo_arc (cr, xc, yc, radius, start, end);
-
-  return seed_make_null (ctx);
+    GET_CR;
+    gdouble xc, yc, radius, start, end;
+    gboolean counter_clockwise;
+
+    xc = seed_value_to_double(ctx, arguments[0], exception);
+    yc = seed_value_to_double(ctx, arguments[1], exception);
+    radius = seed_value_to_double(ctx, arguments[2], exception);
+    start = seed_value_to_double(ctx, arguments[3], exception);
+    end = seed_value_to_double(ctx, arguments[4], exception);
+    counter_clockwise = seed_value_to_boolean(ctx, arguments[5], exception);
+
+    if (counter_clockwise)
+        cairo_arc_negative(cr, xc, yc, radius, end, start);
+    else
+        cairo_arc(cr, xc, yc, radius, start, end);
+
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_quadratic (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       size_t argument_count,
-		       const SeedValue arguments[], SeedException * exception)
+seed_canvas_quadratic(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      size_t argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  GET_CR;
-
-  gdouble p0x, p0y, cp1x, cp1y, cp2x, cp2y, cp3x, cp3y;
-  gdouble qp1x, qp1y, qp2x, qp2y;
+    GET_CR;
 
-  cairo_get_current_point (cr, &p0x, &p0y);
+    gdouble p0x, p0y, cp1x, cp1y, cp2x, cp2y, cp3x, cp3y;
+    gdouble qp1x, qp1y, qp2x, qp2y;
 
-  qp1x = seed_value_to_double (ctx, arguments[0], exception);
-  qp1y = seed_value_to_double (ctx, arguments[1], exception);
-  qp2x = seed_value_to_double (ctx, arguments[2], exception);
-  qp2y = seed_value_to_double (ctx, arguments[3], exception);
+    cairo_get_current_point(cr, &p0x, &p0y);
 
+    qp1x = seed_value_to_double(ctx, arguments[0], exception);
+    qp1y = seed_value_to_double(ctx, arguments[1], exception);
+    qp2x = seed_value_to_double(ctx, arguments[2], exception);
+    qp2y = seed_value_to_double(ctx, arguments[3], exception);
 
-  // Convert quadratic curve to cubic curve...
-  // I think the math is explained in some
-  // freetype documentation somewhere.
-  cp3x = qp2x;
-  cp3y = qp2y;
+    // Convert quadratic curve to cubic curve...
+    // I think the math is explained in some
+    // freetype documentation somewhere.
+    cp3x = qp2x;
+    cp3y = qp2y;
 
-  cp1x = p0x + 2 / 3.0 * (qp1x - p0x);
-  cp1y = p0y + 2 / 3.0 * (qp1y - p0y);
+    cp1x = p0x + 2 / 3.0 * (qp1x - p0x);
+    cp1y = p0y + 2 / 3.0 * (qp1y - p0y);
 
-  cp2x = cp1x + 1 / 3.0 * (qp2x - p0x);
-  cp2y = cp1y + 1 / 3.0 * (qp2y - p0y);
+    cp2x = cp1x + 1 / 3.0 * (qp2x - p0x);
+    cp2y = cp1y + 1 / 3.0 * (qp2y - p0y);
 
-  cairo_curve_to (cr, cp1x, cp1y, cp2x, cp2y, cp3x, cp3y);
+    cairo_curve_to(cr, cp1x, cp1y, cp2x, cp2y, cp3x, cp3y);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_bezier (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    size_t argument_count,
-		    const SeedValue arguments[], SeedException * exception)
+seed_canvas_bezier(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   size_t argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  GET_CR;
-  gdouble cp0x, cp0y, cp1x, cp1y, cp2x, cp2y;
+    GET_CR;
+    gdouble cp0x, cp0y, cp1x, cp1y, cp2x, cp2y;
 
-  cp0x = seed_value_to_double (ctx, arguments[0], exception);
-  cp0y = seed_value_to_double (ctx, arguments[1], exception);
-  cp1x = seed_value_to_double (ctx, arguments[2], exception);
-  cp1y = seed_value_to_double (ctx, arguments[3], exception);
-  cp2x = seed_value_to_double (ctx, arguments[4], exception);
-  cp2y = seed_value_to_double (ctx, arguments[5], exception);
+    cp0x = seed_value_to_double(ctx, arguments[0], exception);
+    cp0y = seed_value_to_double(ctx, arguments[1], exception);
+    cp1x = seed_value_to_double(ctx, arguments[2], exception);
+    cp1y = seed_value_to_double(ctx, arguments[3], exception);
+    cp2x = seed_value_to_double(ctx, arguments[4], exception);
+    cp2y = seed_value_to_double(ctx, arguments[5], exception);
 
-  cairo_curve_to (cr, cp0x, cp0y, cp1x, cp1y, cp2x, cp2y);
+    cairo_curve_to(cr, cp0x, cp0y, cp1x, cp1y, cp2x, cp2y);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_rect (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[], SeedException * exception)
+seed_canvas_rect(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  GET_CR;
-  gdouble x, y, width, height;
+    GET_CR;
+    gdouble x, y, width, height;
 
-  x = seed_value_to_double (ctx, arguments[0], exception);
-  y = seed_value_to_double (ctx, arguments[1], exception);
-  width = seed_value_to_double (ctx, arguments[2], exception);
-  height = seed_value_to_double (ctx, arguments[3], exception);
+    x = seed_value_to_double(ctx, arguments[0], exception);
+    y = seed_value_to_double(ctx, arguments[1], exception);
+    width = seed_value_to_double(ctx, arguments[2], exception);
+    height = seed_value_to_double(ctx, arguments[3], exception);
 
-  cairo_rectangle (cr, x, y, width, height);
+    cairo_rectangle(cr, x, y, width, height);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_flush (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[], SeedException * exception)
+seed_canvas_flush(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  GET_CR;
-  cairo_surface_t *surface = cairo_get_target (cr);
+    GET_CR;
+    cairo_surface_t* surface = cairo_get_target(cr);
 
-  cairo_surface_flush (surface);
+    cairo_surface_flush(surface);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_finish (SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    size_t argument_count,
-		    const SeedValue arguments[], SeedException * exception)
+seed_canvas_finish(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   size_t argument_count,
+                   const SeedValue arguments[],
+                   SeedException* exception)
 {
-  GET_CR;
-  cairo_surface_t *surface = cairo_get_target (cr);
+    GET_CR;
+    cairo_surface_t* surface = cairo_get_target(cr);
 
-  cairo_surface_finish (surface);
+    cairo_surface_finish(surface);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_showpage (SeedContext ctx,
-		      SeedObject function,
-		      SeedObject this_object,
-		      size_t argument_count,
-		      const SeedValue arguments[], SeedException * exception)
- {
-  GET_CR;
-  cairo_show_page (cr);
-
-  return seed_make_null (ctx);
+seed_canvas_showpage(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     size_t argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
+{
+    GET_CR;
+    cairo_show_page(cr);
+
+    return seed_make_null(ctx);
 }
 
 SeedValue
-seed_canvas_destroy (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     size_t argument_count,
-		     const SeedValue arguments[], SeedException * exception)
+seed_canvas_destroy(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    size_t argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  GET_CR;
-  cairo_destroy (cr);
+    GET_CR;
+    cairo_destroy(cr);
 
-  return seed_make_null (ctx);
+    return seed_make_null(ctx);
 }
 
 static void
-canvas_finalize (SeedObject object)
+canvas_finalize(SeedObject object)
 {
-  cairo_t *cr = seed_object_get_private (object);
-  if (cr)
-    cairo_destroy (cr);
+    cairo_t* cr = seed_object_get_private(object);
+    if (cr)
+        cairo_destroy(cr);
 }
 
-seed_static_function canvas_funcs[] = {
-  {"save", seed_canvas_save, 0},
-  {"restore", seed_canvas_restore, 0},
-  {"scale", seed_canvas_scale, 0},
-  {"rotate", seed_canvas_rotate, 0},
-  {"translate", seed_canvas_translate, 0},
-  {"transform", seed_canvas_transform, 0},
-  {"setTransform", seed_canvas_set_transform, 0},
-  {"clearRect", seed_canvas_clear_rect, 0},
-  {"fillRect", seed_canvas_fill_rect, 0},
-  {"strokeRect", seed_canvas_stroke_rect, 0},
-  {"beginPath", seed_canvas_begin_path, 0},
-  {"closePath", seed_canvas_end_path, 0},
-  {"moveTo", seed_canvas_move_to, 0},
-  {"lineTo", seed_canvas_line_to, 0},
-  {"fill", seed_canvas_fill, 0},
-  {"stroke", seed_canvas_stroke, 0},
-  {"clip", seed_canvas_clip, 0},
-  {"arc", seed_canvas_arc, 0},
-  {"quadraticCurveTo", seed_canvas_quadratic, 0},
-  {"bezierCurveTo", seed_canvas_bezier, 0},
-  {"rect", seed_canvas_rect, 0},
-  {"flush", seed_canvas_flush, 0},
-  {"finish", seed_canvas_finish, 0},
-  {"showPage", seed_canvas_showpage, 0},
-  {"destroy", seed_canvas_destroy, 0},
-  {NULL, NULL, 0}
-};
-
-seed_static_value canvas_properties[] = {
-  {"lineWidth", 0, seed_canvas_set_linewidth, 0},
-  {"lineCap", 0, seed_canvas_set_linecap, 0},
-  {"lineJoin", 0, seed_canvas_set_linejoin, 0},
-  {"miterLimit", 0, seed_canvas_set_miterlimit, 0},
-  {"strokeStyle", 0, seed_canvas_update_stroke_style, 0},
-  {"fillStyle", 0, seed_canvas_update_fill_style, 0},
-  {"globalAlpha", 0, seed_canvas_update_global_alpha, 0},
-  {"globalCompositeOperation", 0, seed_canvas_update_global_composite, 0},
-  {NULL, NULL, NULL, 0}
-};
+seed_static_function canvas_funcs[]
+  = { { "save", seed_canvas_save, 0 },
+      { "restore", seed_canvas_restore, 0 },
+      { "scale", seed_canvas_scale, 0 },
+      { "rotate", seed_canvas_rotate, 0 },
+      { "translate", seed_canvas_translate, 0 },
+      { "transform", seed_canvas_transform, 0 },
+      { "setTransform", seed_canvas_set_transform, 0 },
+      { "clearRect", seed_canvas_clear_rect, 0 },
+      { "fillRect", seed_canvas_fill_rect, 0 },
+      { "strokeRect", seed_canvas_stroke_rect, 0 },
+      { "beginPath", seed_canvas_begin_path, 0 },
+      { "closePath", seed_canvas_end_path, 0 },
+      { "moveTo", seed_canvas_move_to, 0 },
+      { "lineTo", seed_canvas_line_to, 0 },
+      { "fill", seed_canvas_fill, 0 },
+      { "stroke", seed_canvas_stroke, 0 },
+      { "clip", seed_canvas_clip, 0 },
+      { "arc", seed_canvas_arc, 0 },
+      { "quadraticCurveTo", seed_canvas_quadratic, 0 },
+      { "bezierCurveTo", seed_canvas_bezier, 0 },
+      { "rect", seed_canvas_rect, 0 },
+      { "flush", seed_canvas_flush, 0 },
+      { "finish", seed_canvas_finish, 0 },
+      { "showPage", seed_canvas_showpage, 0 },
+      { "destroy", seed_canvas_destroy, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_value canvas_properties[]
+  = { { "lineWidth", 0, seed_canvas_set_linewidth, 0 },
+      { "lineCap", 0, seed_canvas_set_linecap, 0 },
+      { "lineJoin", 0, seed_canvas_set_linejoin, 0 },
+      { "miterLimit", 0, seed_canvas_set_miterlimit, 0 },
+      { "strokeStyle", 0, seed_canvas_update_stroke_style, 0 },
+      { "fillStyle", 0, seed_canvas_update_fill_style, 0 },
+      { "globalAlpha", 0, seed_canvas_update_global_alpha, 0 },
+      { "globalCompositeOperation", 0, seed_canvas_update_global_composite, 0 },
+      { NULL, NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init (SeedEngine * local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-  SeedObject canvas_constructor, pdf_constructor,
-    svg_constructor, image_constructor;
-  seed_class_definition canvas_class_def = seed_empty_class;
+    SeedObject canvas_constructor, pdf_constructor, svg_constructor,
+      image_constructor;
+    seed_class_definition canvas_class_def = seed_empty_class;
 
-  eng = local_eng;
+    eng = local_eng;
 
-  namespace_ref = seed_make_object (eng->context, 0, 0);
+    namespace_ref = seed_make_object(eng->context, 0, 0);
 
-  canvas_class_def.class_name = "CairoCanvas";
-  canvas_class_def.static_functions = canvas_funcs;
-  canvas_class_def.finalize = canvas_finalize;
-  canvas_class_def.static_values = canvas_properties;
+    canvas_class_def.class_name = "CairoCanvas";
+    canvas_class_def.static_functions = canvas_funcs;
+    canvas_class_def.finalize = canvas_finalize;
+    canvas_class_def.static_values = canvas_properties;
 
-  canvas_class = seed_create_class (&canvas_class_def);
+    canvas_class = seed_create_class(&canvas_class_def);
 
-  canvas_constructor = seed_make_constructor (eng->context,
-					      canvas_class,
-					      canvas_construct_canvas);
+    canvas_constructor = seed_make_constructor(eng->context, canvas_class,
+                                               canvas_construct_canvas);
 
-  pdf_constructor = seed_make_constructor (eng->context,
-					   canvas_class,
-					   canvas_construct_pdf_canvas);
+    pdf_constructor = seed_make_constructor(eng->context, canvas_class,
+                                            canvas_construct_pdf_canvas);
 
-  svg_constructor = seed_make_constructor (eng->context,
-					   canvas_class,
-					   canvas_construct_svg_canvas);
+    svg_constructor = seed_make_constructor(eng->context, canvas_class,
+                                            canvas_construct_svg_canvas);
 
-  image_constructor = seed_make_constructor (eng->context,
-					     canvas_class,
-					     seed_construct_image_canvas);
+    image_constructor = seed_make_constructor(eng->context, canvas_class,
+                                              seed_construct_image_canvas);
 
-  seed_object_set_property (eng->context, namespace_ref, "CairoCanvas",
-			    canvas_constructor);
-  seed_object_set_property (eng->context, namespace_ref, "PDFCanvas",
-			    pdf_constructor);
-  seed_object_set_property (eng->context, namespace_ref, "SVGCanvas",
-			    svg_constructor);
-  seed_object_set_property (eng->context, namespace_ref, "ImageCanvas",
-			    svg_constructor);
+    seed_object_set_property(eng->context, namespace_ref, "CairoCanvas",
+                             canvas_constructor);
+    seed_object_set_property(eng->context, namespace_ref, "PDFCanvas",
+                             pdf_constructor);
+    seed_object_set_property(eng->context, namespace_ref, "SVGCanvas",
+                             svg_constructor);
+    seed_object_set_property(eng->context, namespace_ref, "ImageCanvas",
+                             svg_constructor);
 
-  return namespace_ref;
+    return namespace_ref;
 }
diff --git a/modules/dbus/Makefile.in b/modules/dbus/Makefile.in
index 6daeb67..a141088 100644
--- a/modules/dbus/Makefile.in
+++ b/modules/dbus/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 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.
@@ -17,23 +16,61 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,12 +90,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/dbus
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -108,12 +149,25 @@ libseed_dbusnative_la_OBJECTS = $(am_libseed_dbusnative_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_dbusnative_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_dbusnative_la_CFLAGS) $(CFLAGS) \
 	$(libseed_dbusnative_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_DBUS_MODULE_TRUE@am_libseed_dbusnative_la_rpath = -rpath \
 @BUILD_DBUS_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -126,29 +180,26 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_dbusnative_la_SOURCES)
 DIST_SOURCES = $(am__libseed_dbusnative_la_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -157,12 +208,33 @@ am__can_run_installinfo = \
 DATA = $(module_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = util
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -251,6 +323,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -264,6 +338,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -287,8 +362,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -300,6 +384,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -394,6 +479,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -461,7 +547,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/dbus/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/dbus/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -479,6 +564,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -505,12 +591,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_dbusnative.la: $(libseed_dbusnative_la_OBJECTS) $(libseed_dbusnative_la_DEPENDENCIES) $(EXTRA_libseed_dbusnative_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_dbusnative_la_LINK) $(am_libseed_dbusnative_la_rpath) $(libseed_dbusnative_la_OBJECTS) $(libseed_dbusnative_la_LIBADD) $(LIBS)
 
@@ -532,14 +621,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -618,22 +707,25 @@ uninstall-moduleDATA:
 	dir='$(DESTDIR)$(moduledir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -648,57 +740,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -714,12 +761,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -731,15 +773,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -748,6 +786,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -916,24 +969,26 @@ ps-am:
 
 uninstall-am: uninstall-moduleDATA uninstall-seedlibLTLIBRARIES
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	clean-seedlibLTLIBRARIES ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-moduleDATA install-pdf install-pdf-am install-ps \
-	install-ps-am install-seedlibLTLIBRARIES install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-moduleDATA uninstall-seedlibLTLIBRARIES
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-seedlibLTLIBRARIES cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-moduleDATA install-pdf \
+	install-pdf-am install-ps install-ps-am \
+	install-seedlibLTLIBRARIES install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-moduleDATA \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/dbus/dbus-exports.c b/modules/dbus/dbus-exports.c
index f38be51..92085c7 100644
--- a/modules/dbus/dbus-exports.c
+++ b/modules/dbus/dbus-exports.c
@@ -25,42 +25,34 @@
 
 #include <util/dbus.h>
 
-typedef struct _Exports {
-  // Why does GJS have this?
-  SeedObject object;
+typedef struct _Exports
+{
+    // Why does GJS have this?
+    SeedObject object;
 
-  DBusBusType which_bus;
-  DBusConnection *connection_weak_ref;
-  gboolean filter_was_registered;
+    DBusBusType which_bus;
+    DBusConnection* connection_weak_ref;
+    gboolean filter_was_registered;
 } Exports;
 
 SeedClass seed_js_exports_class = NULL;
 
-static void              on_bus_opened        (DBusConnection *connection,
-                                               void           *data);
-static void              on_bus_closed        (DBusConnection *connection,
-                                               void           *data);
-static DBusHandlerResult on_message           (DBusConnection *connection,
-                                               DBusMessage    *message,
-                                               void           *user_data);
-
-static const BigDBusConnectFuncs system_connect_funcs = {
-    DBUS_BUS_SYSTEM,
-    on_bus_opened,
-    on_bus_closed
-};
-
-static const BigDBusConnectFuncs session_connect_funcs = {
-    DBUS_BUS_SESSION,
-    on_bus_opened,
-    on_bus_closed
-};
+static void on_bus_opened(DBusConnection* connection, void* data);
+static void on_bus_closed(DBusConnection* connection, void* data);
+static DBusHandlerResult on_message(DBusConnection* connection,
+                                    DBusMessage* message,
+                                    void* user_data);
+
+static const BigDBusConnectFuncs system_connect_funcs
+  = { DBUS_BUS_SYSTEM, on_bus_opened, on_bus_closed };
+
+static const BigDBusConnectFuncs session_connect_funcs
+  = { DBUS_BUS_SESSION, on_bus_opened, on_bus_closed };
 
 static void
-on_bus_opened(DBusConnection *connection,
-              void           *data)
+on_bus_opened(DBusConnection* connection, void* data)
 {
-    Exports *priv = data;
+    Exports* priv = data;
 
     g_assert(priv->connection_weak_ref == NULL);
 
@@ -69,67 +61,58 @@ on_bus_opened(DBusConnection *connection,
     if (priv->filter_was_registered)
         return;
 
-    if (!dbus_connection_add_filter(connection,
-                                    on_message, priv,
-                                    NULL))
-      {
-	g_warning("DBus: Failed to add message filter");
-	return;
-      }
+    if (!dbus_connection_add_filter(connection, on_message, priv, NULL)) {
+        g_warning("DBus: Failed to add message filter");
+        return;
+    }
 
     priv->filter_was_registered = TRUE;
 }
 
 static void
-on_bus_closed(DBusConnection *connection,
-              void           *data)
+on_bus_closed(DBusConnection* connection, void* data)
 {
-    Exports *priv = data;
+    Exports* priv = data;
 
     g_assert(priv->connection_weak_ref != NULL);
 
     priv->connection_weak_ref = NULL;
 
-    if (priv->filter_was_registered)
-      {
-        dbus_connection_remove_filter(connection,
-                                      on_message, priv);
+    if (priv->filter_was_registered) {
+        dbus_connection_remove_filter(connection, on_message, priv);
         priv->filter_was_registered = FALSE;
-      }
+    }
 }
 
-#define dbus_reply_from_exception(ctx, message, reply_p, exception)	\
-        (dbus_reply_from_exception_and_sender((ctx), \
-                                              dbus_message_get_sender(message), \
-                                              dbus_message_get_serial(message), \
-                                              (reply_p), exception))
+#define dbus_reply_from_exception(ctx, message, reply_p, exception)            \
+    (dbus_reply_from_exception_and_sender((ctx),                               \
+                                          dbus_message_get_sender(message),    \
+                                          dbus_message_get_serial(message),    \
+                                          (reply_p), exception))
 
 static gboolean
-dbus_reply_from_exception_and_sender(SeedContext  ctx,
-                                     const gchar  *sender,
+dbus_reply_from_exception_and_sender(SeedContext ctx,
+                                     const gchar* sender,
                                      dbus_uint32_t serial,
-                                     DBusMessage **reply_p,
-				     SeedException *exception)
+                                     DBusMessage** reply_p,
+                                     SeedException* exception)
 {
-  SeedValue name_val;
-  gchar *s;
-  const gchar *name = NULL;
+    SeedValue name_val;
+    gchar* s;
+    const gchar* name = NULL;
 
+    *reply_p = NULL;
 
-  *reply_p = NULL;
-
-  if (seed_value_is_undefined (ctx, *exception) ||
-      seed_value_is_null (ctx, *exception) ||
-      !seed_value_is_object (ctx, *exception))
-    return FALSE;
+    if (seed_value_is_undefined(ctx, *exception)
+        || seed_value_is_null(ctx, *exception)
+        || !seed_value_is_object(ctx, *exception))
+        return FALSE;
 
-  name_val = seed_object_get_property(ctx, *exception, "dbusErrorName");
-  name = seed_value_to_string (ctx, name_val, NULL);
+    name_val = seed_object_get_property(ctx, *exception, "dbusErrorName");
+    name = seed_value_to_string(ctx, name_val, NULL);
 
-  s = seed_exception_to_string (ctx, *exception);
-  g_warning("JS exception we will send as dbus reply to %s: %s",
-	    sender,
-	    s);
+    s = seed_exception_to_string(ctx, *exception);
+    g_warning("JS exception we will send as dbus reply to %s: %s", sender, s);
 
     *reply_p = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
     dbus_message_set_destination(*reply_p, sender);
@@ -137,13 +120,11 @@ dbus_reply_from_exception_and_sender(SeedContext  ctx,
     dbus_message_set_no_reply(*reply_p, TRUE);
     dbus_message_set_error_name(*reply_p, name ? name : DBUS_ERROR_FAILED);
     if (s != NULL) {
-         DBusMessageIter iter;
+        DBusMessageIter iter;
 
         dbus_message_iter_init_append(*reply_p, &iter);
 
-        if (!dbus_message_iter_append_basic(&iter,
-                                            DBUS_TYPE_STRING,
-                                            &s)) {
+        if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &s)) {
             dbus_message_unref(*reply_p);
             g_free(s);
             return FALSE;
@@ -157,32 +138,28 @@ dbus_reply_from_exception_and_sender(SeedContext  ctx,
 // Is this going to leak later?
 static gboolean
 signature_from_method(SeedContext ctx,
-		      SeedObject method_obj,
-                      const char **signature,
-		      SeedException *exception)
+                      SeedObject method_obj,
+                      const char** signature,
+                      SeedException* exception)
 {
-  SeedValue signature_value;
-
-  if ((signature_value = seed_object_get_property(ctx,
-						 method_obj, "outSignature")))
-    {
-      *signature = seed_value_to_string (ctx, signature_value, exception);
-      if (*signature == NULL)
-	{
-	  return FALSE;
+    SeedValue signature_value;
+
+    if ((signature_value
+         = seed_object_get_property(ctx, method_obj, "outSignature"))) {
+        *signature = seed_value_to_string(ctx, signature_value, exception);
+        if (*signature == NULL) {
+            return FALSE;
         }
-    }
-  else
-    {
-      /* We default to a{sv} */
-      *signature = "a{sv}";
+    } else {
+        /* We default to a{sv} */
+        *signature = "a{sv}";
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 static gboolean
-signature_has_one_element(const char *signature)
+signature_has_one_element(const char* signature)
 {
     DBusSignatureIter iter;
 
@@ -194,15 +171,15 @@ signature_has_one_element(const char *signature)
     return !dbus_signature_iter_next(&iter);
 }
 
-static DBusMessage *
+static DBusMessage*
 build_reply_from_jsval(SeedContext ctx,
-                       const char    *signature,
-                       const char    *sender,
-                       dbus_uint32_t  serial,
-		       SeedValue rval,
-		       SeedException *exception)
+                       const char* signature,
+                       const char* sender,
+                       dbus_uint32_t serial,
+                       SeedValue rval,
+                       SeedException* exception)
 {
-    DBusMessage *reply;
+    DBusMessage* reply;
     DBusMessageIter arg_iter;
     DBusSignatureIter sig_iter;
     gboolean marshalled = FALSE;
@@ -214,35 +191,35 @@ build_reply_from_jsval(SeedContext ctx,
 
     dbus_message_iter_init_append(reply, &arg_iter);
 
-    if (seed_value_is_undefined (ctx, rval) || g_str_equal(signature, ""))
-      {
+    if (seed_value_is_undefined(ctx, rval) || g_str_equal(signature, "")) {
         /* We don't want to send anything in these cases so skip the
          * marshalling altogether.
          */
         return reply;
-      }
+    }
 
     dbus_signature_iter_init(&sig_iter, signature);
 
-    if (signature_has_one_element(signature))
-      {
-	marshalled = seed_js_one_value_to_dbus(ctx, rval, &arg_iter, &sig_iter, exception);
-      }
-    else
-      {
-        if (!seed_value_is_object (ctx, rval))
-	  {
-	    g_warning("Signature has multiple items but return value is not an array");
-	    return reply;
-	  }
-        marshalled = seed_js_values_to_dbus(ctx, 0, rval, &arg_iter, &sig_iter, exception);
-      }
+    if (signature_has_one_element(signature)) {
+        marshalled = seed_js_one_value_to_dbus(ctx, rval, &arg_iter, &sig_iter,
+                                               exception);
+    } else {
+        if (!seed_value_is_object(ctx, rval)) {
+            g_warning(
+              "Signature has multiple items but return value is not an array");
+            return reply;
+        }
+        marshalled = seed_js_values_to_dbus(ctx, 0, rval, &arg_iter, &sig_iter,
+                                            exception);
+    }
 
     if (!marshalled) {
         /* replace our planned reply with an error */
         dbus_message_unref(reply);
-        if (!dbus_reply_from_exception_and_sender(ctx, sender, serial, &reply, exception))
-	  g_warning ("conversion of dbus return value failed but no exception was set?");
+        if (!dbus_reply_from_exception_and_sender(ctx, sender, serial, &reply,
+                                                  exception))
+            g_warning("conversion of dbus return value failed but no exception "
+                      "was set?");
     }
 
     return reply;
@@ -250,169 +227,155 @@ build_reply_from_jsval(SeedContext ctx,
 
 static DBusMessage*
 invoke_js_from_dbus(SeedContext ctx,
-                    DBusMessage *method_call,
+                    DBusMessage* method_call,
                     SeedObject this_obj,
                     SeedObject method_obj,
-		    SeedException *exception)
+                    SeedException* exception)
 {
-    DBusMessage *reply;
+    DBusMessage* reply;
     int argc;
-    SeedValue *argv;
+    SeedValue* argv;
     SeedValue rval;
     DBusMessageIter arg_iter;
-    GArray *values;
-    const char *signature;
+    GArray* values;
+    const char* signature;
 
     reply = NULL;
 
     dbus_message_iter_init(method_call, &arg_iter);
 
-    if (!seed_js_values_from_dbus(ctx, &arg_iter, &values, exception))
-      {
-	if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
-	  g_warning("conversion of dbus method arg failed but no exception was set?");
+    if (!seed_js_values_from_dbus(ctx, &arg_iter, &values, exception)) {
+        if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
+            g_warning(
+              "conversion of dbus method arg failed but no exception was set?");
         return reply;
-      }
+    }
 
     argc = values->len;
-    argv = (SeedValue *)values->data;
+    argv = (SeedValue*) values->data;
 
     seed_js_add_dbus_props(ctx, method_call, argv[0], exception);
 
-    rval = seed_object_call (ctx, method_obj, NULL,
-		      argc, argv, exception);
-    if (!seed_value_is_null (ctx, *exception) &&
-	seed_value_is_object (ctx, *exception))
-      {
-	g_warning("dbus method invocation failed");
+    rval = seed_object_call(ctx, method_obj, NULL, argc, argv, exception);
+    if (!seed_value_is_null(ctx, *exception)
+        && seed_value_is_object(ctx, *exception)) {
+        g_warning("dbus method invocation failed");
 
         if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
-	  g_warning("dbus method invocation failed but no exception was set?");
+            g_warning(
+              "dbus method invocation failed but no exception was set?");
 
         goto out;
-      }
-
-    if (dbus_reply_from_exception(ctx, method_call, &reply, exception))
-      {
-	g_warning("Closure invocation succeeded but an exception was set?");
-	goto out;
-      }
-
-    if (!signature_from_method(ctx,
-                               method_obj,
-                               &signature, exception))
-      {
+    }
+
+    if (dbus_reply_from_exception(ctx, method_call, &reply, exception)) {
+        g_warning("Closure invocation succeeded but an exception was set?");
+        goto out;
+    }
+
+    if (!signature_from_method(ctx, method_obj, &signature, exception)) {
         if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
-	  g_warning("dbus method invocation failed but no exception was set?");
+            g_warning(
+              "dbus method invocation failed but no exception was set?");
 
         goto out;
-      }
+    }
 
-    reply = build_reply_from_jsval(ctx,
-                                   signature,
+    reply = build_reply_from_jsval(ctx, signature,
                                    dbus_message_get_sender(method_call),
-                                   dbus_message_get_serial(method_call),
-                                   rval,
-				   exception);
+                                   dbus_message_get_serial(method_call), rval,
+                                   exception);
 
- out:
+out:
     g_array_free(values, TRUE);
 
     if (reply)
-      g_warning ("Sending %s reply to dbus method %s",
-		 dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN ?
-		 "normal" : "error",
-		 dbus_message_get_member(method_call));
+        g_warning("Sending %s reply to dbus method %s",
+                  dbus_message_get_type(reply)
+                      == DBUS_MESSAGE_TYPE_METHOD_RETURN
+                    ? "normal"
+                    : "error",
+                  dbus_message_get_member(method_call));
     else
-      g_warning ("Failed to create reply to dbus method %s",
-		 dbus_message_get_member(method_call));
+        g_warning("Failed to create reply to dbus method %s",
+                  dbus_message_get_member(method_call));
 
     return reply;
 }
 
 static SeedValue
 async_call_callback(SeedContext ctx,
-		    SeedObject function,
-		    SeedObject this_object,
-		    gsize argument_count,
-		    const SeedValue arguments[],
-		    SeedException *exception)
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-    DBusConnection *connection;
+    DBusConnection* connection;
     DBusBusType which_bus;
-    DBusMessage *reply;
-    const char *sender;
+    DBusMessage* reply;
+    const char* sender;
     dbus_uint32_t serial;
     SeedValue prop_value, retval;
-    const char *signature;
+    const char* signature;
     gboolean thrown;
 
-    retval = seed_make_undefined (ctx);
+    retval = seed_make_undefined(ctx);
     reply = NULL;
     thrown = FALSE;
 
-    prop_value = seed_object_get_property (ctx, function, "_dbusSender");
-    sender = seed_value_to_string (ctx, prop_value, exception);
+    prop_value = seed_object_get_property(ctx, function, "_dbusSender");
+    sender = seed_value_to_string(ctx, prop_value, exception);
     if (!sender)
-      return FALSE;
-
-    prop_value = seed_object_get_property(ctx,
-                                     function,
-					  "_dbusSerial");
+        return FALSE;
 
+    prop_value = seed_object_get_property(ctx, function, "_dbusSerial");
 
-    serial = seed_value_to_uint (ctx, prop_value, exception);
-    prop_value = seed_object_get_property(ctx,
-					  function,
-					  "_dbusBusType");
+    serial = seed_value_to_uint(ctx, prop_value, exception);
+    prop_value = seed_object_get_property(ctx, function, "_dbusBusType");
 
     which_bus = seed_value_to_int(ctx, prop_value, exception);
 
     /* From now we have enough information to
      * send the exception back to the callee so we'll do so
      */
-    prop_value = seed_object_get_property(ctx,
-					  function,
-					  "_dbusOutSignature");
+    prop_value = seed_object_get_property(ctx, function, "_dbusOutSignature");
 
-    signature = seed_value_to_string (ctx, prop_value, exception);
+    signature = seed_value_to_string(ctx, prop_value, exception);
     if (!signature)
         return FALSE;
 
     if (argument_count != 1) {
-      seed_make_exception(ctx, exception, "ArgumentError",
-			  "The callback to async DBus calls takes one argument, "
-			  "the return value or array of return values");
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "The callback to async DBus calls takes one argument, "
+          "the return value or array of return values");
         thrown = TRUE;
         goto out;
     }
 
-    reply = build_reply_from_jsval(ctx,
-                                   signature,
-                                   sender,
-                                   serial,
-                                   arguments[0],
-				   exception);
+    reply = build_reply_from_jsval(ctx, signature, sender, serial, arguments[0],
+                                   exception);
 
 out:
-    if (!reply && thrown)
-      {
-	if (!dbus_reply_from_exception_and_sender(ctx, sender, serial, &reply, exception))
-	  g_warning("dbus method invocation failed but no exception was set?");
-      }
+    if (!reply && thrown) {
+        if (!dbus_reply_from_exception_and_sender(ctx, sender, serial, &reply,
+                                                  exception))
+            g_warning(
+              "dbus method invocation failed but no exception was set?");
+    }
 
-    if (reply)
-      {
+    if (reply) {
         big_dbus_add_bus_weakref(which_bus, &connection);
-        if (!connection)
-	  {
-            seed_make_exception(ctx, exception, "DBusError",
-				"We were disconnected from the bus before the callback "
-				"to some async remote call was called");
+        if (!connection) {
+            seed_make_exception(
+              ctx, exception, "DBusError",
+              "We were disconnected from the bus before the callback "
+              "to some async remote call was called");
             dbus_message_unref(reply);
             big_dbus_remove_bus_weakref(which_bus, &connection);
             return FALSE;
-	  }
+        }
         dbus_connection_send(connection, reply, NULL);
         big_dbus_remove_bus_weakref(which_bus, &connection);
         dbus_message_unref(reply);
@@ -422,40 +385,39 @@ out:
 }
 
 /* returns an error message or NULL */
-static DBusMessage *
+static DBusMessage*
 invoke_js_async_from_dbus(SeedContext ctx,
-                          DBusBusType  bus_type,
-                          DBusMessage *method_call,
-			  SeedObject this_obj,
-			  SeedObject method_obj,
-			  SeedException *exception)
+                          DBusBusType bus_type,
+                          DBusMessage* method_call,
+                          SeedObject this_obj,
+                          SeedObject method_obj,
+                          SeedException* exception)
 {
-    DBusMessage *reply;
+    DBusMessage* reply;
     int argc;
-    SeedValue *argv;
+    SeedValue* argv;
     DBusMessageIter arg_iter;
-    GArray *values;
+    GArray* values;
     SeedObject callback_object;
     SeedValue sender_string, signature_string;
     gboolean thrown;
     SeedValue ignored;
-    const char *signature;
+    const char* signature;
 
     reply = NULL;
     thrown = FALSE;
-    argc = 0;
     argv = NULL;
 
-    if (!seed_js_values_from_dbus(ctx, &arg_iter, &values, exception))
-      {
-	if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
-	  g_warning ("conversion of dbus method arg failed but no exception was set?");
+    if (!seed_js_values_from_dbus(ctx, &arg_iter, &values, exception)) {
+        if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
+            g_warning(
+              "conversion of dbus method arg failed but no exception was set?");
         return reply;
-      }
+    }
 
     /* we will add an argument, the callback */
-    callback_object = seed_make_function(ctx, async_call_callback,
-					 "" /* anonymous */);
+    callback_object
+      = seed_make_function(ctx, async_call_callback, "" /* anonymous */);
 
     g_assert(callback_object);
 
@@ -464,60 +426,57 @@ invoke_js_async_from_dbus(SeedContext ctx,
     /* We attach the DBus sender and serial as properties to
      * callback, so we don't need to bother with memory managing them
      * if the callback is never called and just discarded.*/
-    sender_string = seed_value_from_string (ctx, dbus_message_get_sender (method_call), exception);
-    if (!sender_string)
-      {
+    sender_string
+      = seed_value_from_string(ctx, dbus_message_get_sender(method_call),
+                               exception);
+    if (!sender_string) {
         thrown = TRUE;
         goto out;
-      }
-
-    seed_object_set_property (ctx, callback_object, "_dbusSender", sender_string);
-    seed_object_set_property (ctx, callback_object, "_dbusSerial",
-			      seed_value_from_int (ctx, dbus_message_get_serial (method_call),
-						   exception));
-    seed_object_set_property (ctx, callback_object, "_dbusBusType",
-			      seed_value_from_int (ctx, bus_type, exception));
-
-    if (!signature_from_method(ctx,
-                               method_obj,
-                               &signature,
-			       exception))
-      {
+    }
+
+    seed_object_set_property(ctx, callback_object, "_dbusSender",
+                             sender_string);
+    seed_object_set_property(ctx, callback_object, "_dbusSerial",
+                             seed_value_from_int(ctx, dbus_message_get_serial(
+                                                        method_call),
+                                                 exception));
+    seed_object_set_property(ctx, callback_object, "_dbusBusType",
+                             seed_value_from_int(ctx, bus_type, exception));
+
+    if (!signature_from_method(ctx, method_obj, &signature, exception)) {
         thrown = TRUE;
         goto out;
-      }
+    }
 
-    signature_string = seed_value_from_string (ctx, signature, exception);
-    if (!signature_string)
-      {
+    signature_string = seed_value_from_string(ctx, signature, exception);
+    if (!signature_string) {
         thrown = TRUE;
         goto out;
-      }
-    seed_object_set_property (ctx, callback_object, "_dbusOutSignature",
-			      signature_string);
+    }
+    seed_object_set_property(ctx, callback_object, "_dbusOutSignature",
+                             signature_string);
     argc = values->len;
-    argv = (SeedValue *)values->data;
+    argv = (SeedValue*) values->data;
 
-    seed_object_call (ctx, method_obj, this_obj, argc,
-		      argv, &ignored);
+    seed_object_call(ctx, method_obj, this_obj, argc, argv, &ignored);
 out:
-    if (thrown)
-      {
+    if (thrown) {
         if (!dbus_reply_from_exception(ctx, method_call, &reply, exception))
-	  g_warning("conversion of dbus method arg failed but no exception was set?");
-      }
+            g_warning(
+              "conversion of dbus method arg failed but no exception was set?");
+    }
 
-    g_array_free (values, TRUE);
+    g_array_free(values, TRUE);
 
     return reply;
 }
 
 static SeedObject
 find_js_property_by_path(SeedContext ctx,
-			 SeedObject root_obj,
-                         const gchar *path)
+                         SeedObject root_obj,
+                         const gchar* path)
 {
-    gchar **elements;
+    gchar** elements;
     gint i;
     SeedObject obj;
 
@@ -527,17 +486,15 @@ find_js_property_by_path(SeedContext ctx,
     /* g_strsplit returns empty string for the first
      * '/' so we start with elements[1]
      */
-    for (i = 1; elements[i] != NULL; ++i)
-      {
+    for (i = 1; elements[i] != NULL; ++i) {
         obj = seed_object_get_property(ctx, obj, elements[i]);
 
-	if (seed_value_is_undefined (ctx, obj) ||
-	    !seed_value_is_object (ctx, obj))
-	  {
-	    obj = NULL;
-	    break;
-	  }
-      }
+        if (seed_value_is_undefined(ctx, obj)
+            || !seed_value_is_object(ctx, obj)) {
+            obj = NULL;
+            break;
+        }
+    }
 
     g_strfreev(elements);
 
@@ -546,102 +503,83 @@ find_js_property_by_path(SeedContext ctx,
 
 static gboolean
 find_method(SeedContext ctx,
-	    SeedObject obj,
-            const gchar *method_name,
-            SeedValue      *method_value)
+            SeedObject obj,
+            const gchar* method_name,
+            SeedValue* method_value)
 {
-  *method_value = seed_object_get_property (ctx, obj, method_name);
-    if (seed_value_is_undefined (ctx, *method_value) ||
-	!seed_value_is_object (ctx, *method_value))
-      return FALSE;
+    *method_value = seed_object_get_property(ctx, obj, method_name);
+    if (seed_value_is_undefined(ctx, *method_value)
+        || !seed_value_is_object(ctx, *method_value))
+        return FALSE;
 
-  return TRUE;
+    return TRUE;
 }
 
-
 static DBusHandlerResult
-on_message(DBusConnection *connection,
-           DBusMessage    *message,
-           void           *user_data)
+on_message(DBusConnection* connection, DBusMessage* message, void* user_data)
 {
-  SeedContext ctx;
-  const char *path;
-  DBusHandlerResult result;
-  SeedObject obj;
-  const char *method_name;
-  char *async_method_name;
-  SeedValue method_value;
-  DBusMessage *reply;
-  Exports *priv;
-
-  priv = user_data;
-  async_method_name = NULL;
-  reply = NULL;
-
-  ctx = seed_context_create (group, NULL);
-  seed_prepare_global_context (ctx);
-
-  if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-  method_value = seed_make_undefined (ctx);
-
-  result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-  path = dbus_message_get_path(message);
-
-  obj = find_js_property_by_path(ctx,
-				 priv->object,
-				 path);
-    if (obj == NULL)
-      {
-        g_warning("There is no JS object at %s",
-                  path);
+    SeedContext ctx;
+    const char* path;
+    DBusHandlerResult result;
+    SeedObject obj;
+    const char* method_name;
+    char* async_method_name;
+    SeedValue method_value;
+    DBusMessage* reply;
+    Exports* priv;
+
+    priv = user_data;
+    async_method_name = NULL;
+    reply = NULL;
+
+    ctx = seed_context_create(group, NULL);
+    seed_prepare_global_context(ctx);
+
+    if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_METHOD_CALL)
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    method_value = seed_make_undefined(ctx);
+
+    result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    path = dbus_message_get_path(message);
+
+    obj = find_js_property_by_path(ctx, priv->object, path);
+    if (obj == NULL) {
+        g_warning("There is no JS object at %s", path);
         goto out;
-      }
+    }
 
     method_name = dbus_message_get_member(message);
 
     async_method_name = g_strdup_printf("%sAsync", method_name);
 
     /* try first if an async version exists */
-    if (find_method(ctx,
-                    obj,
-                    async_method_name,
-                    &method_value)) {
-
-      g_warning ("Invoking async method %s on JS obj at dbus path %s",
-		 async_method_name, path);
-
-        reply = invoke_js_async_from_dbus(ctx,
-                                          priv->which_bus,
-                                          message,
-                                          obj,
+    if (find_method(ctx, obj, async_method_name, &method_value)) {
+
+        g_warning("Invoking async method %s on JS obj at dbus path %s",
+                  async_method_name, path);
+
+        reply = invoke_js_async_from_dbus(ctx, priv->which_bus, message, obj,
                                           method_value,
-					  NULL); // Need exception here.
+                                          NULL); // Need exception here.
 
         result = DBUS_HANDLER_RESULT_HANDLED;
 
-    /* otherwise try the sync version */
-    } else if (find_method(ctx,
-                           obj,
-                           method_name,
-                           &method_value)) {
+        /* otherwise try the sync version */
+    } else if (find_method(ctx, obj, method_name, &method_value)) {
 
-      g_warning("Invoking method %s on JS obj at dbus path %s",
-                  method_name, path);
+        g_warning("Invoking method %s on JS obj at dbus path %s", method_name,
+                  path);
 
-        reply = invoke_js_from_dbus(ctx,
-                                    message,
-                                    obj,
-				    method_value,
-				    NULL); // Need exception here
+        reply = invoke_js_from_dbus(ctx, message, obj, method_value,
+                                    NULL); // Need exception here
 
         result = DBUS_HANDLER_RESULT_HANDLED;
-    /* otherwise FAIL */
+        /* otherwise FAIL */
     } else {
-      g_warning("There is a JS object at %s but it has no method %s",
-                  path, method_name);
+        g_warning("There is a JS object at %s but it has no method %s", path,
+                  method_name);
     }
 
     if (reply != NULL) {
@@ -650,58 +588,56 @@ on_message(DBusConnection *connection,
     }
 
 out:
-    seed_context_unref (ctx);
+    seed_context_unref(ctx);
     if (async_method_name)
         g_free(async_method_name);
     return result;
 }
 
 static void
-exports_constructor(SeedContext ctx,
-		    SeedObject obj)
+exports_constructor(SeedContext ctx, SeedObject obj)
 {
-  Exports *priv;
+    Exports* priv;
 
-  priv = g_slice_new0(Exports);
+    priv = g_slice_new0(Exports);
 
-  seed_object_set_private (obj, priv);
-  priv->object = obj;
+    seed_object_set_private(obj, priv);
+    priv->object = obj;
 }
 
 static gboolean
-add_connect_funcs(SeedContext ctx,
-		  SeedObject obj,
-                  DBusBusType which_bus)
+add_connect_funcs(SeedContext ctx, SeedObject obj, DBusBusType which_bus)
 {
-   Exports *priv;
-   BigDBusConnectFuncs const *connect_funcs;
+    Exports* priv;
+    BigDBusConnectFuncs const* connect_funcs;
 
-   priv = seed_object_get_private (obj);
-   if (priv == NULL)
-       return FALSE;
+    priv = seed_object_get_private(obj);
+    if (priv == NULL)
+        return FALSE;
 
-   if (which_bus == DBUS_BUS_SESSION) {
-       connect_funcs = &session_connect_funcs;
-   } else if (which_bus == DBUS_BUS_SYSTEM) {
-       connect_funcs = &system_connect_funcs;
-   } else
-       g_assert_not_reached();
+    if (which_bus == DBUS_BUS_SESSION) {
+        connect_funcs = &session_connect_funcs;
+    } else if (which_bus == DBUS_BUS_SYSTEM) {
+        connect_funcs = &system_connect_funcs;
+    } else
+        g_assert_not_reached();
 
-   priv->which_bus = which_bus;
-   big_dbus_add_connect_funcs_sync_notify(connect_funcs, priv);
+    priv->which_bus = which_bus;
+    big_dbus_add_connect_funcs_sync_notify(connect_funcs, priv);
 
-   return TRUE;
+    return TRUE;
 }
 
 static void
-exports_finalize (SeedObject obj)
+exports_finalize(SeedObject obj)
 {
-    Exports *priv;
-    BigDBusConnectFuncs const *connect_funcs = NULL;
+    Exports* priv;
+    BigDBusConnectFuncs const* connect_funcs = NULL;
 
-    priv = seed_object_get_private (obj);
+    priv = seed_object_get_private(obj);
     if (priv == NULL)
-        return; /* we are the prototype, not a real instance, so constructor never called */
+        return; /* we are the prototype, not a real instance, so constructor
+                   never called */
 
     if (priv->which_bus == DBUS_BUS_SESSION) {
         connect_funcs = &session_connect_funcs;
@@ -719,45 +655,38 @@ exports_finalize (SeedObject obj)
     g_slice_free(Exports, priv);
 }
 
-
 static SeedObject
-exports_new (SeedContext ctx,
-	     DBusBusType which_bus)
+exports_new(SeedContext ctx, DBusBusType which_bus)
 {
-  SeedObject exports;
-  SeedObject global;
+    SeedObject exports;
 
-  global = seed_context_get_global_object (ctx);
-  if (!seed_js_exports_class)
-    {
-      seed_class_definition def = seed_empty_class;
-      def.initialize = exports_constructor;
-      def.finalize = exports_finalize;
+    if (!seed_js_exports_class) {
+        seed_class_definition def = seed_empty_class;
+        def.initialize = exports_constructor;
+        def.finalize = exports_finalize;
 
-      seed_js_exports_class = seed_create_class (&def);
+        seed_js_exports_class = seed_create_class(&def);
     }
-  exports = seed_make_object (ctx, seed_js_exports_class, NULL);
+    exports = seed_make_object(ctx, seed_js_exports_class, NULL);
 
-  return exports;
+    return exports;
 }
 
 gboolean
 seed_js_define_dbus_exports(SeedContext ctx,
-			    SeedObject on_object,
-			    DBusBusType which_bus)
+                            SeedObject on_object,
+                            DBusBusType which_bus)
 {
-  SeedObject exports;
-
+    SeedObject exports;
 
     exports = exports_new(ctx, which_bus);
     if (!exports)
-      return FALSE;
+        return FALSE;
 
     if (!add_connect_funcs(ctx, exports, which_bus))
-      return FALSE;
+        return FALSE;
 
-    seed_object_set_property (ctx, on_object, "exports",
-			      exports);
+    seed_object_set_property(ctx, on_object, "exports", exports);
 
     return TRUE;
 }
diff --git a/modules/dbus/dbus-exports.h b/modules/dbus/dbus-exports.h
index 716cf61..caad5e7 100644
--- a/modules/dbus/dbus-exports.h
+++ b/modules/dbus/dbus-exports.h
@@ -8,9 +8,9 @@
 
 G_BEGIN_DECLS
 
-gboolean seed_js_define_dbus_exports (SeedContext ctx,
-				      SeedObject object,
-				      DBusBusType which_bus);
+gboolean seed_js_define_dbus_exports(SeedContext ctx,
+                                     SeedObject object,
+                                     DBusBusType which_bus);
 
 G_END_DECLS
 
diff --git a/modules/dbus/dbus-values.c b/modules/dbus/dbus-values.c
index 2338477..72c36e6 100644
--- a/modules/dbus/dbus-values.c
+++ b/modules/dbus/dbus-values.c
@@ -29,385 +29,342 @@
 #include <string.h>
 
 gboolean
-seed_js_one_value_from_dbus (SeedContext ctx,
-			     DBusMessageIter * iter,
-                             SeedValue *value_p,
-                             SeedException *exception)
+seed_js_one_value_from_dbus(SeedContext ctx,
+                            DBusMessageIter* iter,
+                            SeedValue* value_p,
+                            SeedException* exception)
 {
-  int arg_type;
+    int arg_type;
 
-  *value_p = seed_make_undefined (ctx);
+    *value_p = seed_make_undefined(ctx);
 
-  arg_type = dbus_message_iter_get_arg_type (iter);
+    arg_type = dbus_message_iter_get_arg_type(iter);
 
-  SEED_NOTE(MODULE,
-            "Converting dbus type '%c' to SeedValue",
-            arg_type != DBUS_TYPE_INVALID ? arg_type : '0');
+    SEED_NOTE(MODULE, "Converting dbus type '%c' to SeedValue",
+              arg_type != DBUS_TYPE_INVALID ? arg_type : '0');
 
-  switch (arg_type)
-    {
-    case DBUS_TYPE_STRUCT:
-      {
-	SeedObject obj;
-	DBusMessageIter struct_iter;
-	int index;
-
-	obj = seed_make_object (ctx, NULL, NULL);
-
-	dbus_message_iter_recurse (iter, &struct_iter);
-	index = 0;
-	while (dbus_message_iter_get_arg_type (&struct_iter) !=
-	       DBUS_TYPE_INVALID)
-          {
-	    SeedValue prop_value;
-
-	    prop_value = seed_make_undefined (ctx);
-
-	    if (!seed_js_one_value_from_dbus
-		(ctx, &struct_iter, &prop_value, exception))
-              {
-                return FALSE;
-              }
-
-            seed_object_set_property_at_index (ctx, obj, index,
-                                               prop_value, exception);
-            dbus_message_iter_next (&struct_iter);
-            index++;
-          }
-        seed_object_set_property (ctx, obj, "length",
-                                  seed_value_from_int (ctx, index, exception));
-	*value_p = (SeedValue) obj;
-      }
-      break;
-    case DBUS_TYPE_ARRAY:
-      {
-	int elem_type = dbus_message_iter_get_element_type (iter);
-
-	if (elem_type == DBUS_TYPE_DICT_ENTRY)
-          {
-	    /* Create a dictionary object */
+    switch (arg_type) {
+        case DBUS_TYPE_STRUCT: {
             SeedObject obj;
-	    DBusMessageIter array_iter;
-
-	    obj = seed_make_object (ctx, NULL, NULL);
+            DBusMessageIter struct_iter;
+            int index;
 
-	    dbus_message_iter_recurse (iter, &array_iter);
-	    while (dbus_message_iter_get_arg_type (&array_iter) !=
-		   DBUS_TYPE_INVALID)
-              {
-		DBusMessageIter entry_iter;
-		const char *key;
-		SeedValue entry_value;
+            obj = seed_make_object(ctx, NULL, NULL);
 
-		dbus_message_iter_recurse (&array_iter, &entry_iter);
+            dbus_message_iter_recurse(iter, &struct_iter);
+            index = 0;
+            while (dbus_message_iter_get_arg_type(&struct_iter)
+                   != DBUS_TYPE_INVALID) {
+                SeedValue prop_value;
 
-		if (dbus_message_iter_get_arg_type (&entry_iter) !=
-		    DBUS_TYPE_STRING)
-                  {
-                    seed_make_exception (ctx, exception, "ArgumentError",
-                                         "Dictionary keys are not strings,"
-                                         "can't convert to JavaScript");
+                prop_value = seed_make_undefined(ctx);
 
+                if (!seed_js_one_value_from_dbus(ctx, &struct_iter, &prop_value,
+                                                 exception)) {
                     return FALSE;
-                  }
-
-		dbus_message_iter_get_basic (&entry_iter, &key);
-
-		dbus_message_iter_next (&entry_iter);
-
-                SEED_NOTE(MODULE,
-                          "Defining dict entry %s in jsval dict",
-                          key);
-
-		entry_value = seed_make_undefined (ctx);
-
-		if (!seed_js_one_value_from_dbus
-		    (ctx, &entry_iter, &entry_value, exception))
-                  {
-		    return FALSE;
-                  }
-
-                seed_object_set_property (ctx, obj,
-                                          key, entry_value);
-
-		dbus_message_iter_next (&array_iter);
-              }
-
-	    *value_p = (SeedValue) obj;
-          }
-	else if (elem_type == DBUS_TYPE_BYTE)
-          {
-	    /* byte arrays go to a string */
-	    const char *v_BYTES;
-	    int n_bytes;
-	    DBusMessageIter array_iter;
-
-	    dbus_message_iter_recurse (iter, &array_iter);
-	    dbus_message_iter_get_fixed_array (&array_iter,
-					       &v_BYTES, &n_bytes);
-            // This is where I am.
-            *value_p = seed_value_from_binary_string (ctx, v_BYTES, n_bytes, exception);
-          }
-	else
-          {
-            SeedObject obj;
-	    DBusMessageIter array_iter;
-	    int index;
-
-            obj = seed_make_object (ctx, NULL, NULL);
-
-	    dbus_message_iter_recurse (iter, &array_iter);
-	    index = 0;
-	    while (dbus_message_iter_get_arg_type (&array_iter) !=
-		   DBUS_TYPE_INVALID)
-              {
-		SeedValue prop_value;
-
-		prop_value = seed_make_undefined (ctx);
-
-		if (!seed_js_one_value_from_dbus
-		    (ctx, &array_iter, &prop_value, exception))
-                  {
-                    return FALSE;
-                  }
-
-                seed_object_set_property_at_index (ctx, obj, index, prop_value, exception);
-
-		dbus_message_iter_next (&array_iter);
-		index++;
-              }
-            seed_object_set_property (ctx, obj, "length",
-                                      seed_value_from_int (ctx,
-                                                           index, exception));
-	    *value_p = (SeedValue) obj;
-          }
-      }
-      break;
-    case DBUS_TYPE_BOOLEAN:
-      {
-	dbus_bool_t v_BOOLEAN;
-	dbus_message_iter_get_basic (iter, &v_BOOLEAN);
-	*value_p = seed_value_from_boolean (ctx, v_BOOLEAN, exception);
-      }
-      break;
-    case DBUS_TYPE_BYTE:
-      {
-	unsigned char v_BYTE;
-	dbus_message_iter_get_basic (iter, &v_BYTE);
-        *value_p = seed_value_from_int (ctx, v_BYTE, exception);
-      }
-      break;
-    case DBUS_TYPE_INT32:
-      {
-	dbus_int32_t v_INT32;
-	dbus_message_iter_get_basic (iter, &v_INT32);
-        *value_p = seed_value_from_int (ctx, v_INT32, exception);
-      }
-      break;
-    case DBUS_TYPE_UINT32:
-      {
-	dbus_uint32_t v_UINT32;
-	dbus_message_iter_get_basic (iter, &v_UINT32);
-        *value_p = seed_value_from_uint (ctx, v_UINT32, exception);
-      }
-      break;
-    case DBUS_TYPE_INT64:
-      {
-	dbus_int64_t v_INT64;
-	dbus_message_iter_get_basic (iter, &v_INT64);
-        *value_p = seed_value_from_int64 (ctx, v_INT64, exception);
-      }
-      break;
-    case DBUS_TYPE_UINT64:
-      {
-	dbus_uint64_t v_UINT64;
-	dbus_message_iter_get_basic (iter, &v_UINT64);
-        *value_p = seed_value_from_uint64 (ctx, v_UINT64, exception);
-      }
-      break;
-    case DBUS_TYPE_DOUBLE:
-      {
-	double v_DOUBLE;
-	dbus_message_iter_get_basic (iter, &v_DOUBLE);
-        *value_p = seed_value_from_double (ctx, v_DOUBLE, exception);
-      }
-      break;
-    case DBUS_TYPE_OBJECT_PATH:
-    case DBUS_TYPE_STRING:
-      {
-	char *v_STRING;
-
-	dbus_message_iter_get_basic (iter, &v_STRING);
-
-        *value_p = seed_value_from_string (ctx, v_STRING, exception);
-      }
-      break;
-
-    case DBUS_TYPE_VARIANT:
-      {
-	DBusMessageIter variant_iter;
-
-	dbus_message_iter_recurse (iter, &variant_iter);
-
-	return seed_js_one_value_from_dbus (ctx, &variant_iter, value_p, exception);
-      }
-      break;
-
-    case DBUS_TYPE_INVALID:
-      *value_p = seed_make_undefined (ctx);
-      break;
-
-    default:
-      SEED_NOTE (MODULE,
-                 "Don't know how to convert dbus type %c to JavaScript",
-                 arg_type);
-      return FALSE;
+                }
+
+                seed_object_set_property_at_index(ctx, obj, index, prop_value,
+                                                  exception);
+                dbus_message_iter_next(&struct_iter);
+                index++;
+            }
+            seed_object_set_property(ctx, obj, "length",
+                                     seed_value_from_int(ctx, index,
+                                                         exception));
+            *value_p = (SeedValue) obj;
+        } break;
+        case DBUS_TYPE_ARRAY: {
+            int elem_type = dbus_message_iter_get_element_type(iter);
+
+            if (elem_type == DBUS_TYPE_DICT_ENTRY) {
+                /* Create a dictionary object */
+                SeedObject obj;
+                DBusMessageIter array_iter;
+
+                obj = seed_make_object(ctx, NULL, NULL);
+
+                dbus_message_iter_recurse(iter, &array_iter);
+                while (dbus_message_iter_get_arg_type(&array_iter)
+                       != DBUS_TYPE_INVALID) {
+                    DBusMessageIter entry_iter;
+                    const char* key;
+                    SeedValue entry_value;
+
+                    dbus_message_iter_recurse(&array_iter, &entry_iter);
+
+                    if (dbus_message_iter_get_arg_type(&entry_iter)
+                        != DBUS_TYPE_STRING) {
+                        seed_make_exception(ctx, exception, "ArgumentError",
+                                            "Dictionary keys are not strings,"
+                                            "can't convert to JavaScript");
+
+                        return FALSE;
+                    }
+
+                    dbus_message_iter_get_basic(&entry_iter, &key);
+
+                    dbus_message_iter_next(&entry_iter);
+
+                    SEED_NOTE(MODULE, "Defining dict entry %s in jsval dict",
+                              key);
+
+                    entry_value = seed_make_undefined(ctx);
+
+                    if (!seed_js_one_value_from_dbus(ctx, &entry_iter,
+                                                     &entry_value, exception)) {
+                        return FALSE;
+                    }
+
+                    seed_object_set_property(ctx, obj, key, entry_value);
+
+                    dbus_message_iter_next(&array_iter);
+                }
+
+                *value_p = (SeedValue) obj;
+            } else if (elem_type == DBUS_TYPE_BYTE) {
+                /* byte arrays go to a string */
+                const char* v_BYTES;
+                int n_bytes;
+                DBusMessageIter array_iter;
+
+                dbus_message_iter_recurse(iter, &array_iter);
+                dbus_message_iter_get_fixed_array(&array_iter, &v_BYTES,
+                                                  &n_bytes);
+                // This is where I am.
+                *value_p = seed_value_from_binary_string(ctx, v_BYTES, n_bytes,
+                                                         exception);
+            } else {
+                SeedObject obj;
+                DBusMessageIter array_iter;
+                int index;
+
+                obj = seed_make_object(ctx, NULL, NULL);
+
+                dbus_message_iter_recurse(iter, &array_iter);
+                index = 0;
+                while (dbus_message_iter_get_arg_type(&array_iter)
+                       != DBUS_TYPE_INVALID) {
+                    SeedValue prop_value;
+
+                    prop_value = seed_make_undefined(ctx);
+
+                    if (!seed_js_one_value_from_dbus(ctx, &array_iter,
+                                                     &prop_value, exception)) {
+                        return FALSE;
+                    }
+
+                    seed_object_set_property_at_index(ctx, obj, index,
+                                                      prop_value, exception);
+
+                    dbus_message_iter_next(&array_iter);
+                    index++;
+                }
+                seed_object_set_property(ctx, obj, "length",
+                                         seed_value_from_int(ctx, index,
+                                                             exception));
+                *value_p = (SeedValue) obj;
+            }
+        } break;
+        case DBUS_TYPE_BOOLEAN: {
+            dbus_bool_t v_BOOLEAN;
+            dbus_message_iter_get_basic(iter, &v_BOOLEAN);
+            *value_p = seed_value_from_boolean(ctx, v_BOOLEAN, exception);
+        } break;
+        case DBUS_TYPE_BYTE: {
+            unsigned char v_BYTE;
+            dbus_message_iter_get_basic(iter, &v_BYTE);
+            *value_p = seed_value_from_int(ctx, v_BYTE, exception);
+        } break;
+        case DBUS_TYPE_INT32: {
+            dbus_int32_t v_INT32;
+            dbus_message_iter_get_basic(iter, &v_INT32);
+            *value_p = seed_value_from_int(ctx, v_INT32, exception);
+        } break;
+        case DBUS_TYPE_UINT32: {
+            dbus_uint32_t v_UINT32;
+            dbus_message_iter_get_basic(iter, &v_UINT32);
+            *value_p = seed_value_from_uint(ctx, v_UINT32, exception);
+        } break;
+        case DBUS_TYPE_INT64: {
+            dbus_int64_t v_INT64;
+            dbus_message_iter_get_basic(iter, &v_INT64);
+            *value_p = seed_value_from_int64(ctx, v_INT64, exception);
+        } break;
+        case DBUS_TYPE_UINT64: {
+            dbus_uint64_t v_UINT64;
+            dbus_message_iter_get_basic(iter, &v_UINT64);
+            *value_p = seed_value_from_uint64(ctx, v_UINT64, exception);
+        } break;
+        case DBUS_TYPE_DOUBLE: {
+            double v_DOUBLE;
+            dbus_message_iter_get_basic(iter, &v_DOUBLE);
+            *value_p = seed_value_from_double(ctx, v_DOUBLE, exception);
+        } break;
+        case DBUS_TYPE_OBJECT_PATH:
+        case DBUS_TYPE_STRING: {
+            char* v_STRING;
+
+            dbus_message_iter_get_basic(iter, &v_STRING);
+
+            *value_p = seed_value_from_string(ctx, v_STRING, exception);
+        } break;
+
+        case DBUS_TYPE_VARIANT: {
+            DBusMessageIter variant_iter;
+
+            dbus_message_iter_recurse(iter, &variant_iter);
+
+            return seed_js_one_value_from_dbus(ctx, &variant_iter, value_p,
+                                               exception);
+        } break;
+
+        case DBUS_TYPE_INVALID:
+            *value_p = seed_make_undefined(ctx);
+            break;
+
+        default:
+            SEED_NOTE(MODULE,
+                      "Don't know how to convert dbus type %c to JavaScript",
+                      arg_type);
+            return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_js_values_from_dbus (SeedContext ctx,
-			  DBusMessageIter * iter,
-                          GArray **array_p,
-                          SeedException *exception)
+seed_js_values_from_dbus(SeedContext ctx,
+                         DBusMessageIter* iter,
+                         GArray** array_p,
+                         SeedException* exception)
 {
-  GArray *array;
-  SeedValue value;
+    GArray* array;
+    SeedValue value;
 
-  value = seed_make_undefined (ctx);
+    value = seed_make_undefined(ctx);
 
-  array = g_array_new (FALSE, FALSE, sizeof(SeedValue));
+    array = g_array_new(FALSE, FALSE, sizeof(SeedValue));
 
-  /* TODO */
-  // THIS IS WHERE IA M
-  // Wheee.
-  do
-    {
-      if (!seed_js_one_value_from_dbus (ctx, iter, &value, exception))
-	{
-          g_array_free (array, TRUE);
-          return FALSE;
-	}
+    /* TODO */
+    // THIS IS WHERE IA M
+    // Wheee.
+    do {
+        if (!seed_js_one_value_from_dbus(ctx, iter, &value, exception)) {
+            g_array_free(array, TRUE);
+            return FALSE;
+        }
 
-      g_array_append_val (array, value);
-    }
-  while (dbus_message_iter_next (iter));
+        g_array_append_val(array, value);
+    } while (dbus_message_iter_next(iter));
 
-  *array_p = array;
-  return TRUE;
+    *array_p = array;
+    return TRUE;
 }
 
 static void
-append_basic_maybe_in_variant (DBusMessageIter * iter,
-			       int dbus_type,
-			       void *value, gboolean wrap_in_variant)
+append_basic_maybe_in_variant(DBusMessageIter* iter,
+                              int dbus_type,
+                              void* value,
+                              gboolean wrap_in_variant)
 {
-  if (wrap_in_variant)
-    {
-      char buf[2];
-      DBusMessageIter variant_iter;
-
-      buf[0] = dbus_type;
-      buf[1] = '\0';
-
-      dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, buf,
-                                        &variant_iter);
-      dbus_message_iter_append_basic (&variant_iter, dbus_type, value);
-      dbus_message_iter_close_container (iter, &variant_iter);
-    }
-  else
-    {
-      dbus_message_iter_append_basic (iter, dbus_type, value);
+    if (wrap_in_variant) {
+        char buf[2];
+        DBusMessageIter variant_iter;
+
+        buf[0] = dbus_type;
+        buf[1] = '\0';
+
+        dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, buf,
+                                         &variant_iter);
+        dbus_message_iter_append_basic(&variant_iter, dbus_type, value);
+        dbus_message_iter_close_container(iter, &variant_iter);
+    } else {
+        dbus_message_iter_append_basic(iter, dbus_type, value);
     }
 }
 
 static void
-append_byte_array_maybe_in_variant (DBusMessageIter * iter,
-				    const char *data,
-				    gsize len,
-                                    gboolean wrap_in_variant)
+append_byte_array_maybe_in_variant(DBusMessageIter* iter,
+                                   const char* data,
+                                   gsize len,
+                                   gboolean wrap_in_variant)
 {
-  DBusMessageIter array_iter;
-  DBusMessageIter variant_iter;
+    DBusMessageIter array_iter;
+    DBusMessageIter variant_iter;
 
-  if (wrap_in_variant)
-    {
-      dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "ay",
-                                        &variant_iter);
+    if (wrap_in_variant) {
+        dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "ay",
+                                         &variant_iter);
     }
 
-  dbus_message_iter_open_container (wrap_in_variant ? &variant_iter : iter,
-                                    DBUS_TYPE_ARRAY, "y", &array_iter);
+    dbus_message_iter_open_container(wrap_in_variant ? &variant_iter : iter,
+                                     DBUS_TYPE_ARRAY, "y", &array_iter);
 
-  dbus_message_iter_append_fixed_array (&array_iter, DBUS_TYPE_BYTE,
-                                        &data, len);
+    dbus_message_iter_append_fixed_array(&array_iter, DBUS_TYPE_BYTE, &data,
+                                         len);
 
-  dbus_message_iter_close_container (wrap_in_variant ? &variant_iter : iter,
-                                     &array_iter);
+    dbus_message_iter_close_container(wrap_in_variant ? &variant_iter : iter,
+                                      &array_iter);
 
-  if (wrap_in_variant)
-    {
-      dbus_message_iter_close_container (iter, &variant_iter);
+    if (wrap_in_variant) {
+        dbus_message_iter_close_container(iter, &variant_iter);
     }
 }
 
 static gboolean
-append_string (SeedContext ctx,
-	       DBusMessageIter * iter,
-	       const char *forced_signature,
-               const char *s,
-               gsize len,
-               SeedException *exception)
+append_string(SeedContext ctx,
+              DBusMessageIter* iter,
+              const char* forced_signature,
+              const char* s,
+              gsize len,
+              SeedException* exception)
 {
-  int forced_type;
-
-  if (forced_signature == NULL || *forced_signature == DBUS_TYPE_INVALID)
-    forced_type = DBUS_TYPE_STRING;
-  else
-    forced_type = *forced_signature;
-
-  switch (forced_type)
-    {
-    case DBUS_TYPE_STRING:
-    case DBUS_TYPE_OBJECT_PATH:
-    case DBUS_TYPE_SIGNATURE:
-      append_basic_maybe_in_variant (iter, forced_type, &s, FALSE);
-      break;
-    case DBUS_TYPE_VARIANT:
-      append_basic_maybe_in_variant (iter, DBUS_TYPE_STRING, &s, TRUE);
-      break;
-    case DBUS_TYPE_ARRAY:
-      g_assert (forced_signature != NULL);
-      g_assert (forced_signature[0] == DBUS_TYPE_ARRAY);
-      if (forced_signature[1] == DBUS_TYPE_BYTE)
-	{
-          append_byte_array_maybe_in_variant (iter, s, len, FALSE);
-	}
-      else
-	{
-          seed_make_exception (ctx, exception, "ArgumentError",
-                               "JavaScript string can't be converted to dbus array with elements of type '%c'",
-                               forced_signature[1]);
-          return FALSE;
-	}
-      break;
-    default:
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "JavaScript string can't be converted to dbus type '%c'",
-                           forced_type);
-      return FALSE;
+    int forced_type;
+
+    if (forced_signature == NULL || *forced_signature == DBUS_TYPE_INVALID)
+        forced_type = DBUS_TYPE_STRING;
+    else
+        forced_type = *forced_signature;
+
+    switch (forced_type) {
+        case DBUS_TYPE_STRING:
+        case DBUS_TYPE_OBJECT_PATH:
+        case DBUS_TYPE_SIGNATURE:
+            append_basic_maybe_in_variant(iter, forced_type, &s, FALSE);
+            break;
+        case DBUS_TYPE_VARIANT:
+            append_basic_maybe_in_variant(iter, DBUS_TYPE_STRING, &s, TRUE);
+            break;
+        case DBUS_TYPE_ARRAY:
+            g_assert(forced_signature != NULL);
+            g_assert(forced_signature[0] == DBUS_TYPE_ARRAY);
+            if (forced_signature[1] == DBUS_TYPE_BYTE) {
+                append_byte_array_maybe_in_variant(iter, s, len, FALSE);
+            } else {
+                seed_make_exception(ctx, exception, "ArgumentError",
+                                    "JavaScript string can't be converted to "
+                                    "dbus array with elements of type '%c'",
+                                    forced_signature[1]);
+                return FALSE;
+            }
+            break;
+        default:
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "JavaScript string can't be converted to dbus type '%c'",
+              forced_type);
+            return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 /* Seems to be unused
 
 static gboolean
 append_int32 (SeedContext ctx,
-	      DBusMessageIter * iter,
+              DBusMessageIter * iter,
               int forced_type,
               dbus_int32_t v_INT32,
               SeedException *exception)
@@ -425,25 +382,26 @@ append_int32 (SeedContext ctx,
       break;
     case DBUS_TYPE_UINT32:
       {
-	dbus_uint32_t v_UINT32 = v_INT32;
-	append_basic_maybe_in_variant (iter, forced_type, &v_UINT32, FALSE);
+        dbus_uint32_t v_UINT32 = v_INT32;
+        append_basic_maybe_in_variant (iter, forced_type, &v_UINT32, FALSE);
       }
       break;
     case DBUS_TYPE_DOUBLE:
       {
-	double v_DOUBLE = v_INT32;
-	append_basic_maybe_in_variant (iter, forced_type, &v_DOUBLE, FALSE);
+        double v_DOUBLE = v_INT32;
+        append_basic_maybe_in_variant (iter, forced_type, &v_DOUBLE, FALSE);
       }
       break;
     case DBUS_TYPE_BYTE:
       {
-	unsigned char v_BYTE = v_INT32;
-	append_basic_maybe_in_variant (iter, forced_type, &v_BYTE, FALSE);
+        unsigned char v_BYTE = v_INT32;
+        append_basic_maybe_in_variant (iter, forced_type, &v_BYTE, FALSE);
       }
       break;
     default:
       seed_make_exception (ctx, exception, "ArgumentError",
-                           "JavaScript Integer can't be converted to dbus type '%c'",
+                           "JavaScript Integer can't be converted to dbus type
+'%c'",
                            forced_type);
       return FALSE;
     }
@@ -453,521 +411,485 @@ append_int32 (SeedContext ctx,
 */
 
 static gboolean
-append_double (SeedContext ctx,
-	       DBusMessageIter * iter, int forced_type, double v_DOUBLE,
-               SeedException *exception)
+append_double(SeedContext ctx,
+              DBusMessageIter* iter,
+              int forced_type,
+              double v_DOUBLE,
+              SeedException* exception)
 {
-  if (forced_type == DBUS_TYPE_INVALID)
-    forced_type = DBUS_TYPE_DOUBLE;
-
-  switch (forced_type)
-    {
-    case DBUS_TYPE_DOUBLE:
-      append_basic_maybe_in_variant (iter, forced_type, &v_DOUBLE, FALSE);
-      break;
-    case DBUS_TYPE_VARIANT:
-      append_basic_maybe_in_variant (iter, DBUS_TYPE_DOUBLE, &v_DOUBLE, TRUE);
-      break;
-    case DBUS_TYPE_INT32:
-      {
-	dbus_int32_t v_INT32 = v_DOUBLE;
-	append_basic_maybe_in_variant (iter, forced_type, &v_INT32, FALSE);
-      }
-      break;
-    case DBUS_TYPE_UINT32:
-      {
-	dbus_uint32_t v_UINT32 = v_DOUBLE;
-	append_basic_maybe_in_variant (iter, forced_type, &v_UINT32, FALSE);
-      }
-      break;
-    default:
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "JavaScript Number can't be converted to dbus type '%c'",
-                           forced_type);
-      return FALSE;
+    if (forced_type == DBUS_TYPE_INVALID)
+        forced_type = DBUS_TYPE_DOUBLE;
+
+    switch (forced_type) {
+        case DBUS_TYPE_DOUBLE:
+            append_basic_maybe_in_variant(iter, forced_type, &v_DOUBLE, FALSE);
+            break;
+        case DBUS_TYPE_VARIANT:
+            append_basic_maybe_in_variant(iter, DBUS_TYPE_DOUBLE, &v_DOUBLE,
+                                          TRUE);
+            break;
+        case DBUS_TYPE_INT32: {
+            dbus_int32_t v_INT32 = v_DOUBLE;
+            append_basic_maybe_in_variant(iter, forced_type, &v_INT32, FALSE);
+        } break;
+        case DBUS_TYPE_UINT32: {
+            dbus_uint32_t v_UINT32 = v_DOUBLE;
+            append_basic_maybe_in_variant(iter, forced_type, &v_UINT32, FALSE);
+        } break;
+        default:
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "JavaScript Number can't be converted to dbus type '%c'",
+              forced_type);
+            return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 static gboolean
-append_boolean (SeedContext ctx,
-		DBusMessageIter * iter,
-		int forced_type, dbus_bool_t v_BOOLEAN,
-                SeedException *exception)
+append_boolean(SeedContext ctx,
+               DBusMessageIter* iter,
+               int forced_type,
+               dbus_bool_t v_BOOLEAN,
+               SeedException* exception)
 {
-  if (forced_type == DBUS_TYPE_INVALID)
-    forced_type = DBUS_TYPE_BOOLEAN;
-
-  switch (forced_type)
-    {
-    case DBUS_TYPE_BOOLEAN:
-      append_basic_maybe_in_variant (iter, forced_type, &v_BOOLEAN, FALSE);
-      break;
-    case DBUS_TYPE_VARIANT:
-      append_basic_maybe_in_variant (iter, DBUS_TYPE_BOOLEAN, &v_BOOLEAN,
-                                     TRUE);
-      break;
-    default:
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "JavaScript Boolean can't be converted to dbus type '%c'",
-                           forced_type);
-      return FALSE;
+    if (forced_type == DBUS_TYPE_INVALID)
+        forced_type = DBUS_TYPE_BOOLEAN;
+
+    switch (forced_type) {
+        case DBUS_TYPE_BOOLEAN:
+            append_basic_maybe_in_variant(iter, forced_type, &v_BOOLEAN, FALSE);
+            break;
+        case DBUS_TYPE_VARIANT:
+            append_basic_maybe_in_variant(iter, DBUS_TYPE_BOOLEAN, &v_BOOLEAN,
+                                          TRUE);
+            break;
+        default:
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "JavaScript Boolean can't be converted to dbus type '%c'",
+              forced_type);
+            return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 static gboolean
-append_array (SeedContext ctx,
-	      DBusMessageIter * iter,
-	      DBusSignatureIter * sig_iter, SeedObject array,
-              int length,
-              SeedException *exception)
+append_array(SeedContext ctx,
+             DBusMessageIter* iter,
+             DBusSignatureIter* sig_iter,
+             SeedObject array,
+             int length,
+             SeedException* exception)
 {
-  DBusSignatureIter element_sig_iter;
-  int forced_type;
-  SeedValue element;
-  DBusMessageIter array_iter;
-  DBusMessageIter variant_iter;
-  int i;
-  char *sig;
-
-  forced_type = dbus_signature_iter_get_current_type (sig_iter);
-
-  if (forced_type == DBUS_TYPE_VARIANT)
-    {
-      DBusSignatureIter variant_sig_iter;
+    DBusSignatureIter element_sig_iter;
+    int forced_type;
+    SeedValue element;
+    DBusMessageIter array_iter;
+    DBusMessageIter variant_iter;
+    int i;
+    char* sig;
+
+    forced_type = dbus_signature_iter_get_current_type(sig_iter);
+
+    if (forced_type == DBUS_TYPE_VARIANT) {
+        DBusSignatureIter variant_sig_iter;
+
+        dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "av",
+                                         &variant_iter);
+        dbus_signature_iter_init(&variant_sig_iter, "av");
+        if (!append_array(ctx, &variant_iter, &variant_sig_iter, array, length,
+                          exception))
+            return FALSE;
+        dbus_message_iter_close_container(iter, &variant_iter);
 
-      dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT,
-                                        "av", &variant_iter);
-      dbus_signature_iter_init (&variant_sig_iter, "av");
-      if (!append_array (ctx, &variant_iter,
-                         &variant_sig_iter, array, length, exception))
+        return TRUE;
+    } else if (forced_type != DBUS_TYPE_ARRAY) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "JavaScript Array can't be converted to dbus type %c", forced_type);
         return FALSE;
-      dbus_message_iter_close_container (iter, &variant_iter);
-
-      return TRUE;
-    }
-  else if (forced_type != DBUS_TYPE_ARRAY)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "JavaScript Array can't be converted to dbus type %c",
-                           forced_type);
-      return FALSE;
     }
 
-  g_assert (dbus_signature_iter_get_current_type (sig_iter) ==
-            DBUS_TYPE_ARRAY);
-  dbus_signature_iter_recurse (sig_iter, &element_sig_iter);
+    g_assert(dbus_signature_iter_get_current_type(sig_iter) == DBUS_TYPE_ARRAY);
+    dbus_signature_iter_recurse(sig_iter, &element_sig_iter);
 
-  sig = dbus_signature_iter_get_signature (&element_sig_iter);
-  dbus_message_iter_open_container (iter, DBUS_TYPE_ARRAY, sig, &array_iter);
-  dbus_free (sig);
+    sig = dbus_signature_iter_get_signature(&element_sig_iter);
+    dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, sig, &array_iter);
+    dbus_free(sig);
 
-  for (i = 0; i < length; i++)
-    {
-      element = seed_object_get_property_at_index (ctx, array, i, exception);
+    for (i = 0; i < length; i++) {
+        element = seed_object_get_property_at_index(ctx, array, i, exception);
 
-      SEED_NOTE(MODULE, " Adding array element %u", i);
+        SEED_NOTE(MODULE, " Adding array element %u", i);
 
-      if (!seed_js_one_value_to_dbus (ctx, element, &array_iter,
-                                      &element_sig_iter, exception))
-        return FALSE;
+        if (!seed_js_one_value_to_dbus(ctx, element, &array_iter,
+                                       &element_sig_iter, exception))
+            return FALSE;
     }
 
-  dbus_message_iter_close_container (iter, &array_iter);
+    dbus_message_iter_close_container(iter, &array_iter);
 
-  return TRUE;
+    return TRUE;
 }
 // TODO: THIS IS WHERE I AM
 static gboolean
-append_dict (SeedContext ctx,
-	     DBusMessageIter * iter,
-	     DBusSignatureIter * sig_iter,
-             SeedObject props,
-             SeedException *exception)
+append_dict(SeedContext ctx,
+            DBusMessageIter* iter,
+            DBusSignatureIter* sig_iter,
+            SeedObject props,
+            SeedException* exception)
 {
-  DBusSignatureIter element_sig_iter;
-  int forced_type;
-  DBusMessageIter variant_iter;
-  gchar **prop_names;
-  guint num_props, i;
-  DBusMessageIter dict_iter;
-  DBusSignatureIter dict_value_sig_iter;
-  char *sig;
-  SeedValue prop_signatures;
-
-  forced_type = dbus_signature_iter_get_current_type (sig_iter);
-
-  if (forced_type == DBUS_TYPE_VARIANT)
-    {
-      DBusSignatureIter variant_sig_iter;
+    DBusSignatureIter element_sig_iter;
+    int forced_type;
+    DBusMessageIter variant_iter;
+    gchar** prop_names;
+    guint num_props, i;
+    DBusMessageIter dict_iter;
+    DBusSignatureIter dict_value_sig_iter;
+    char* sig;
+    SeedValue prop_signatures;
+
+    forced_type = dbus_signature_iter_get_current_type(sig_iter);
+
+    if (forced_type == DBUS_TYPE_VARIANT) {
+        DBusSignatureIter variant_sig_iter;
+
+        dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "a{sv}",
+                                         &variant_iter);
+        dbus_signature_iter_init(&variant_sig_iter, "a{sv}");
+        if (!append_dict(ctx, &variant_iter, &variant_sig_iter, props,
+                         exception))
+            return FALSE;
+        dbus_message_iter_close_container(iter, &variant_iter);
 
-      dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT,
-                                        "a{sv}", &variant_iter);
-      dbus_signature_iter_init (&variant_sig_iter, "a{sv}");
-      if (!append_dict (ctx, &variant_iter, &variant_sig_iter, props, exception))
+        return TRUE;
+    } else if (forced_type != DBUS_TYPE_ARRAY) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "JavaScript Object can't be converted to dbus type %c", forced_type);
         return FALSE;
-      dbus_message_iter_close_container (iter, &variant_iter);
-
-      return TRUE;
-    }
-  else if (forced_type != DBUS_TYPE_ARRAY)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "JavaScript Object can't be converted to dbus type %c",
-                           forced_type);
-      return FALSE;
     }
 
-  g_assert (dbus_signature_iter_get_current_type (sig_iter) ==
-            DBUS_TYPE_ARRAY);
-  dbus_signature_iter_recurse (sig_iter, &element_sig_iter);
+    g_assert(dbus_signature_iter_get_current_type(sig_iter) == DBUS_TYPE_ARRAY);
+    dbus_signature_iter_recurse(sig_iter, &element_sig_iter);
 
-  if (dbus_signature_iter_get_current_type (&element_sig_iter) !=
-      DBUS_TYPE_DICT_ENTRY)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "Objects must be marshaled as array of dict entry not of %c",
-                           dbus_signature_iter_get_current_type (&element_sig_iter));
-      return FALSE;
+    if (dbus_signature_iter_get_current_type(&element_sig_iter)
+        != DBUS_TYPE_DICT_ENTRY) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Objects must be marshaled as array of dict entry not of %c",
+          dbus_signature_iter_get_current_type(&element_sig_iter));
+        return FALSE;
     }
 
-  /* dbus itself enforces that dict keys are strings */
-
-  g_assert (dbus_signature_iter_get_current_type (&element_sig_iter) ==
-            DBUS_TYPE_DICT_ENTRY);
-  dbus_signature_iter_recurse (&element_sig_iter, &dict_value_sig_iter);
-  /* check it points to key type first */
-  g_assert (dbus_signature_iter_get_current_type (&dict_value_sig_iter) ==
-            DBUS_TYPE_STRING);
-  /* move to value type */
-  dbus_signature_iter_next (&dict_value_sig_iter);
-
-  sig = dbus_signature_iter_get_signature (&element_sig_iter);
-  dbus_message_iter_open_container (iter, DBUS_TYPE_ARRAY, sig, &dict_iter);
-  dbus_free (sig);
-
-  /* If a dictionary contains another dictionary at key
-   * _dbus_signatures, the sub-dictionary can provide the signature
-   * of each value in the outer dictionary. This allows forcing
-   * integers to unsigned or whatever.
-   *
-   * _dbus_signatures has a weird name to avoid conflicting with
-   * real properties. Matches _dbus_sender which is used elsewhere.
-   *
-   * We don't bother rooting the signature object or the stuff in it
-   * because we assume the outer dictionary is rooted so the stuff
-   * in it is also.
-   */
-  prop_signatures = seed_object_get_property (ctx, props, "_dbus_signatures");
-
-  if (!seed_value_is_undefined (ctx, prop_signatures) && !seed_value_is_object (ctx, prop_signatures))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "_dbus_signatures prop must be an object");
-      return FALSE;
+    /* dbus itself enforces that dict keys are strings */
+
+    g_assert(dbus_signature_iter_get_current_type(&element_sig_iter)
+             == DBUS_TYPE_DICT_ENTRY);
+    dbus_signature_iter_recurse(&element_sig_iter, &dict_value_sig_iter);
+    /* check it points to key type first */
+    g_assert(dbus_signature_iter_get_current_type(&dict_value_sig_iter)
+             == DBUS_TYPE_STRING);
+    /* move to value type */
+    dbus_signature_iter_next(&dict_value_sig_iter);
+
+    sig = dbus_signature_iter_get_signature(&element_sig_iter);
+    dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, sig, &dict_iter);
+    dbus_free(sig);
+
+    /* If a dictionary contains another dictionary at key
+     * _dbus_signatures, the sub-dictionary can provide the signature
+     * of each value in the outer dictionary. This allows forcing
+     * integers to unsigned or whatever.
+     *
+     * _dbus_signatures has a weird name to avoid conflicting with
+     * real properties. Matches _dbus_sender which is used elsewhere.
+     *
+     * We don't bother rooting the signature object or the stuff in it
+     * because we assume the outer dictionary is rooted so the stuff
+     * in it is also.
+     */
+    prop_signatures = seed_object_get_property(ctx, props, "_dbus_signatures");
+
+    if (!seed_value_is_undefined(ctx, prop_signatures)
+        && !seed_value_is_object(ctx, prop_signatures)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "_dbus_signatures prop must be an object");
+        return FALSE;
     }
 
-  if (!seed_value_is_undefined (ctx, prop_signatures) &&
-      dbus_signature_iter_get_current_type (&dict_value_sig_iter) !=
-      DBUS_TYPE_VARIANT)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "Specifying _dbus_signatures for a dictionary with non-variant values is useless");
-      return FALSE;
+    if (!seed_value_is_undefined(ctx, prop_signatures)
+        && dbus_signature_iter_get_current_type(&dict_value_sig_iter)
+             != DBUS_TYPE_VARIANT) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Specifying _dbus_signatures for a "
+                            "dictionary with non-variant values "
+                            "is useless");
+        return FALSE;
     }
 
-  prop_names = seed_object_copy_property_names (ctx, props);
-  num_props = g_strv_length (prop_names);
-
-  for (i = 0; i < num_props; i++)
-    {
-      char *name;
-      SeedValue propval;
-      DBusMessageIter entry_iter;
-      const char *value_signature;
-
-      name = prop_names[i];
-
-      if (strcmp (name, "_dbus_signatures") == 0)
-	{
-          /* skip the magic "_dbus_signatures" field */
-          goto next;
-	}
-
-      /* see if this prop has a forced signature */
-      value_signature = NULL;
-      if (!seed_value_is_undefined (ctx, prop_signatures))
-	{
-          SeedValue signature_value;
-
-          signature_value = seed_object_get_property (ctx, prop_signatures, name);
-          if (!seed_value_is_undefined (ctx, signature_value))
-	    {
-              value_signature = seed_value_to_string (ctx, signature_value, exception);
-              if (value_signature == NULL)
-		{
-                  return FALSE;
-		}
-	    }
-	}
-
-      //      if (!gjs_object_require_property
-      //  (ctx, props, "DBus append_dict", name, &propval))
-      //return FALSE;
-      propval = seed_object_get_property (ctx, props, name);
-
-      SEED_NOTE(MODULE, " Adding property %s", name);
-
-      /* seed_js_one_value_to_dbus() would check this also, but would not
-       * print the property name, which is often useful
-       */
-      if (seed_value_is_null (ctx, propval))
-	{
-          seed_make_exception (ctx, exception, "ArgumentError",
-                               "Property '%s' has a null value, can't send over dbus",
-                               name);
-          return FALSE;
-	}
-
-      dbus_message_iter_open_container (&dict_iter, DBUS_TYPE_DICT_ENTRY,
-                                        NULL, &entry_iter);
-
-      dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &name);
-      g_free (name);
-
-      if (value_signature != NULL)
-	{
-          DBusSignatureIter forced_signature_iter;
-          DBusMessageIter variant_iter;
-
-          g_assert (dbus_signature_iter_get_current_type
-                    (&dict_value_sig_iter) == DBUS_TYPE_VARIANT);
-
-          dbus_message_iter_open_container (&entry_iter,
-                                            DBUS_TYPE_VARIANT,
-                                            value_signature, &variant_iter);
-
-          dbus_signature_iter_init (&forced_signature_iter, value_signature);
-
-          if (!seed_js_one_value_to_dbus (ctx, propval, &variant_iter,
-                                          &forced_signature_iter, exception))
+    prop_names = seed_object_copy_property_names(ctx, props);
+    num_props = g_strv_length(prop_names);
+
+    for (i = 0; i < num_props; i++) {
+        char* name;
+        SeedValue propval;
+        DBusMessageIter entry_iter;
+        const char* value_signature;
+
+        name = prop_names[i];
+
+        if (strcmp(name, "_dbus_signatures") == 0) {
+            /* skip the magic "_dbus_signatures" field */
+            goto next;
+        }
+
+        /* see if this prop has a forced signature */
+        value_signature = NULL;
+        if (!seed_value_is_undefined(ctx, prop_signatures)) {
+            SeedValue signature_value;
+
+            signature_value
+              = seed_object_get_property(ctx, prop_signatures, name);
+            if (!seed_value_is_undefined(ctx, signature_value)) {
+                value_signature
+                  = seed_value_to_string(ctx, signature_value, exception);
+                if (value_signature == NULL) {
+                    return FALSE;
+                }
+            }
+        }
+
+        //      if (!gjs_object_require_property
+        //  (ctx, props, "DBus append_dict", name, &propval))
+        // return FALSE;
+        propval = seed_object_get_property(ctx, props, name);
+
+        SEED_NOTE(MODULE, " Adding property %s", name);
+
+        /* seed_js_one_value_to_dbus() would check this also, but would not
+         * print the property name, which is often useful
+         */
+        if (seed_value_is_null(ctx, propval)) {
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "Property '%s' has a null value, can't send over dbus", name);
             return FALSE;
+        }
 
-          dbus_message_iter_close_container (&entry_iter, &variant_iter);
-	}
-      else
-	{
-          if (!seed_js_one_value_to_dbus (ctx, propval, &entry_iter,
-                                          &dict_value_sig_iter, exception))
-            return FALSE;
-	}
+        dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL,
+                                         &entry_iter);
+
+        dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_STRING, &name);
+        g_free(name);
+
+        if (value_signature != NULL) {
+            DBusSignatureIter forced_signature_iter;
+            DBusMessageIter variant_iter;
+
+            g_assert(dbus_signature_iter_get_current_type(&dict_value_sig_iter)
+                     == DBUS_TYPE_VARIANT);
+
+            dbus_message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT,
+                                             value_signature, &variant_iter);
 
-      dbus_message_iter_close_container (&dict_iter, &entry_iter);
+            dbus_signature_iter_init(&forced_signature_iter, value_signature);
+
+            if (!seed_js_one_value_to_dbus(ctx, propval, &variant_iter,
+                                           &forced_signature_iter, exception))
+                return FALSE;
+
+            dbus_message_iter_close_container(&entry_iter, &variant_iter);
+        } else {
+            if (!seed_js_one_value_to_dbus(ctx, propval, &entry_iter,
+                                           &dict_value_sig_iter, exception))
+                return FALSE;
+        }
+
+        dbus_message_iter_close_container(&dict_iter, &entry_iter);
 
     next:
-      continue;
+        continue;
     }
-  g_strfreev (prop_names);
+    g_strfreev(prop_names);
 
-  dbus_message_iter_close_container (iter, &dict_iter);
+    dbus_message_iter_close_container(iter, &dict_iter);
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_js_one_value_to_dbus (SeedContext ctx,
-			   SeedValue value,
-			   DBusMessageIter * iter,
-			   DBusSignatureIter * sig_iter,
-                           SeedException *exception)
+seed_js_one_value_to_dbus(SeedContext ctx,
+                          SeedValue value,
+                          DBusMessageIter* iter,
+                          DBusSignatureIter* sig_iter,
+                          SeedException* exception)
 {
-  SeedType type;
-  int forced_type;
+    SeedType type;
+    int forced_type;
 
-  forced_type = dbus_signature_iter_get_current_type (sig_iter);
+    forced_type = dbus_signature_iter_get_current_type(sig_iter);
 
-  SEED_NOTE(MODULE,
-            "Converting dbus type '%c' from SeedValue",
-            forced_type != DBUS_TYPE_INVALID ? forced_type : '0');
+    SEED_NOTE(MODULE, "Converting dbus type '%c' from SeedValue",
+              forced_type != DBUS_TYPE_INVALID ? forced_type : '0');
 
-  /* Don't write anything on the bus if the signature is empty */
-  if (forced_type == DBUS_TYPE_INVALID)
-    return TRUE;
+    /* Don't write anything on the bus if the signature is empty */
+    if (forced_type == DBUS_TYPE_INVALID)
+        return TRUE;
 
-  type = seed_value_get_type (ctx, value);
+    type = seed_value_get_type(ctx, value);
 
-  if (seed_value_is_null (ctx, value))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "Can't send null values over dbus");
-      return FALSE;
-    }
-  else if (type == SEED_TYPE_STRING)
-    {
-      char *data;
-      gsize len;
-      char buf[3] = { '\0', '\0', '\0' };
-      if (forced_type == DBUS_TYPE_ARRAY)
-	{
-          buf[0] = DBUS_TYPE_ARRAY;
-          buf[1] = dbus_signature_iter_get_element_type (sig_iter);
-	}
-      else
-	{
-          buf[0] = forced_type;
-	}
-
-      data = NULL;
-      len = 0;
-      // FIX?
-      if (buf[1] == DBUS_TYPE_BYTE)
-	{
-          data = seed_value_to_string (ctx, value, exception);
-          len = strlen (data);
-          //	  if (!gjs_string_get_binary_data (ctx, value, &data, &len))
-          //return FALSE;
-	}
-      else
-	{
-          data = seed_value_to_string (ctx, value, exception);
-          len = strlen (data);
-	}
-
-      if (!append_string (ctx, iter, buf, data, len, exception))
-	{
-          g_free (data);
-          return FALSE;
-	}
-
-      g_free (data);
-    }
-  /*  else if (type == SEED_TYPE_NUMBER)
-      {
-      dbus_int32_t v_INT32;
-      v_INT32 = seed_value_to_int (ctx, value, exception);
-
-      if (!append_int32 (ctx, iter, forced_type, v_INT32, exception))
-      return FALSE;
-      }*/
-  else if (type == SEED_TYPE_NUMBER)
-    {
-      double v_DOUBLE;
-      v_DOUBLE = seed_value_to_double (ctx, value, exception);
-
-      if (!append_double (ctx, iter, forced_type, v_DOUBLE, exception))
+    if (seed_value_is_null(ctx, value)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Can't send null values over dbus");
         return FALSE;
+    } else if (type == SEED_TYPE_STRING) {
+        char* data;
+        gsize len;
+        char buf[3] = { '\0', '\0', '\0' };
+        if (forced_type == DBUS_TYPE_ARRAY) {
+            buf[0] = DBUS_TYPE_ARRAY;
+            buf[1] = dbus_signature_iter_get_element_type(sig_iter);
+        } else {
+            buf[0] = forced_type;
+        }
+
+        data = NULL;
+        len = 0;
+        // FIX?
+        if (buf[1] == DBUS_TYPE_BYTE) {
+            data = seed_value_to_string(ctx, value, exception);
+            len = strlen(data);
+            //	  if (!gjs_string_get_binary_data (ctx, value, &data, &len))
+            // return FALSE;
+        } else {
+            data = seed_value_to_string(ctx, value, exception);
+            len = strlen(data);
+        }
+
+        if (!append_string(ctx, iter, buf, data, len, exception)) {
+            g_free(data);
+            return FALSE;
+        }
+
+        g_free(data);
     }
-  else if (type == SEED_TYPE_BOOLEAN)
-    {
-      dbus_bool_t v_BOOLEAN;
-      v_BOOLEAN = seed_value_to_boolean (ctx, value, exception);
+    /*  else if (type == SEED_TYPE_NUMBER)
+        {
+        dbus_int32_t v_INT32;
+        v_INT32 = seed_value_to_int (ctx, value, exception);
 
-      if (!append_boolean (ctx, iter, forced_type, v_BOOLEAN, exception))
+        if (!append_int32 (ctx, iter, forced_type, v_INT32, exception))
         return FALSE;
-    }
-  else if (type == SEED_TYPE_OBJECT)
-    {
-      SeedValue lengthval;
+        }*/
+    else if (type == SEED_TYPE_NUMBER) {
+        double v_DOUBLE;
+        v_DOUBLE = seed_value_to_double(ctx, value, exception);
 
-      /* see if there's a length property */
-      lengthval = seed_object_get_property (ctx, value, "length");
+        if (!append_double(ctx, iter, forced_type, v_DOUBLE, exception))
+            return FALSE;
+    } else if (type == SEED_TYPE_BOOLEAN) {
+        dbus_bool_t v_BOOLEAN;
+        v_BOOLEAN = seed_value_to_boolean(ctx, value, exception);
 
-      if (seed_value_get_type (ctx, lengthval) == SEED_TYPE_NUMBER)
-	{
-          guint length;
+        if (!append_boolean(ctx, iter, forced_type, v_BOOLEAN, exception))
+            return FALSE;
+    } else if (type == SEED_TYPE_OBJECT) {
+        SeedValue lengthval;
 
-          length = seed_value_to_int (ctx, lengthval, exception);
+        /* see if there's a length property */
+        lengthval = seed_object_get_property(ctx, value, "length");
 
-          SEED_NOTE(MODULE,
-                    "Looks like an array length %u", length);
-          if (!append_array (ctx, iter, sig_iter, value, length, exception))
-            return FALSE;
-	}
-      else
-	{
-          SEED_NOTE(MODULE, "Looks like a dictionary");
-          if (!append_dict (ctx, iter, sig_iter, value, exception))
-            return FALSE;
-	}
-    }
-  else if (type == SEED_TYPE_UNDEFINED)
-    {
-      SEED_NOTE (MODULE,
-                 "Can't send void (undefined) values over dbus");
-      seed_make_exception (ctx, exception, "ArgumentError", "Can't send void (undefined) values over dbus");
-      return FALSE;
-    }
-  else
-    {
-      SEED_NOTE (MODULE,
-                 "Don't know how to convert this jsval to dbus type");
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "Don't know how to convert this jsval to dbus type");
-      return FALSE;
+        if (seed_value_get_type(ctx, lengthval) == SEED_TYPE_NUMBER) {
+            guint length;
+
+            length = seed_value_to_int(ctx, lengthval, exception);
+
+            SEED_NOTE(MODULE, "Looks like an array length %u", length);
+            if (!append_array(ctx, iter, sig_iter, value, length, exception))
+                return FALSE;
+        } else {
+            SEED_NOTE(MODULE, "Looks like a dictionary");
+            if (!append_dict(ctx, iter, sig_iter, value, exception))
+                return FALSE;
+        }
+    } else if (type == SEED_TYPE_UNDEFINED) {
+        SEED_NOTE(MODULE, "Can't send void (undefined) values over dbus");
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Can't send void (undefined) values over dbus");
+        return FALSE;
+    } else {
+        SEED_NOTE(MODULE, "Don't know how to convert this jsval to dbus type");
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Don't know how to convert this jsval to dbus type");
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 gboolean
-seed_js_values_to_dbus (SeedContext ctx,
-			int index,
-			SeedObject values,
-			DBusMessageIter * iter,
-                        DBusSignatureIter * sig_iter,
-                        SeedException *exception)
+seed_js_values_to_dbus(SeedContext ctx,
+                       int index,
+                       SeedObject values,
+                       DBusMessageIter* iter,
+                       DBusSignatureIter* sig_iter,
+                       SeedException* exception)
 {
-  SeedValue value;
-  guint length;
-
-  length = seed_value_to_int (ctx,
-                              seed_object_get_property (ctx, values, "length"),
-                              exception);
-  if (index > (int) length)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-                           "Index %d is bigger than array length %d", index,
-                           length);
-      return FALSE;
+    SeedValue value;
+    guint length;
+
+    length
+      = seed_value_to_int(ctx, seed_object_get_property(ctx, values, "length"),
+                          exception);
+    if (index > (int) length) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Index %d is bigger than array length %d", index,
+                            length);
+        return FALSE;
     }
 
-  if (index == (int) length)
-    return TRUE;
+    if (index == (int) length)
+        return TRUE;
 
-  value = seed_object_get_property_at_index (ctx, values, index, exception);
+    value = seed_object_get_property_at_index(ctx, values, index, exception);
 
-  if (!seed_js_one_value_to_dbus (ctx, value, iter, sig_iter, exception))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "Error marshalling js value to dbus");
-      return FALSE;
+    if (!seed_js_one_value_to_dbus(ctx, value, iter, sig_iter, exception)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Error marshalling js value to dbus");
+        return FALSE;
     }
 
-  if (dbus_signature_iter_next (sig_iter))
-    {
-      return seed_js_values_to_dbus (ctx, index + 1, values, iter,
-                                     sig_iter, exception);
+    if (dbus_signature_iter_next(sig_iter)) {
+        return seed_js_values_to_dbus(ctx, index + 1, values, iter, sig_iter,
+                                      exception);
     }
 
-  return TRUE;
+    return TRUE;
 }
 
 /* If jsval is an object, add properties from the DBusMessage such as the
  * sender. If jsval is not an object, do nothing.
  */
 gboolean
-seed_js_add_dbus_props (SeedContext ctx, DBusMessage * message, SeedValue value,
-                        SeedException *exception)
+seed_js_add_dbus_props(SeedContext ctx,
+                       DBusMessage* message,
+                       SeedValue value,
+                       SeedException* exception)
 {
-  gchar *sender;
+    gchar* sender;
 
-  if (seed_value_is_null (ctx, value) || !seed_value_is_object (ctx, value))
-    return TRUE;
+    if (seed_value_is_null(ctx, value) || !seed_value_is_object(ctx, value))
+        return TRUE;
 
-  sender = (gchar *)dbus_message_get_sender (message);
+    sender = (gchar*) dbus_message_get_sender(message);
 
-  seed_object_set_property (ctx, value, "_dbus_sender",
-                            seed_value_from_string (ctx, sender, exception));
+    seed_object_set_property(ctx, value, "_dbus_sender",
+                             seed_value_from_string(ctx, sender, exception));
 
-  return TRUE;
+    return TRUE;
 }
diff --git a/modules/dbus/dbus-values.h b/modules/dbus/dbus-values.h
index 2aa948f..4b94aac 100644
--- a/modules/dbus/dbus-values.h
+++ b/modules/dbus/dbus-values.h
@@ -12,31 +12,30 @@ G_BEGIN_DECLS
 
 extern SeedContextGroup group;
 
-gboolean seed_js_values_from_dbus    (SeedContext          ctx,
-                                      DBusMessageIter    *iter,
-                                      GArray **aray_p,
-                                      SeedException *exception);
-gboolean seed_js_one_value_from_dbus (SeedContext          ctx,
-                                      DBusMessageIter    *iter,
-                                      SeedValue              *value_p,
-                                      SeedException *exception);
-gboolean seed_js_values_to_dbus      (SeedContext          ctx,
-                                      int                 index,
-                                      SeedObject               values,
-                                      DBusMessageIter    *iter,
-                                      DBusSignatureIter  *sig_iter,
-                                      SeedException *exception);
-gboolean seed_js_one_value_to_dbus   (SeedContext          ctx,
-                                      SeedValue               value,
-                                      DBusMessageIter    *iter,
-                                      DBusSignatureIter  *sig_iter,
-                                      SeedException *exception);
-gboolean seed_js_add_dbus_props      (SeedContext          ctx,
-                                      DBusMessage        *message,
-                                      SeedValue               value,
-                                      SeedException *exception);
-
+gboolean seed_js_values_from_dbus(SeedContext ctx,
+                                  DBusMessageIter* iter,
+                                  GArray** aray_p,
+                                  SeedException* exception);
+gboolean seed_js_one_value_from_dbus(SeedContext ctx,
+                                     DBusMessageIter* iter,
+                                     SeedValue* value_p,
+                                     SeedException* exception);
+gboolean seed_js_values_to_dbus(SeedContext ctx,
+                                int index,
+                                SeedObject values,
+                                DBusMessageIter* iter,
+                                DBusSignatureIter* sig_iter,
+                                SeedException* exception);
+gboolean seed_js_one_value_to_dbus(SeedContext ctx,
+                                   SeedValue value,
+                                   DBusMessageIter* iter,
+                                   DBusSignatureIter* sig_iter,
+                                   SeedException* exception);
+gboolean seed_js_add_dbus_props(SeedContext ctx,
+                                DBusMessage* message,
+                                SeedValue value,
+                                SeedException* exception);
 
 G_END_DECLS
 
-#endif  /* __SEED_JS_DBUS_VALUES_H__ */
+#endif /* __SEED_JS_DBUS_VALUES_H__ */
diff --git a/modules/dbus/module.c b/modules/dbus/module.c
index b43e111..30e8daf 100644
--- a/modules/dbus/module.c
+++ b/modules/dbus/module.c
@@ -24,7 +24,8 @@
 #include "dbus-values.h"
 #include "dbus-exports.h"
 
-#define DBUS_CONNECTION_FROM_TYPE(type) ((type) == DBUS_BUS_SESSION ? session_bus : system_bus)
+#define DBUS_CONNECTION_FROM_TYPE(type)                                        \
+    ((type) == DBUS_BUS_SESSION ? session_bus : system_bus)
 
 SeedContext ctx;
 SeedContextGroup group;
@@ -34,793 +35,765 @@ SeedClass dbus_namespace_class;
 SeedClass dbus_bus_class;
 
 static gboolean session_bus_weakref_added = FALSE;
-static DBusConnection *session_bus = NULL;
+static DBusConnection* session_bus = NULL;
 static gboolean system_bus_weakref_added = FALSE;
-static DBusConnection *system_bus = NULL;
+static DBusConnection* system_bus = NULL;
 
 SeedObject bus_proto;
 
 static DBusBusType
-get_bus_type_from_object (SeedContext ctx,
-			  SeedObject object, SeedException * exception)
+get_bus_type_from_object(SeedContext ctx,
+                         SeedObject object,
+                         SeedException* exception)
 {
-  SeedValue jsbus_type =
-    seed_object_get_property (ctx, object, "_dbusBusType");
+    SeedValue jsbus_type
+      = seed_object_get_property(ctx, object, "_dbusBusType");
 
-  return seed_value_to_int (ctx, jsbus_type, exception);
+    return seed_value_to_int(ctx, jsbus_type, exception);
 }
 
 static gboolean
-bus_check (SeedContext ctx, DBusBusType bus_type, SeedException * exception)
+bus_check(SeedContext ctx, DBusBusType bus_type, SeedException* exception)
 {
-  gboolean bus_weakref_added;
-  DBusConnection **bus_connection;
+    gboolean bus_weakref_added;
+    DBusConnection** bus_connection;
 
-  bus_weakref_added =
-    bus_type ==
-    DBUS_BUS_SESSION ? session_bus_weakref_added : system_bus_weakref_added;
+    bus_weakref_added = bus_type == DBUS_BUS_SESSION ? session_bus_weakref_added
+                                                     : system_bus_weakref_added;
 
-  bus_connection = bus_type == DBUS_BUS_SESSION ? &session_bus : &system_bus;
+    bus_connection = bus_type == DBUS_BUS_SESSION ? &session_bus : &system_bus;
 
-  /* This is all done lazily only if a dbus-related method is actually invoked */
+    /* This is all done lazily only if a dbus-related method is actually invoked
+     */
 
-  if (!bus_weakref_added)
-    {
-      big_dbus_add_bus_weakref (bus_type, bus_connection);
+    if (!bus_weakref_added) {
+        big_dbus_add_bus_weakref(bus_type, bus_connection);
     }
 
-  if (*bus_connection == NULL)
-    big_dbus_try_connecting_now (bus_type);	/* force a synchronous connection attempt */
-
-  /* Throw exception if connection attempt failed */
-  if (*bus_connection == NULL)
-    {
-      const char *bus_type_name =
-	bus_type == DBUS_BUS_SESSION ? "session" : "system";
-      seed_make_exception (ctx, exception, "BusError",
-			   "Not connected to %s message bus", bus_type_name);
-      return FALSE;
+    if (*bus_connection == NULL)
+        big_dbus_try_connecting_now(
+          bus_type); /* force a synchronous connection attempt */
+
+    /* Throw exception if connection attempt failed */
+    if (*bus_connection == NULL) {
+        const char* bus_type_name
+          = bus_type == DBUS_BUS_SESSION ? "session" : "system";
+        seed_make_exception(ctx, exception, "BusError",
+                            "Not connected to %s message bus", bus_type_name);
+        return FALSE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-static DBusMessage *
-prepare_call (SeedContext ctx,
-	      SeedObject obj,
-	      SeedObject arg_array,
-	      guint argc,
-	      const SeedValue * argv,
-	      DBusBusType bus_type,
-	      SeedException * exception)
+static DBusMessage*
+prepare_call(SeedContext ctx,
+             SeedObject obj,
+             SeedObject arg_array,
+             guint argc,
+             const SeedValue* argv,
+             DBusBusType bus_type,
+             SeedException* exception)
 {
-  DBusMessage *message;
-  const char *bus_name;
-  const char *path;
-  const char *interface;
-  const char *method;
-  gboolean auto_start;
-  const char *out_signature;
-  const char *in_signature;
-  DBusMessageIter arg_iter;
-  DBusSignatureIter sig_iter;
-
-  if (!bus_check (ctx, bus_type, exception))
-    return NULL;
-
-  bus_name = seed_value_to_string (ctx, argv[0], exception);
-  if (bus_name == NULL)
-    return NULL;
-
-  path = seed_value_to_string (ctx, argv[1], exception);
-  if (path == NULL)
-    return NULL;
-
-  if (seed_value_is_null (ctx, argv[2]))
-    {
-      interface = NULL;
-    }
-  else
-    {
-      interface = seed_value_to_string (ctx, argv[2], exception);
-      if (interface == NULL)
-	return NULL;		/* exception was set */
+    DBusMessage* message;
+    const char* bus_name;
+    const char* path;
+    const char* interface;
+    const char* method;
+    gboolean auto_start;
+    const char* out_signature;
+    const char* in_signature;
+    DBusMessageIter arg_iter;
+    DBusSignatureIter sig_iter;
+
+    if (!bus_check(ctx, bus_type, exception))
+        return NULL;
+
+    bus_name = seed_value_to_string(ctx, argv[0], exception);
+    if (bus_name == NULL)
+        return NULL;
+
+    path = seed_value_to_string(ctx, argv[1], exception);
+    if (path == NULL)
+        return NULL;
+
+    if (seed_value_is_null(ctx, argv[2])) {
+        interface = NULL;
+    } else {
+        interface = seed_value_to_string(ctx, argv[2], exception);
+        if (interface == NULL)
+            return NULL; /* exception was set */
     }
 
-  method = seed_value_to_string (ctx, argv[3], exception);
-  if (method == NULL)
-    return NULL;
+    method = seed_value_to_string(ctx, argv[3], exception);
+    if (method == NULL)
+        return NULL;
 
-  out_signature = seed_value_to_string (ctx, argv[4], exception);
-  if (out_signature == NULL)
-    return NULL;
+    out_signature = seed_value_to_string(ctx, argv[4], exception);
+    if (out_signature == NULL)
+        return NULL;
 
-  in_signature = seed_value_to_string (ctx, argv[5], exception);
-  if (in_signature == NULL)
-    return NULL;
+    in_signature = seed_value_to_string(ctx, argv[5], exception);
+    if (in_signature == NULL)
+        return NULL;
 
-  g_assert (bus_name && path && method && in_signature && out_signature);
+    g_assert(bus_name && path && method && in_signature && out_signature);
 
-  auto_start = seed_value_to_boolean (ctx, argv[6], exception);
+    auto_start = seed_value_to_boolean(ctx, argv[6], exception);
 
-  /* FIXME should validate the bus_name, path, interface, method really, but
-   * we should just not write buggy JS ;-)
-   */
-  message = dbus_message_new_method_call (bus_name, path, interface, method);
-  if (message == NULL)
-    {
-      seed_make_exception (ctx, exception, "DBusError",
-			   "Could not create new method call. (OOM?)");
-      return NULL;
+    /* FIXME should validate the bus_name, path, interface, method really, but
+     * we should just not write buggy JS ;-)
+     */
+    message = dbus_message_new_method_call(bus_name, path, interface, method);
+    if (message == NULL) {
+        seed_make_exception(ctx, exception, "DBusError",
+                            "Could not create new method call. (OOM?)");
+        return NULL;
     }
 
-  dbus_message_set_auto_start (message, auto_start);
+    dbus_message_set_auto_start(message, auto_start);
 
-  dbus_message_iter_init_append (message, &arg_iter);
+    dbus_message_iter_init_append(message, &arg_iter);
 
-  if (in_signature)
-    dbus_signature_iter_init (&sig_iter, in_signature);
-  else
-    dbus_signature_iter_init (&sig_iter, "a{sv}");
+    if (in_signature)
+        dbus_signature_iter_init(&sig_iter, in_signature);
+    else
+        dbus_signature_iter_init(&sig_iter, "a{sv}");
 
-  if (!seed_js_values_to_dbus
-      (ctx, 0, arg_array, &arg_iter, &sig_iter, exception))
-    {
-      SEED_NOTE(MODULE, "Failed to marshal call from JS to dbus");
-      dbus_message_unref (message);
-      return NULL;
+    if (!seed_js_values_to_dbus(ctx, 0, arg_array, &arg_iter, &sig_iter,
+                                exception)) {
+        SEED_NOTE(MODULE, "Failed to marshal call from JS to dbus");
+        dbus_message_unref(message);
+        return NULL;
     }
 
-  return message;
+    return message;
 }
 
 static gboolean
-complete_call (SeedContext ctx,
-	       SeedValue * retval,
-	       DBusMessage * reply,
-	       DBusError * derror, SeedException * exception)
+complete_call(SeedContext ctx,
+              SeedValue* retval,
+              DBusMessage* reply,
+              DBusError* derror,
+              SeedException* exception)
 {
-  DBusMessageIter arg_iter;
-  GArray *ret_values;
-  int array_length;
-
-  if (dbus_error_is_set (derror))
-    {
-      SEED_NOTE(MODULE,
-                "Error sending call: %s: %s",
-                derror->name, derror->message);
-      seed_make_exception (ctx, exception, "DBusError",
-			   "DBus error: %s: %s",
-			   derror->name, derror->message);
-      dbus_error_free (derror);
-      return FALSE;
-    }
-
-  if (reply == NULL)
-    {
-      SEED_NOTE(MODULE,
-		"No reply received to call");
-      return FALSE;
+    DBusMessageIter arg_iter;
+    GArray* ret_values;
+    int array_length;
+
+    if (dbus_error_is_set(derror)) {
+        SEED_NOTE(MODULE, "Error sending call: %s: %s", derror->name,
+                  derror->message);
+        seed_make_exception(ctx, exception, "DBusError", "DBus error: %s: %s",
+                            derror->name, derror->message);
+        dbus_error_free(derror);
+        return FALSE;
     }
 
-  if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
-    {
-      dbus_set_error_from_message (derror, reply);
-      seed_make_exception (ctx, exception, "DBusError",
-			   "DBus error: %s: %s",
-			   derror->name, derror->message);
-      SEED_NOTE(MODULE, "DBus error: %s: %s",
-			   derror->name, derror->message);
-      dbus_error_free (derror);
-
-      return FALSE;
+    if (reply == NULL) {
+        SEED_NOTE(MODULE, "No reply received to call");
+        return FALSE;
     }
 
-  dbus_message_iter_init (reply, &arg_iter);
+    if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
+        dbus_set_error_from_message(derror, reply);
+        seed_make_exception(ctx, exception, "DBusError", "DBus error: %s: %s",
+                            derror->name, derror->message);
+        SEED_NOTE(MODULE, "DBus error: %s: %s", derror->name, derror->message);
+        dbus_error_free(derror);
 
-  if (!seed_js_values_from_dbus (ctx, &arg_iter, &ret_values, exception))
-    {
-      SEED_NOTE(MODULE, "Failed to marshal dbus call reply back to JS");
-      return FALSE;
+        return FALSE;
     }
 
-  g_assert (ret_values != NULL);
-  // TODO: I AM HERE
+    dbus_message_iter_init(reply, &arg_iter);
 
-  array_length = ret_values->len;
-  if (array_length == 1)
-    {
-      /* If the array only has one element return that element alone */
-      *retval = g_array_index (ret_values, SeedValue, 0);
+    if (!seed_js_values_from_dbus(ctx, &arg_iter, &ret_values, exception)) {
+        SEED_NOTE(MODULE, "Failed to marshal dbus call reply back to JS");
+        return FALSE;
     }
-  else
-    {
-      /* Otherwise return an array with all the return values. The
-       * funny assignment is to avoid creating a temporary JSObject
-       * we'd need to root
-       */
-      *retval =
-	seed_make_array (ctx, ret_values->data, array_length, exception);
+
+    g_assert(ret_values != NULL);
+    // TODO: I AM HERE
+
+    array_length = ret_values->len;
+    if (array_length == 1) {
+        /* If the array only has one element return that element alone */
+        *retval = g_array_index(ret_values, SeedValue, 0);
+    } else {
+        /* Otherwise return an array with all the return values. The
+         * funny assignment is to avoid creating a temporary JSObject
+         * we'd need to root
+         */
+        *retval
+          = seed_make_array(ctx, ret_values->data, array_length, exception);
     }
 
-  g_array_free (ret_values, TRUE);
+    g_array_free(ret_values, TRUE);
 
-  seed_js_add_dbus_props (ctx, reply, *retval, exception);
+    seed_js_add_dbus_props(ctx, reply, *retval, exception);
 
-  return TRUE;
+    return TRUE;
 }
 
 static void
-pending_notify (DBusPendingCall * pending, void *user_data)
+pending_notify(DBusPendingCall* pending, void* user_data)
 {
-  SeedException exception = NULL;
-  GClosure *closure;
-  SeedValue argv[2];
-  DBusMessage *reply;
-  DBusError derror;
+    SeedException exception = NULL;
+    GClosure* closure;
+    SeedValue argv[2];
+    DBusMessage* reply;
+    DBusError derror;
 
-  closure = user_data;
+    closure = user_data;
 
-  SEED_NOTE(MODULE,
-              "Notified of reply to async call closure %p",
-	    closure);
+    SEED_NOTE(MODULE, "Notified of reply to async call closure %p", closure);
 
-   if (closure == NULL) {
+    if (closure == NULL) {
         SEED_NOTE(MODULE,
-            "Closure destroyed before we could complete pending call");
-         return;
+                  "Closure destroyed before we could complete pending call");
+        return;
     }
 
-  /* reply may be NULL if none received? I think it may never be if
-   * we've already been notified, but be safe here.
-   */
+    /* reply may be NULL if none received? I think it may never be if
+     * we've already been notified, but be safe here.
+     */
 
-  
-  reply = dbus_pending_call_steal_reply (pending);
+    reply = dbus_pending_call_steal_reply(pending);
 
-  dbus_error_init (&derror);
-  /* argv[0] will be the return value if any, argv[1] we fill with exception if any */
-  argv[0] = seed_make_null (ctx);
-  argv[1] = seed_make_null (ctx);
-  if (!complete_call (ctx, &argv[0], reply, &derror, &exception))
-	goto noreply;
-  g_assert (!dbus_error_is_set (&derror));	/* not supposed to be left set by complete_call() */
+    dbus_error_init(&derror);
+    /* argv[0] will be the return value if any, argv[1] we fill with exception
+     * if any */
+    argv[0] = seed_make_null(ctx);
+    argv[1] = seed_make_null(ctx);
+    if (!complete_call(ctx, &argv[0], reply, &derror, &exception))
+        goto noreply;
+    g_assert(!dbus_error_is_set(
+      &derror)); /* not supposed to be left set by complete_call() */
 
-  if (reply)
-    dbus_message_unref (reply);
+    if (reply)
+        dbus_message_unref(reply);
 
-  if (exception)
-	  argv[1] = exception;
-  seed_closure_invoke(closure, &argv[0], 2, &exception);
-  if (exception && seed_value_is_object (ctx, exception))
-    seed_closure_warn_exception(closure, ctx, exception);
-  seed_context_unref (ctx);
-  // TODO: Do something with exception
+    if (exception)
+        argv[1] = exception;
+    seed_closure_invoke(closure, &argv[0], 2, &exception);
+    if (exception && seed_value_is_object(ctx, exception))
+        seed_closure_warn_exception(closure, ctx, exception);
+    seed_context_unref(ctx);
+    // TODO: Do something with exception
 
-  return;
+    return;
 
 noreply:
-    SEED_NOTE(MODULE,
-            "No reply recieved from complete_call");
-  if (reply)
-    dbus_message_unref (reply);
-  seed_context_unref (ctx);
+    SEED_NOTE(MODULE, "No reply recieved from complete_call");
+    if (reply)
+        dbus_message_unref(reply);
+    seed_context_unref(ctx);
 }
 
 static void
-pending_free_closure (void *data)
+pending_free_closure(void* data)
 {
-  GClosure *closure;
-
-  closure = data;
+    GClosure* closure = data;
 
-  g_closure_invalidate (data);
-  g_closure_unref (data);
+    g_closure_invalidate(closure);
+    g_closure_unref(closure);
 }
 
-
 static SeedValue
-seed_js_dbus_call_async (SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 size_t argument_count,
-			 const SeedValue arguments[],
-			 SeedException * exception)
+seed_js_dbus_call_async(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        size_t argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-  GClosure *closure;
-  DBusMessage *message;
-  DBusPendingCall *pending;
-  DBusConnection *bus_connection;
-  DBusBusType bus_type;
-  int timeout;
-
-  if (argument_count < 10)
-    {
-      seed_make_exception (ctx, exception, "ArgmuentError",
-			   "Not enough args, need bus name, object path, interface, method, out signature, in signature, autostart flag, timeout limit, args, and callback");
-      return seed_make_null (ctx);
+    GClosure* closure;
+    DBusMessage* message;
+    DBusPendingCall* pending;
+    DBusConnection* bus_connection;
+    DBusBusType bus_type;
+    int timeout;
+
+    if (argument_count < 10) {
+        seed_make_exception(ctx, exception, "ArgmuentError",
+                            "Not enough args, need bus name, "
+                            "object path, interface, method, "
+                            "out signature, in signature, "
+                            "autostart flag, timeout limit, "
+                            "args, and callback");
+        return seed_make_null(ctx);
     }
 
-  if (!seed_value_is_object (ctx, arguments[9])
-      || !seed_value_is_function (ctx, arguments[9]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "arg 10 must be a callback to invoke when call completes");
-      return FALSE;
+    if (!seed_value_is_object(ctx, arguments[9])
+        || !seed_value_is_function(ctx, arguments[9])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "arg 10 must be a callback to invoke when call completes");
+        return FALSE;
     }
 
-  timeout = seed_value_to_int (ctx, arguments[7], exception);
+    timeout = seed_value_to_int(ctx, arguments[7], exception);
 
-  bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-  message =
-	  prepare_call (ctx, this_object, arguments[8], argument_count, arguments, bus_type,
-		  exception);
+    message = prepare_call(ctx, this_object, arguments[8], argument_count,
+                           arguments, bus_type, exception);
 
-  if (message == NULL)
-    return seed_make_null (ctx);
+    if (message == NULL)
+        return seed_make_null(ctx);
 
-  bus_connection = DBUS_CONNECTION_FROM_TYPE (bus_type);
+    bus_connection = DBUS_CONNECTION_FROM_TYPE(bus_type);
 
-  pending = NULL;
-  if (!dbus_connection_send_with_reply
-      (bus_connection, message, &pending, timeout) || pending == NULL)
-    {
-      SEED_NOTE(MODULE, "Failed to send async dbus message");
-      seed_make_exception (ctx, exception, "DBusError",
-			   "Failed to send dbus message");
-      dbus_message_unref (message);
-      return seed_make_null (ctx);
+    pending = NULL;
+    if (!dbus_connection_send_with_reply(bus_connection, message, &pending,
+                                         timeout)
+        || pending == NULL) {
+        SEED_NOTE(MODULE, "Failed to send async dbus message");
+        seed_make_exception(ctx, exception, "DBusError",
+                            "Failed to send dbus message");
+        dbus_message_unref(message);
+        return seed_make_null(ctx);
     }
 
-  g_assert (pending != NULL);
+    g_assert(pending != NULL);
 
-  dbus_message_unref (message);
+    dbus_message_unref(message);
 
-  /* We cheat a bit here and use a closure to store a JavaScript function
-   * and deal with the GC root and other issues, even though we
-   * won't ever marshal via GValue
-   */
-  closure = seed_closure_new (ctx, arguments[9], NULL, "async DBus reply");
-  if (closure == NULL)
-    {
-      dbus_pending_call_unref (pending);
-      return seed_make_null (ctx);
+    /* We cheat a bit here and use a closure to store a JavaScript function
+     * and deal with the GC root and other issues, even though we
+     * won't ever marshal via GValue
+     */
+    closure = seed_closure_new(ctx, arguments[9], NULL, "async DBus reply");
+    if (closure == NULL) {
+        dbus_pending_call_unref(pending);
+        return seed_make_null(ctx);
     }
 
-  g_closure_ref (closure);
-  g_closure_sink (closure);
-  dbus_pending_call_set_notify (pending, pending_notify, closure,
-				pending_free_closure);
+    g_closure_ref(closure);
+    g_closure_sink(closure);
+    dbus_pending_call_set_notify(pending, pending_notify, closure,
+                                 pending_free_closure);
 
-  dbus_pending_call_unref (pending);	/* DBusConnection should still hold a ref until it's completed */
+    dbus_pending_call_unref(
+      pending); /* DBusConnection should still hold a ref until it's completed
+                   */
 
-  return seed_value_from_boolean (ctx, TRUE, exception);
+    return seed_value_from_boolean(ctx, TRUE, exception);
 }
 
-
-
 static SeedValue
-seed_js_dbus_get_machine_id (SeedContext ctx,
-			     SeedObject object,
-			     SeedString property_name,
-			     SeedException * exception)
+seed_js_dbus_get_machine_id(SeedContext ctx,
+                            SeedObject object,
+                            SeedString property_name,
+                            SeedException* exception)
 {
-  SeedValue ret;
-  gchar *id;
+    SeedValue ret;
+    gchar* id;
 
-  id = dbus_get_local_machine_id ();
-  ret = seed_value_from_string (ctx, id, exception);
-  dbus_free (id);
+    id = dbus_get_local_machine_id();
+    ret = seed_value_from_string(ctx, id, exception);
+    dbus_free(id);
 
-  return ret;
+    return ret;
 }
 
 static void
-fill_with_null_or_string (SeedContext ctx, const char **string_p,
-			  SeedValue value, SeedException * exception)
+fill_with_null_or_string(SeedContext ctx,
+                         const char** string_p,
+                         SeedValue value,
+                         SeedException* exception)
 {
-  if (seed_value_is_null (ctx, value))
-    *string_p = NULL;
-  else
-    *string_p = seed_value_to_string (ctx, value, exception);
+    if (seed_value_is_null(ctx, value))
+        *string_p = NULL;
+    else
+        *string_p = seed_value_to_string(ctx, value, exception);
 }
 
 typedef struct
 {
-  int refcount;
-  DBusBusType bus_type;
-  int connection_id;
-  GClosure *closure;
+    int refcount;
+    DBusBusType bus_type;
+    int connection_id;
+    GClosure* closure;
 } SignalHandler;
 /* allow removal by passing in the callable
  * FIXME don't think we ever end up using this,
  * could get rid of it, it predates having an ID
  * to remove by
  */
-static GHashTable *signal_handlers_by_callable = NULL;
+static GHashTable* signal_handlers_by_callable = NULL;
 
-static void signal_on_closure_invalidated (void *data, GClosure * closure);
-static void signal_handler_ref (SignalHandler * handler);
-static void signal_handler_unref (SignalHandler * handler);
+static void signal_on_closure_invalidated(void* data, GClosure* closure);
+static void signal_handler_ref(SignalHandler* handler);
+static void signal_handler_unref(SignalHandler* handler);
 
-static SignalHandler *
-signal_handler_new (SeedContext ctx,
-		    SeedValue callable, SeedException * exception)
+static SignalHandler*
+signal_handler_new(SeedContext ctx,
+                   SeedValue callable,
+                   SeedException* exception)
 {
-  SignalHandler *handler;
-
-  if (signal_handlers_by_callable &&
-      g_hash_table_lookup (signal_handlers_by_callable, callable) != NULL)
-    {
-      /* To fix this, get rid of signal_handlers_by_callable
-       * and just require removal by id. Not sure we ever use
-       * removal by callable anyway.
-       */
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "For now, same callback cannot be the handler for two dbus signal connections");
-      return NULL;
+    SignalHandler* handler;
+
+    if (signal_handlers_by_callable
+        && g_hash_table_lookup(signal_handlers_by_callable, callable) != NULL) {
+        /* To fix this, get rid of signal_handlers_by_callable
+         * and just require removal by id. Not sure we ever use
+         * removal by callable anyway.
+         */
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "For now, same callback cannot be "
+                            "the handler for two dbus signal "
+                            "connections");
+        return NULL;
     }
 
-  handler = g_slice_new0 (SignalHandler);
-  handler->refcount = 1;
-
-  /* We cheat a bit here and use a closure to store a JavaScript function
-   * and deal with the GC root and other issues, even though we
-   * won't ever marshal via GValue
-   */
-  handler->closure = seed_closure_new (ctx, callable, NULL, "DBus signal handler");
-  if (handler->closure == NULL)
-    {
-      g_free (handler);
-      return NULL;
+    handler = g_slice_new0(SignalHandler);
+    handler->refcount = 1;
+
+    /* We cheat a bit here and use a closure to store a JavaScript function
+     * and deal with the GC root and other issues, even though we
+     * won't ever marshal via GValue
+     */
+    handler->closure
+      = seed_closure_new(ctx, callable, NULL, "DBus signal handler");
+    if (handler->closure == NULL) {
+        g_free(handler);
+        return NULL;
     }
 
-  g_closure_ref (handler->closure);
-  g_closure_sink (handler->closure);
+    g_closure_ref(handler->closure);
+    g_closure_sink(handler->closure);
 
-  g_closure_add_invalidate_notifier (handler->closure, handler,
-				     signal_on_closure_invalidated);
+    g_closure_add_invalidate_notifier(handler->closure, handler,
+                                      signal_on_closure_invalidated);
 
-  if (!signal_handlers_by_callable)
-    {
-      signal_handlers_by_callable =
-	g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
+    if (!signal_handlers_by_callable) {
+        signal_handlers_by_callable
+          = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, NULL);
     }
 
-  /* We keep a weak reference on the closure in a table indexed
-   * by the object, so we can retrieve it when removing the signal
-   * watch. The signal_handlers_by_callable owns one ref to the SignalHandler.
-   */
-  signal_handler_ref (handler);
-  g_hash_table_replace (signal_handlers_by_callable, callable, handler);
+    /* We keep a weak reference on the closure in a table indexed
+     * by the object, so we can retrieve it when removing the signal
+     * watch. The signal_handlers_by_callable owns one ref to the SignalHandler.
+     */
+    signal_handler_ref(handler);
+    g_hash_table_replace(signal_handlers_by_callable, callable, handler);
 
-  return handler;
+    return handler;
 }
 
 static void
-signal_handler_ref (SignalHandler * handler)
+signal_handler_ref(SignalHandler* handler)
 {
-  g_assert (handler->refcount > 0);
-  handler->refcount += 1;
+    g_assert(handler->refcount > 0);
+    handler->refcount += 1;
 }
 
 static void
-signal_handler_dispose (SignalHandler * handler)
+signal_handler_dispose(SignalHandler* handler)
 {
-  g_assert (handler->refcount > 0);
-
-  signal_handler_ref (handler);
-
-  if (handler->closure)
-    {
-      /* invalidating closure could dispose
-       * re-entrantly, so set handler->closure
-       * NULL before we invalidate
-       */
-      GClosure *closure = handler->closure;
-      handler->closure = NULL;
-
-      g_hash_table_remove (signal_handlers_by_callable,
-			   seed_closure_get_callable (closure));
-      if (g_hash_table_size (signal_handlers_by_callable) == 0)
-	{
-	  g_hash_table_destroy (signal_handlers_by_callable);
-	  signal_handlers_by_callable = NULL;
-	}
-      /* the hash table owned 1 ref */
-      signal_handler_unref (handler);
-
-      g_closure_invalidate (closure);
-      g_closure_unref (closure);
+    g_assert(handler->refcount > 0);
+
+    signal_handler_ref(handler);
+
+    if (handler->closure) {
+        /* invalidating closure could dispose
+         * re-entrantly, so set handler->closure
+         * NULL before we invalidate
+         */
+        GClosure* closure = handler->closure;
+        handler->closure = NULL;
+
+        g_hash_table_remove(signal_handlers_by_callable,
+                            seed_closure_get_callable(closure));
+        if (g_hash_table_size(signal_handlers_by_callable) == 0) {
+            g_hash_table_destroy(signal_handlers_by_callable);
+            signal_handlers_by_callable = NULL;
+        }
+        /* the hash table owned 1 ref */
+        signal_handler_unref(handler);
+
+        g_closure_invalidate(closure);
+        g_closure_unref(closure);
     }
 
-  /* remove signal if it hasn't been */
-  if (handler->connection_id != 0)
-    {
-      int id = handler->connection_id;
-      handler->connection_id = 0;
+    /* remove signal if it hasn't been */
+    if (handler->connection_id != 0) {
+        int id = handler->connection_id;
+        handler->connection_id = 0;
 
-      /* this should clear another ref off the
-       * handler by calling signal_on_watch_removed
-       */
-      big_dbus_unwatch_signal_by_id (handler->bus_type, id);
+        /* this should clear another ref off the
+         * handler by calling signal_on_watch_removed
+         */
+        big_dbus_unwatch_signal_by_id(handler->bus_type, id);
     }
 
-  signal_handler_unref (handler);
+    signal_handler_unref(handler);
 }
 
 static void
-signal_handler_unref (SignalHandler * handler)
+signal_handler_unref(SignalHandler* handler)
 {
-  g_assert (handler->refcount > 0);
+    g_assert(handler->refcount > 0);
 
-  if (handler->refcount == 1)
-    {
-      signal_handler_dispose (handler);
+    if (handler->refcount == 1) {
+        signal_handler_dispose(handler);
     }
 
-  handler->refcount -= 1;
-  if (handler->refcount == 0)
-    {
-      g_assert (handler->closure == NULL);
-      g_assert (handler->connection_id == 0);
-      g_slice_free (SignalHandler, handler);
+    handler->refcount -= 1;
+    if (handler->refcount == 0) {
+        g_assert(handler->closure == NULL);
+        g_assert(handler->connection_id == 0);
+        g_slice_free(SignalHandler, handler);
     }
 }
 
 static void
-signal_on_watch_removed (void *data)
+signal_on_watch_removed(void* data)
 {
-  SignalHandler *handler = data;
+    SignalHandler* handler = data;
 
-  handler->connection_id = 0;	/* don't re-remove it */
+    handler->connection_id = 0; /* don't re-remove it */
 
-  /* The watch owns a ref; removing it
-   * also forces dispose, which invalidates
-   * the closure if that hasn't been done.
-   */
-  signal_handler_dispose (handler);
-  signal_handler_unref (handler);
+    /* The watch owns a ref; removing it
+     * also forces dispose, which invalidates
+     * the closure if that hasn't been done.
+     */
+    signal_handler_dispose(handler);
+    signal_handler_unref(handler);
 }
 
 static void
-signal_on_closure_invalidated (void *data, GClosure * closure)
+signal_on_closure_invalidated(void* data, GClosure* closure)
 {
-  SignalHandler *handler;
+    SignalHandler* handler;
 
-  handler = data;
+    handler = data;
 
-  /* this removes the watch if it has not been */
-  signal_handler_dispose (handler);
+    /* this removes the watch if it has not been */
+    signal_handler_dispose(handler);
 }
 
 static void
-signal_handler_callback (DBusConnection * connection,
-			 DBusMessage * message, void *data)
+signal_handler_callback(DBusConnection* connection,
+                        DBusMessage* message,
+                        void* data)
 {
-  SeedContext ctx;
-  SignalHandler *handler;
-  SeedValue ret_val;
-  DBusMessageIter arg_iter;
-  GArray *arguments;
-  SeedException exception;
-
-  SEED_NOTE(MODULE,
-            "Signal handler called");
-
-  handler = data;
-
-  if (handler->closure == NULL)
-    {
-      SEED_NOTE(MODULE, "dbus signal handler invalidated, ignoring");
-      return;
+    SeedContext ctx;
+    SignalHandler* handler;
+    DBusMessageIter arg_iter;
+    GArray* arguments;
+    SeedException exception;
+
+    SEED_NOTE(MODULE, "Signal handler called");
+
+    handler = data;
+
+    if (handler->closure == NULL) {
+        SEED_NOTE(MODULE, "dbus signal handler invalidated, ignoring");
+        return;
     }
 
-  ctx = seed_context_create (group, NULL);
-  seed_prepare_global_context (ctx);
+    ctx = seed_context_create(group, NULL);
+    seed_prepare_global_context(ctx);
 
-  dbus_message_iter_init (message, &arg_iter);
-  if (!seed_js_values_from_dbus (ctx, &arg_iter, &arguments, &exception))
-    {
-      SEED_NOTE(MODULE, "Failed to marshal dbus signal to JS");
-      return;
+    dbus_message_iter_init(message, &arg_iter);
+    if (!seed_js_values_from_dbus(ctx, &arg_iter, &arguments, &exception)) {
+        SEED_NOTE(MODULE, "Failed to marshal dbus signal to JS");
+        return;
     }
 
-  signal_handler_ref (handler);	/* for safety, in case handler removes itself */
+    signal_handler_ref(
+      handler); /* for safety, in case handler removes itself */
 
-  g_assert (arguments != NULL);
+    g_assert(arguments != NULL);
 
-  SEED_NOTE(MODULE,
-          "Invoking closure on signal received, %d args",
-	    arguments->len);
-  ret_val = seed_closure_invoke_with_context (ctx, handler->closure,
-					      (SeedValue *) arguments->data,
-					      arguments->len, &exception);
+    SEED_NOTE(MODULE, "Invoking closure on signal received, %d args",
+              arguments->len);
+    seed_closure_invoke_with_context(ctx, handler->closure,
+                                     (SeedValue*) arguments->data,
+                                     arguments->len, &exception);
 
-  g_array_free (arguments, TRUE);
+    g_array_free(arguments, TRUE);
 
-  signal_handler_unref (handler);	/* for safety */
+    signal_handler_unref(handler); /* for safety */
 }
 
 static SeedValue
-seed_js_dbus_watch_signal (SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   size_t argument_count,
-			   const SeedValue arguments[],
-			   SeedException * exception)
+seed_js_dbus_watch_signal(SeedContext ctx,
+                          SeedObject function,
+                          SeedObject this_object,
+                          size_t argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  const char *bus_name;
-  const char *object_path;
-  const char *iface;
-  const char *signal;
-  SignalHandler *handler;
-  int id;
-  DBusBusType bus_type;
-
-  if (argument_count < 5)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Not enough args, need bus name, object path, interface, signal and callback");
-      return seed_make_null (ctx);
+    const char* bus_name;
+    const char* object_path;
+    const char* iface;
+    const char* signal;
+    SignalHandler* handler;
+    int id;
+    DBusBusType bus_type;
+
+    if (argument_count < 5) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need bus name, "
+                            "object path, interface, signal and "
+                            "callback");
+        return seed_make_null(ctx);
     }
 
-  if (!seed_value_is_object (ctx, arguments[4])
-      || !seed_value_is_function (ctx, arguments[4]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "arg 5 must be a callback to invoke when call completes");
-      return seed_make_null (ctx);
+    if (!seed_value_is_object(ctx, arguments[4])
+        || !seed_value_is_function(ctx, arguments[4])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "arg 5 must be a callback to invoke when call completes");
+        return seed_make_null(ctx);
     }
 
-  fill_with_null_or_string (ctx, &bus_name, arguments[0], exception);
-  fill_with_null_or_string (ctx, &object_path, arguments[1], exception);
-  fill_with_null_or_string (ctx, &iface, arguments[2], exception);
-  fill_with_null_or_string (ctx, &signal, arguments[3], exception);
+    fill_with_null_or_string(ctx, &bus_name, arguments[0], exception);
+    fill_with_null_or_string(ctx, &object_path, arguments[1], exception);
+    fill_with_null_or_string(ctx, &iface, arguments[2], exception);
+    fill_with_null_or_string(ctx, &signal, arguments[3], exception);
 
-  bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-  handler = signal_handler_new (ctx, arguments[4], exception);
-  if (handler == NULL)
-    return seed_make_null (ctx);
+    handler = signal_handler_new(ctx, arguments[4], exception);
+    if (handler == NULL)
+        return seed_make_null(ctx);
 
-  id = big_dbus_watch_signal (bus_type,
-			      bus_name,
-			      object_path,
-			      iface,
-			      signal,
-			      signal_handler_callback,
-			      handler, signal_on_watch_removed);
-  handler->bus_type = bus_type;
-  handler->connection_id = id;
+    id = big_dbus_watch_signal(bus_type, bus_name, object_path, iface, signal,
+                               signal_handler_callback, handler,
+                               signal_on_watch_removed);
+    handler->bus_type = bus_type;
+    handler->connection_id = id;
 
-  /* signal_on_watch_removed() takes ownership of our
-   * ref to the SignalHandler
-   */
+    /* signal_on_watch_removed() takes ownership of our
+     * ref to the SignalHandler
+     */
 
-  return seed_value_from_int (ctx, id, exception);
+    return seed_value_from_int(ctx, id, exception);
 }
 
 /* Args are handler id */
 static SeedValue
-seed_js_dbus_unwatch_signal_by_id (SeedContext ctx,
-				   SeedObject function,
-				   SeedObject this_object,
-				   size_t argument_count,
-				   const SeedValue arguments[],
-				   SeedException * exception)
+seed_js_dbus_unwatch_signal_by_id(SeedContext ctx,
+                                  SeedObject function,
+                                  SeedObject this_object,
+                                  size_t argument_count,
+                                  const SeedValue arguments[],
+                                  SeedException* exception)
 {
-  int id;
-  DBusBusType bus_type;
-
-  if (argument_count < 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Not enough args, need handler id");
-      return seed_make_null (ctx);
+    int id;
+    DBusBusType bus_type;
+
+    if (argument_count < 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need handler id");
+        return seed_make_null(ctx);
     }
 
-  bus_type = get_bus_type_from_object (ctx, this_object, exception);
-  id = seed_value_to_int (ctx, arguments[0], exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
+    id = seed_value_to_int(ctx, arguments[0], exception);
 
-  big_dbus_unwatch_signal_by_id (bus_type, id);
-  return seed_make_undefined (ctx);
+    big_dbus_unwatch_signal_by_id(bus_type, id);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_js_dbus_unwatch_signal (SeedContext ctx,
-			     SeedObject function,
-			     SeedObject this_object,
-			     size_t argument_count,
-			     const SeedValue arguments[],
-			     SeedException * exception)
+seed_js_dbus_unwatch_signal(SeedContext ctx,
+                            SeedObject function,
+                            SeedObject this_object,
+                            size_t argument_count,
+                            const SeedValue arguments[],
+                            SeedException* exception)
 {
-  const char *bus_name;
-  const char *object_path;
-  const char *iface;
-  const char *signal;
-  SignalHandler *handler;
-  DBusBusType bus_type;
-
-  if (argument_count < 5)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Not enough args, need bus name, object path, interface, signal and callback");
-      return seed_make_null (ctx);
+    const char* bus_name;
+    const char* object_path;
+    const char* iface;
+    const char* signal;
+    SignalHandler* handler;
+    DBusBusType bus_type;
+
+    if (argument_count < 5) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need bus name, "
+                            "object path, interface, signal and "
+                            "callback");
+        return seed_make_null(ctx);
     }
 
-  bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-  if (!seed_value_is_object (ctx, arguments[4])
-      || !seed_value_is_function (ctx, arguments[4]))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "arg 5 must be a callback to invoke when call completes");
-      return seed_make_null (ctx);
+    if (!seed_value_is_object(ctx, arguments[4])
+        || !seed_value_is_function(ctx, arguments[4])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "arg 5 must be a callback to invoke when call completes");
+        return seed_make_null(ctx);
     }
 
-  fill_with_null_or_string (ctx, &bus_name, arguments[0], exception);
-  fill_with_null_or_string (ctx, &object_path, arguments[1], exception);
-  fill_with_null_or_string (ctx, &iface, arguments[2], exception);
-  fill_with_null_or_string (ctx, &signal, arguments[3], exception);
+    fill_with_null_or_string(ctx, &bus_name, arguments[0], exception);
+    fill_with_null_or_string(ctx, &object_path, arguments[1], exception);
+    fill_with_null_or_string(ctx, &iface, arguments[2], exception);
+    fill_with_null_or_string(ctx, &signal, arguments[3], exception);
 
-  /* we don't complain if the signal seems to have been already removed
-   * or to never have been watched, to match g_signal_handler_disconnect
-   */
-  if (!signal_handlers_by_callable)
-    return seed_make_undefined (ctx);
+    /* we don't complain if the signal seems to have been already removed
+     * or to never have been watched, to match g_signal_handler_disconnect
+     */
+    if (!signal_handlers_by_callable)
+        return seed_make_undefined(ctx);
 
-  handler = g_hash_table_lookup (signal_handlers_by_callable, arguments[4]);
+    handler = g_hash_table_lookup(signal_handlers_by_callable, arguments[4]);
 
-  if (!handler)
-    return seed_make_undefined (ctx);
+    if (!handler)
+        return seed_make_undefined(ctx);
 
-  /* This should dispose the handler which should in turn
-   * remove it from the handler table
-   */
-  big_dbus_unwatch_signal (bus_type,
-			   bus_name,
-			   object_path,
-			   iface, signal, signal_handler_callback, handler);
+    /* This should dispose the handler which should in turn
+     * remove it from the handler table
+     */
+    big_dbus_unwatch_signal(bus_type, bus_name, object_path, iface, signal,
+                            signal_handler_callback, handler);
 
-  g_assert (g_hash_table_lookup (signal_handlers_by_callable,
-				 arguments[4]) == NULL);
+    g_assert(g_hash_table_lookup(signal_handlers_by_callable, arguments[4])
+             == NULL);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
 seed_js_dbus_emit_signal(SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 size_t argument_count,
-			 const SeedValue arguments[],
-			 SeedException * exception)
+                         SeedObject function,
+                         SeedObject this_object,
+                         size_t argument_count,
+                         const SeedValue arguments[],
+                         SeedException* exception)
 {
-    DBusConnection *bus_connection;
-    DBusMessage *message;
+    DBusConnection* bus_connection;
+    DBusMessage* message;
     DBusMessageIter arg_iter;
     DBusSignatureIter sig_iter;
-    const char *object_path;
-    const char *iface;
-    const char *signal;
-    const char *in_signature;
+    const char* object_path;
+    const char* iface;
+    const char* signal;
+    const char* in_signature;
     DBusBusType bus_type;
 
-    if (argument_count < 4)
-    {
-      seed_make_exception(ctx, exception, "ArgumentError", "Not enough args, need object path, interface and signal and the arguments");
-      return seed_make_null (ctx);
+    if (argument_count < 4) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need object path, "
+                            "interface and signal and the "
+                            "arguments");
+        return seed_make_null(ctx);
     }
 
-    if (!seed_value_is_object (ctx, arguments[4]))
-      {
-	seed_make_exception(ctx, exception, "ArgumentError", "5th argument should be an array of arguments");
-	return seed_make_null (ctx);
-      }
+    if (!seed_value_is_object(ctx, arguments[4])) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "5th argument should be an array of arguments");
+        return seed_make_null(ctx);
+    }
 
-    bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
     object_path = seed_value_to_string(ctx, arguments[0], exception);
     iface = seed_value_to_string(ctx, arguments[1], exception);
@@ -828,68 +801,66 @@ seed_js_dbus_emit_signal(SeedContext ctx,
     in_signature = seed_value_to_string(ctx, arguments[3], exception);
 
     if (!bus_check(ctx, bus_type, exception))
-      return seed_make_null (ctx);
+        return seed_make_null(ctx);
 
-    SEED_NOTE(MODULE,
-            "Emitting signal %s %s %s",
-            object_path,
-            iface,
-            signal);
+    SEED_NOTE(MODULE, "Emitting signal %s %s %s", object_path, iface, signal);
 
     bus_connection = DBUS_CONNECTION_FROM_TYPE(bus_type);
 
-    message = dbus_message_new_signal(object_path,
-                                      iface,
-                                      signal);
+    message = dbus_message_new_signal(object_path, iface, signal);
 
     dbus_message_iter_init_append(message, &arg_iter);
 
     dbus_signature_iter_init(&sig_iter, in_signature);
 
-    if (!seed_js_values_to_dbus(ctx, 0, arguments[4], &arg_iter, &sig_iter, exception))
-      {
+    if (!seed_js_values_to_dbus(ctx, 0, arguments[4], &arg_iter, &sig_iter,
+                                exception)) {
         dbus_message_unref(message);
-	return seed_make_null (ctx);
-      }
+        return seed_make_null(ctx);
+    }
 
     dbus_connection_send(bus_connection, message, NULL);
 
     dbus_message_unref(message);
 
-    return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
 seed_js_dbus_call(SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[],
-		  SeedException * exception)
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-    DBusMessage *message;
+    DBusMessage* message;
     DBusError derror;
-    DBusMessage *reply;
-    DBusConnection *bus_connection;
+    DBusMessage* reply;
+    DBusConnection* bus_connection;
     DBusBusType bus_type;
-    SeedValue retval;
-
-    if (argument_count < 8)
-      {
-	seed_make_exception(ctx, exception, "ArgumentError",
-			    "Not enough args, need bus name, object path, interface, method, out signature, in signature, autostart flag, and args");
-        return seed_make_null (ctx);
-      }
+    SeedValue retval = NULL;
+
+    if (argument_count < 8) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need bus name, "
+                            "object path, interface, method, "
+                            "out signature, in signature, "
+                            "autostart flag, and args");
+        return seed_make_null(ctx);
+    }
 
-    bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-    message = prepare_call(ctx, this_object, arguments[7], argument_count, arguments, bus_type, exception);
+    message = prepare_call(ctx, this_object, arguments[7], argument_count,
+                           arguments, bus_type, exception);
 
     bus_connection = DBUS_CONNECTION_FROM_TYPE(bus_type);
 
     /* send_with_reply_and_block() returns NULL if error was set. */
     dbus_error_init(&derror);
-    reply = dbus_connection_send_with_reply_and_block(bus_connection, message, -1, &derror);
+    reply = dbus_connection_send_with_reply_and_block(bus_connection, message,
+                                                      -1, &derror);
 
     dbus_message_unref(message);
 
@@ -901,145 +872,137 @@ seed_js_dbus_call(SeedContext ctx,
     return retval;
 }
 
-typedef struct {
+typedef struct
+{
     BigDBusNameOwnerFuncs funcs;
-    GClosure *acquired_closure;
-    GClosure *lost_closure;
+    GClosure* acquired_closure;
+    GClosure* lost_closure;
     DBusBusType bus_type;
 } BigJSDBusNameOwner;
 
 static void
-on_name_acquired(DBusConnection *connection,
-                 const char     *name,
-                 void           *data)
+on_name_acquired(DBusConnection* connection, const char* name, void* data)
 {
     int argc;
     SeedValue argv[1];
     SeedContext ctx;
-    BigJSDBusNameOwner *owner;
+    BigJSDBusNameOwner* owner;
     SeedException exception; // TODO: Do something with this...
 
     owner = data;
 
-    ctx = seed_context_create (group, NULL);
-    seed_prepare_global_context (ctx);
-    if (ctx == NULL)
-      {
-	SEED_NOTE(MODULE,
-	          "Closure destroyed before we could notify name acquired");
+    ctx = seed_context_create(group, NULL);
+    seed_prepare_global_context(ctx);
+    if (ctx == NULL) {
+        SEED_NOTE(MODULE,
+                  "Closure destroyed before we could notify name acquired");
         return;
-      }
+    }
 
     argc = 1;
 
-    argv[0] = seed_value_from_string (ctx, name, &exception);
+    argv[0] = seed_value_from_string(ctx, name, &exception);
 
-    seed_closure_invoke_with_context(ctx, owner->acquired_closure,
-				     argv, argc, &exception);
+    seed_closure_invoke_with_context(ctx, owner->acquired_closure, argv, argc,
+                                     &exception);
 
-    seed_context_unref (ctx);
+    seed_context_unref(ctx);
 }
 
-
 static void
-on_name_lost(DBusConnection *connection,
-                 const char     *name,
-                 void           *data)
+on_name_lost(DBusConnection* connection, const char* name, void* data)
 {
     int argc;
     SeedValue argv[1];
     SeedContext ctx;
-    BigJSDBusNameOwner *owner;
+    BigJSDBusNameOwner* owner;
     SeedException exception; // TODO: Do something with this...
 
     owner = data;
 
-    ctx = seed_context_create (group, NULL);
-    seed_prepare_global_context (ctx);
-    if (ctx == NULL)
-      {
-	SEED_NOTE(MODULE,
-	          "Closure destroyed before we could notify name acquired");
+    ctx = seed_context_create(group, NULL);
+    seed_prepare_global_context(ctx);
+    if (ctx == NULL) {
+        SEED_NOTE(MODULE,
+                  "Closure destroyed before we could notify name acquired");
         return;
-      }
+    }
 
     argc = 1;
 
-    argv[0] = seed_value_from_string (ctx, name, &exception);
+    argv[0] = seed_value_from_string(ctx, name, &exception);
 
-    seed_closure_invoke_with_context(ctx, owner->lost_closure,
-				     argv, argc, &exception);
+    seed_closure_invoke_with_context(ctx, owner->lost_closure, argv, argc,
+                                     &exception);
 
-    seed_context_unref (ctx);
+    seed_context_unref(ctx);
 }
 
 static void
-owner_closure_invalidated(gpointer  data,
-                          GClosure *closure)
+owner_closure_invalidated(gpointer data, GClosure* closure)
 {
-    BigJSDBusNameOwner *owner;
+    BigJSDBusNameOwner* owner;
 
-    owner = (BigJSDBusNameOwner*)data;
+    owner = (BigJSDBusNameOwner*) data;
 
     if (owner) {
-        big_dbus_release_name(owner->bus_type,
-                              &owner->funcs,
-                              owner);
+        big_dbus_release_name(owner->bus_type, &owner->funcs, owner);
 
         g_closure_unref(owner->acquired_closure);
         g_closure_unref(owner->lost_closure);
 
         g_slice_free(BigJSDBusNameOwner, owner);
     }
-
 }
 
 static SeedValue
 seed_js_dbus_acquire_name(SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  size_t argument_count,
-			  const SeedValue arguments[],
-			  SeedException * exception)
+                          SeedObject function,
+                          SeedObject this_object,
+                          size_t argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-    const char *bus_name;
+    const char* bus_name;
     SeedObject acquire_func;
     SeedObject lost_func;
-    BigJSDBusNameOwner *owner;
+    BigJSDBusNameOwner* owner;
     DBusBusType bus_type;
     BigDBusNameType name_type;
     unsigned int id;
 
-    if (argument_count < 4)
-      {
-	seed_make_exception (ctx, exception, "ArgumentError",
-			     "Not enough args, need bus name, name type, acquired_func, lost_func");
-	return seed_make_null (ctx);
-      }
+    if (argument_count < 4) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need bus name, "
+                            "name type, acquired_func, "
+                            "lost_func");
+        return seed_make_null(ctx);
+    }
 
-    bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-    bus_name = seed_value_to_string (ctx, arguments[0], exception);
+    bus_name = seed_value_to_string(ctx, arguments[0], exception);
 
-    name_type = (BigDBusNameType)seed_value_to_int (ctx, arguments[1], exception);
+    name_type
+      = (BigDBusNameType) seed_value_to_int(ctx, arguments[1], exception);
 
-    if (!seed_value_is_object (ctx, arguments[2]) ||
-	!seed_value_is_function (ctx, arguments[2]))
-      {
-        seed_make_exception (ctx, exception, "ArgumentError",
-			     "Third arg is a callback to invoke on acquiring the name");
-        return seed_make_null (ctx);
-      }
+    if (!seed_value_is_object(ctx, arguments[2])
+        || !seed_value_is_function(ctx, arguments[2])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Third arg is a callback to invoke on acquiring the name");
+        return seed_make_null(ctx);
+    }
 
     acquire_func = arguments[2];
 
-    if (!seed_value_is_object (ctx, arguments[3]) ||
-	!seed_value_is_function (ctx, arguments[3]))
-      {
-        seed_make_exception (ctx, exception, "ArgumentError",
-			     "Fourth arg is a callback to invoke on acquiring the name");
-        return seed_make_null (ctx);
-      }
+    if (!seed_value_is_object(ctx, arguments[3])
+        || !seed_value_is_function(ctx, arguments[3])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Fourth arg is a callback to invoke on acquiring the name");
+        return seed_make_null(ctx);
+    }
 
     lost_func = arguments[3];
 
@@ -1051,12 +1014,14 @@ seed_js_dbus_acquire_name(SeedContext ctx,
     owner->funcs.lost = on_name_lost;
     owner->bus_type = bus_type;
 
-    owner->acquired_closure = seed_closure_new (ctx, acquire_func, NULL, "DBus name acquired handler");
+    owner->acquired_closure
+      = seed_closure_new(ctx, acquire_func, NULL, "DBus name acquired handler");
 
     g_closure_ref(owner->acquired_closure);
     g_closure_sink(owner->acquired_closure);
 
-    owner->lost_closure = seed_closure_new (ctx, lost_func, NULL, "DBus name lost handler");
+    owner->lost_closure
+      = seed_closure_new(ctx, lost_func, NULL, "DBus name lost handler");
 
     g_closure_ref(owner->lost_closure);
     g_closure_sink(owner->lost_closure);
@@ -1066,125 +1031,115 @@ seed_js_dbus_acquire_name(SeedContext ctx,
     g_closure_add_invalidate_notifier(owner->acquired_closure, owner,
                                       owner_closure_invalidated);
 
-    id = big_dbus_acquire_name(bus_type,
-                               &owner->funcs,
-                               owner);
+    id = big_dbus_acquire_name(bus_type, &owner->funcs, owner);
 
-    return seed_value_from_int (ctx, id, exception);
+    return seed_value_from_int(ctx, id, exception);
 }
 
 static SeedValue
-seed_js_dbus_release_name_by_id (SeedContext ctx,
-				 SeedObject function,
-				 SeedObject this_object,
-				 size_t argument_count,
-				 const SeedValue arguments[],
-				 SeedException * exception)
+seed_js_dbus_release_name_by_id(SeedContext ctx,
+                                SeedObject function,
+                                SeedObject this_object,
+                                size_t argument_count,
+                                const SeedValue arguments[],
+                                SeedException* exception)
 {
     DBusBusType bus_type;
     unsigned int id;
 
-    if (argument_count < 1)
-      {
-        seed_make_exception (ctx, exception,
-			     "ArgumentError", "Not enough args, need name owner monitor id");
-	return seed_make_null (ctx);
-      }
+    if (argument_count < 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Not enough args, need name owner monitor id");
+        return seed_make_null(ctx);
+    }
 
     bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-    id = seed_value_to_int (ctx, arguments[0], exception);
+    id = seed_value_to_int(ctx, arguments[0], exception);
 
-    big_dbus_release_name_by_id(bus_type,
-                                id);
-    return seed_make_undefined (ctx);
+    big_dbus_release_name_by_id(bus_type, id);
+    return seed_make_undefined(ctx);
 }
 
-typedef struct {
-    GClosure *appeared_closure;
-    GClosure *vanished_closure;
-    char *bus_name;
+typedef struct
+{
+    GClosure* appeared_closure;
+    GClosure* vanished_closure;
+    char* bus_name;
     DBusBusType bus_type;
 } BigJSDBusNameWatcher;
 
 static void
-on_name_appeared(DBusConnection *connection,
-                 const char     *name,
-                 const char     *owner_unique_name,
-                 void           *data)
+on_name_appeared(DBusConnection* connection,
+                 const char* name,
+                 const char* owner_unique_name,
+                 void* data)
 {
     int argc;
     SeedValue argv[2];
     SeedContext ctx;
-    BigJSDBusNameWatcher *watcher;
+    BigJSDBusNameWatcher* watcher;
     SeedException exception;
 
     watcher = data;
 
-    ctx = seed_context_create (group, NULL);
-    seed_prepare_global_context (ctx);
+    ctx = seed_context_create(group, NULL);
+    seed_prepare_global_context(ctx);
 
     argc = 2;
 
-    argv[0] = seed_value_from_string (ctx, name, &exception);
-    argv[1] = seed_value_from_string (ctx, owner_unique_name, &exception);
+    argv[0] = seed_value_from_string(ctx, name, &exception);
+    argv[1] = seed_value_from_string(ctx, owner_unique_name, &exception);
 
-    seed_closure_invoke_with_context (ctx, watcher->appeared_closure,
-				      argv, argc, &exception);
+    seed_closure_invoke_with_context(ctx, watcher->appeared_closure, argv, argc,
+                                     &exception);
     // TODO: Do something with exception.
 
-    seed_context_unref (ctx);
-
+    seed_context_unref(ctx);
 }
 
 static void
-on_name_vanished(DBusConnection *connection,
-                 const char     *name,
-                 const char     *owner_unique_name,
-                 void           *data)
+on_name_vanished(DBusConnection* connection,
+                 const char* name,
+                 const char* owner_unique_name,
+                 void* data)
 {
     int argc;
     SeedValue argv[2];
     SeedContext ctx;
-    BigJSDBusNameWatcher *watcher;
+    BigJSDBusNameWatcher* watcher;
     SeedException exception;
 
     watcher = data;
 
-    ctx = seed_context_create (group, NULL);
-    seed_prepare_global_context (ctx);
+    ctx = seed_context_create(group, NULL);
+    seed_prepare_global_context(ctx);
 
     argc = 2;
 
-    argv[0] = seed_value_from_string (ctx, name, &exception);
-    argv[1] = seed_value_from_string (ctx, owner_unique_name, &exception);
+    argv[0] = seed_value_from_string(ctx, name, &exception);
+    argv[1] = seed_value_from_string(ctx, owner_unique_name, &exception);
 
-    seed_closure_invoke_with_context (ctx, watcher->vanished_closure,
-				      argv, argc, &exception);
+    seed_closure_invoke_with_context(ctx, watcher->vanished_closure, argv, argc,
+                                     &exception);
     // TODO: Do something with exception.
 
-    seed_context_unref (ctx);
-
+    seed_context_unref(ctx);
 }
 
-static const BigDBusWatchNameFuncs watch_name_funcs = {
-    on_name_appeared,
-    on_name_vanished
-};
+static const BigDBusWatchNameFuncs watch_name_funcs
+  = { on_name_appeared, on_name_vanished };
 
 static void
-watch_closure_invalidated(gpointer  data,
-                          GClosure *closure)
+watch_closure_invalidated(gpointer data, GClosure* closure)
 {
-    BigJSDBusNameWatcher *watcher;
+    BigJSDBusNameWatcher* watcher;
 
-    watcher = (BigJSDBusNameWatcher*)data;
+    watcher = (BigJSDBusNameWatcher*) data;
 
     if (watcher) {
-        big_dbus_unwatch_name(watcher->bus_type,
-                              watcher->bus_name,
-                              &watch_name_funcs,
-                              watcher);
+        big_dbus_unwatch_name(watcher->bus_type, watcher->bus_name,
+                              &watch_name_funcs, watcher);
 
         g_free(watcher->bus_name);
         g_closure_unref(watcher->appeared_closure);
@@ -1192,61 +1147,66 @@ watch_closure_invalidated(gpointer  data,
 
         g_slice_free(BigJSDBusNameWatcher, watcher);
     }
-
 }
 
 static SeedValue
 seed_js_dbus_watch_name(SeedContext ctx,
-			SeedObject function,
-			SeedObject this_object,
-			size_t argument_count,
-			const SeedValue arguments[],
-			SeedException * exception)
+                        SeedObject function,
+                        SeedObject this_object,
+                        size_t argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-    const char *bus_name;
+    const char* bus_name;
     gboolean start_if_not_found;
     SeedObject appeared_func;
     SeedObject vanished_func;
-    BigJSDBusNameWatcher *watcher;
+    BigJSDBusNameWatcher* watcher;
     DBusBusType bus_type;
 
-    if (argument_count < 4)
-      {
-        seed_make_exception (ctx, exception,
-			     "ArgumentError", "Not enough args, need bus name, acquired_func, lost_func");
-	return seed_make_null (ctx);
-      }
+    if (argument_count < 4) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Not enough args, need bus name, acquired_func, lost_func");
+        return seed_make_null(ctx);
+    }
 
     bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
-    bus_name = seed_value_to_string (ctx, arguments[0], exception);
+    bus_name = seed_value_to_string(ctx, arguments[0], exception);
 
-    start_if_not_found = seed_value_to_boolean (ctx, arguments[1], exception);
+    start_if_not_found = seed_value_to_boolean(ctx, arguments[1], exception);
 
-    if (!seed_value_is_object (ctx, arguments[2]) || !seed_value_is_function (ctx, arguments[2]))
-      {
-        seed_make_exception (ctx, exception, "ArgumentError", "Third arg is a callback to invoke on seeing the name");
-	return seed_make_null (ctx);
-      }
+    if (!seed_value_is_object(ctx, arguments[2])
+        || !seed_value_is_function(ctx, arguments[2])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Third arg is a callback to invoke on seeing the name");
+        return seed_make_null(ctx);
+    }
 
     appeared_func = arguments[2];
 
-    if (!seed_value_is_object (ctx, arguments[3]) || !seed_value_is_function (ctx, arguments[3]))
-      {
-        seed_make_exception (ctx, exception, "ArgumentError", "Fourth arg is a callback to invoke on seeing the name");
-	return seed_make_null (ctx);
-      }
+    if (!seed_value_is_object(ctx, arguments[3])
+        || !seed_value_is_function(ctx, arguments[3])) {
+        seed_make_exception(
+          ctx, exception, "ArgumentError",
+          "Fourth arg is a callback to invoke on seeing the name");
+        return seed_make_null(ctx);
+    }
 
     vanished_func = arguments[3];
 
     watcher = g_slice_new0(BigJSDBusNameWatcher);
 
-    watcher->appeared_closure = seed_closure_new (ctx, appeared_func, NULL, "DBus name appeared handler");
+    watcher->appeared_closure = seed_closure_new(ctx, appeared_func, NULL,
+                                                 "DBus name appeared handler");
 
     g_closure_ref(watcher->appeared_closure);
     g_closure_sink(watcher->appeared_closure);
 
-    watcher->vanished_closure = seed_closure_new (ctx, vanished_func, NULL, "DBus name vanished handler");
+    watcher->vanished_closure = seed_closure_new(ctx, vanished_func, NULL,
+                                                 "DBus name vanished handler");
 
     g_closure_ref(watcher->vanished_closure);
     g_closure_sink(watcher->vanished_closure);
@@ -1259,210 +1219,192 @@ seed_js_dbus_watch_name(SeedContext ctx,
     g_closure_add_invalidate_notifier(watcher->appeared_closure, watcher,
                                       watch_closure_invalidated);
 
-    big_dbus_watch_name(bus_type,
-                        bus_name,
-                        start_if_not_found ?
-                        BIG_DBUS_NAME_START_IF_NOT_FOUND : 0,
-                        &watch_name_funcs,
-                        watcher);
+    big_dbus_watch_name(bus_type, bus_name,
+                        start_if_not_found ? BIG_DBUS_NAME_START_IF_NOT_FOUND
+                                           : 0,
+                        &watch_name_funcs, watcher);
 
-    return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-unique_name_getter (SeedContext ctx,
-		    SeedObject object,
-		    SeedString property_name,
-		    SeedException *exception)
+unique_name_getter(SeedContext ctx,
+                   SeedObject object,
+                   SeedString property_name,
+                   SeedException* exception)
 {
-  DBusConnection *bus_connection;
-  DBusBusType bus_type;
+    DBusConnection* bus_connection;
+    DBusBusType bus_type;
 
-  bus_type = get_bus_type_from_object (ctx, object, exception);
+    bus_type = get_bus_type_from_object(ctx, object, exception);
 
-  bus_check (ctx, bus_type, exception);
+    bus_check(ctx, bus_type, exception);
 
-  bus_connection = DBUS_CONNECTION_FROM_TYPE (bus_type);
+    bus_connection = DBUS_CONNECTION_FROM_TYPE(bus_type);
 
-  if (bus_connection == NULL)
-    {
-      return seed_make_null (ctx);
-    }
-  else
-    {
-      const gchar *unique_name;
+    if (bus_connection == NULL) {
+        return seed_make_null(ctx);
+    } else {
+        const gchar* unique_name;
 
-      unique_name = dbus_bus_get_unique_name (bus_connection);
-      return seed_value_from_string (ctx, unique_name, exception);
+        unique_name = dbus_bus_get_unique_name(bus_connection);
+        return seed_value_from_string(ctx, unique_name, exception);
     }
 }
 
 static SeedValue
 seed_js_dbus_start_service(SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  size_t argument_count,
-			  const SeedValue arguments[],
-			  SeedException * exception)
+                           SeedObject function,
+                           SeedObject this_object,
+                           size_t argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-    const char     *name;
-    DBusBusType     bus_type;
-    DBusConnection *bus_connection;
+    const char* name;
+    DBusBusType bus_type;
+    DBusConnection* bus_connection;
 
-    if (argument_count != 1)
-      {
-        seed_make_exception (ctx, exception, "ArgumentError",
-			     "Wrong number of arguments, expected service name");
-	return seed_make_null (ctx);
-      }
+    if (argument_count != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Wrong number of arguments, expected service name");
+        return seed_make_null(ctx);
+    }
 
-    name = seed_value_to_string (ctx, arguments[0], exception);
+    name = seed_value_to_string(ctx, arguments[0], exception);
 
-    bus_type = get_bus_type_from_object (ctx, this_object, exception);
+    bus_type = get_bus_type_from_object(ctx, this_object, exception);
 
     if (!bus_check(ctx, bus_type, exception))
-      return seed_make_null (ctx);
+        return seed_make_null(ctx);
 
     bus_connection = DBUS_CONNECTION_FROM_TYPE(bus_type);
 
     big_dbus_start_service(bus_connection, name);
 
-    return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_js_dbus_signature_length (SeedContext ctx,
-			       SeedObject function,
-			       SeedObject this_object,
-			       size_t argument_count,
-			       const SeedValue arguments[],
-			       SeedException * exception)
+seed_js_dbus_signature_length(SeedContext ctx,
+                              SeedObject function,
+                              SeedObject this_object,
+                              size_t argument_count,
+                              const SeedValue arguments[],
+                              SeedException* exception)
 {
-  const gchar *signature;
-  DBusSignatureIter iter;
-  gint length = 0;
-
-  if (argument_count < 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "dbus.signatureLength expected 1 argument, got %zd",
-			   argument_count);
-      return seed_make_null (ctx);
+    const gchar* signature;
+    DBusSignatureIter iter;
+    gint length = 0;
+
+    if (argument_count < 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "dbus.signatureLength expected 1 argument, got %zd",
+                            argument_count);
+        return seed_make_null(ctx);
     }
 
-  signature = seed_value_to_string (ctx, arguments[0], exception);
+    signature = seed_value_to_string(ctx, arguments[0], exception);
 
-  if (!dbus_signature_validate (signature, NULL))
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "Invalid signature");
-      return seed_make_null (ctx);
+    if (!dbus_signature_validate(signature, NULL)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Invalid signature");
+        return seed_make_null(ctx);
     }
 
-  if (*signature == '\0')
-    return seed_value_from_int (ctx, 0, exception);
+    if (*signature == '\0')
+        return seed_value_from_int(ctx, 0, exception);
 
-  dbus_signature_iter_init (&iter, signature);
-  do
-    {
-      length++;
-    }
-  while (dbus_signature_iter_next (&iter));
+    dbus_signature_iter_init(&iter, signature);
+    do {
+        length++;
+    } while (dbus_signature_iter_next(&iter));
 
-  return seed_value_from_int (ctx, length, exception);
+    return seed_value_from_int(ctx, length, exception);
 }
 
-seed_static_value bus_values[] = {
-  {"unique_name", unique_name_getter, NULL, 0},
-  {NULL, NULL, NULL, 0}
-};
-
-seed_static_function bus_funcs[] = {
-  {"call", seed_js_dbus_call, 0},
-  {"call_async", seed_js_dbus_call_async, 0},
-  {"acquire_name", seed_js_dbus_acquire_name, 0},
-  {"release_name_by_id", seed_js_dbus_release_name_by_id, 0},
-  {"watch_name", seed_js_dbus_watch_name, 0},
-  {"watch_signal", seed_js_dbus_watch_signal, 0},
-  {"unwatch_signal_by_id", seed_js_dbus_unwatch_signal_by_id, 0},
-  {"unwatch_signal", seed_js_dbus_unwatch_signal, 0},
-  {"emit_signal", seed_js_dbus_emit_signal, 0},
-  {"start_service", seed_js_dbus_start_service, 0},
-  {NULL, NULL, 0}
-};
-
-seed_static_function dbus_funcs[] = {
-  {"signatureLength", seed_js_dbus_signature_length, 0},
-  {NULL, NULL, 0}
-};
-
-seed_static_value dbus_values[] = {
-  {"localMachineID", seed_js_dbus_get_machine_id, NULL, 0},
-  {NULL, NULL, NULL, 0}
-};
+seed_static_value bus_values[]
+  = { { "unique_name", unique_name_getter, NULL, 0 }, { NULL, NULL, NULL, 0 } };
+
+seed_static_function bus_funcs[]
+  = { { "call", seed_js_dbus_call, 0 },
+      { "call_async", seed_js_dbus_call_async, 0 },
+      { "acquire_name", seed_js_dbus_acquire_name, 0 },
+      { "release_name_by_id", seed_js_dbus_release_name_by_id, 0 },
+      { "watch_name", seed_js_dbus_watch_name, 0 },
+      { "watch_signal", seed_js_dbus_watch_signal, 0 },
+      { "unwatch_signal_by_id", seed_js_dbus_unwatch_signal_by_id, 0 },
+      { "unwatch_signal", seed_js_dbus_unwatch_signal, 0 },
+      { "emit_signal", seed_js_dbus_emit_signal, 0 },
+      { "start_service", seed_js_dbus_start_service, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_function dbus_funcs[]
+  = { { "signatureLength", seed_js_dbus_signature_length, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_value dbus_values[]
+  = { { "localMachineID", seed_js_dbus_get_machine_id, NULL, 0 },
+      { NULL, NULL, NULL, 0 } };
 
 static void
-define_bus_object (SeedContext ctx,
-		   DBusBusType which_bus)
+define_bus_object(SeedContext ctx, DBusBusType which_bus)
 {
-  SeedObject bus_obj;
-  const gchar *bus_name;
+    SeedObject bus_obj;
+    const gchar* bus_name;
 
-  bus_name = BIG_DBUS_NAME_FROM_TYPE(which_bus);
-  bus_obj = seed_make_object (ctx, dbus_bus_class, NULL);
-  seed_object_set_property (ctx, bus_obj, "_dbusBusType",
-			    seed_value_from_int (ctx, which_bus, NULL));
-  //TODO: Define exports
-  seed_js_define_dbus_exports (ctx, bus_obj, which_bus);
+    bus_name = BIG_DBUS_NAME_FROM_TYPE(which_bus);
+    bus_obj = seed_make_object(ctx, dbus_bus_class, NULL);
+    seed_object_set_property(ctx, bus_obj, "_dbusBusType",
+                             seed_value_from_int(ctx, which_bus, NULL));
+    // TODO: Define exports
+    seed_js_define_dbus_exports(ctx, bus_obj, which_bus);
 
-  seed_object_set_property (ctx, namespace_ref, bus_name, bus_obj);
+    seed_object_set_property(ctx, namespace_ref, bus_name, bus_obj);
 }
 
-    /*static void
+/*static void
 seed_define_bus_proto (SeedContext ctx)
 {
-  bus_proto = seed_make_object (ctx, NULL, NULL);
+bus_proto = seed_make_object (ctx, NULL, NULL);
 
-  seed_value_protect (ctx, bus_proto);
-  }*/
+seed_value_protect (ctx, bus_proto);
+}*/
 
 SeedObject
-seed_module_init (SeedEngine * eng)
+seed_module_init(SeedEngine* eng)
 {
-  seed_class_definition dbus_namespace_class_def = seed_empty_class;
-  seed_class_definition dbus_bus_class_def = seed_empty_class;
+    seed_class_definition dbus_namespace_class_def = seed_empty_class;
+    seed_class_definition dbus_bus_class_def = seed_empty_class;
 
-  ctx = eng->context;
-  group = eng->group;
+    ctx = eng->context;
+    group = eng->group;
 
-  dbus_namespace_class_def.class_name = "dbusnative";
-  dbus_namespace_class_def.static_functions = dbus_funcs;
-  dbus_namespace_class_def.static_values = dbus_values;
+    dbus_namespace_class_def.class_name = "dbusnative";
+    dbus_namespace_class_def.static_functions = dbus_funcs;
+    dbus_namespace_class_def.static_values = dbus_values;
 
-  dbus_bus_class_def.class_name = "dbusbus";
-  dbus_bus_class_def.static_functions = bus_funcs;
-  dbus_bus_class_def.static_values = bus_values;
+    dbus_bus_class_def.class_name = "dbusbus";
+    dbus_bus_class_def.static_functions = bus_funcs;
+    dbus_bus_class_def.static_values = bus_values;
 
-  dbus_namespace_class = seed_create_class (&dbus_namespace_class_def);
-  dbus_bus_class = seed_create_class (&dbus_bus_class_def);
+    dbus_namespace_class = seed_create_class(&dbus_namespace_class_def);
+    dbus_bus_class = seed_create_class(&dbus_bus_class_def);
 
-  namespace_ref = seed_make_object (eng->context, dbus_namespace_class, NULL);
+    namespace_ref = seed_make_object(eng->context, dbus_namespace_class, NULL);
 
-  seed_object_set_property (ctx, namespace_ref, "BUS_SESSION",
-			    seed_value_from_int (ctx, DBUS_BUS_SESSION,
-						 NULL));
-  seed_object_set_property (ctx, namespace_ref, "BUS_SYSTEM",
-			    seed_value_from_int (ctx, DBUS_BUS_SYSTEM, NULL));
-  seed_object_set_property (ctx, namespace_ref, "BUS_STARTER",
-			    seed_value_from_int (ctx, DBUS_BUS_STARTER,
-						 NULL));
+    seed_object_set_property(ctx, namespace_ref, "BUS_SESSION",
+                             seed_value_from_int(ctx, DBUS_BUS_SESSION, NULL));
+    seed_object_set_property(ctx, namespace_ref, "BUS_SYSTEM",
+                             seed_value_from_int(ctx, DBUS_BUS_SYSTEM, NULL));
+    seed_object_set_property(ctx, namespace_ref, "BUS_STARTER",
+                             seed_value_from_int(ctx, DBUS_BUS_STARTER, NULL));
 
-  seed_create_function (ctx, "signatureLength",
-			(SeedFunctionCallback) seed_js_dbus_signature_length,
-			namespace_ref);
+    seed_create_function(ctx, "signatureLength",
+                         (SeedFunctionCallback) seed_js_dbus_signature_length,
+                         namespace_ref);
 
-  define_bus_object (ctx, DBUS_BUS_SESSION);
-  define_bus_object (ctx, DBUS_BUS_SYSTEM);
+    define_bus_object(ctx, DBUS_BUS_SESSION);
+    define_bus_object(ctx, DBUS_BUS_SYSTEM);
 
-  return namespace_ref;
+    return namespace_ref;
 }
diff --git a/modules/dbus/util/Makefile.in b/modules/dbus/util/Makefile.in
index 6328fab..cf451c8 100644
--- a/modules/dbus/util/Makefile.in
+++ b/modules/dbus/util/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,21 +88,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/dbus/util
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -73,6 +120,8 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -136,6 +185,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -149,6 +200,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -172,8 +224,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -185,6 +246,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -279,6 +341,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -308,7 +371,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/dbus/util/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/dbus/util/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -332,11 +394,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -472,15 +534,18 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am 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-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/dbus/util/dbus-private.h b/modules/dbus/util/dbus-private.h
index 9a31321..3d58d06 100644
--- a/modules/dbus/util/dbus-private.h
+++ b/modules/dbus/util/dbus-private.h
@@ -10,46 +10,47 @@
 
 G_BEGIN_DECLS
 
-typedef struct {
+typedef struct
+{
     DBusBusType bus_type;
-    void *where_connection_was;
-    BigDBusProxy *driver_proxy;
-    GHashTable *json_ifaces;
-    GSList *name_ownership_monitors;
-    GHashTable *name_watches;
+    void* where_connection_was;
+    BigDBusProxy* driver_proxy;
+    GHashTable* json_ifaces;
+    GSList* name_ownership_monitors;
+    GHashTable* name_watches;
 
-    GSList *all_signal_watchers;
+    GSList* all_signal_watchers;
 
     /* These signal watcher tables are maps from a
      * string to a GSList of BigSignalWatcher,
      * and they are lazily created if a signal watcher
      * needs to be looked up by the given key.
      */
-    GHashTable *signal_watchers_by_unique_sender;
-    GHashTable *signal_watchers_by_path;
-    GHashTable *signal_watchers_by_iface;
-    GHashTable *signal_watchers_by_signal;
+    GHashTable* signal_watchers_by_unique_sender;
+    GHashTable* signal_watchers_by_path;
+    GHashTable* signal_watchers_by_iface;
+    GHashTable* signal_watchers_by_signal;
     /* These are matching on well-known name only,
      * or watching all signals
      */
-    GSList     *signal_watchers_in_no_table;
+    GSList* signal_watchers_in_no_table;
 
 } BigDBusInfo;
 
-BigDBusInfo*      _big_dbus_ensure_info                     (DBusConnection *connection);
-void              _big_dbus_dispose_info                    (DBusConnection *connection);
-void              _big_dbus_process_pending_signal_watchers (DBusConnection *connection,
-                                                             BigDBusInfo    *info);
-DBusHandlerResult _big_dbus_signal_watch_filter_message     (DBusConnection *connection,
-                                                             DBusMessage    *message,
-                                                             void           *data);
-void              _big_dbus_set_matching_name_owner_changed (DBusConnection *connection,
-                                                             const char     *bus_name,
-                                                             gboolean        matched);
-void              _big_dbus_ensure_connect_idle             (DBusBusType     bus_type);
-DBusConnection*   _big_dbus_get_weak_ref                    (DBusBusType     which_bus);
-
+BigDBusInfo* _big_dbus_ensure_info(DBusConnection* connection);
+void _big_dbus_dispose_info(DBusConnection* connection);
+void _big_dbus_process_pending_signal_watchers(DBusConnection* connection,
+                                               BigDBusInfo* info);
+DBusHandlerResult _big_dbus_signal_watch_filter_message(
+  DBusConnection* connection,
+  DBusMessage* message,
+  void* data);
+void _big_dbus_set_matching_name_owner_changed(DBusConnection* connection,
+                                               const char* bus_name,
+                                               gboolean matched);
+void _big_dbus_ensure_connect_idle(DBusBusType bus_type);
+DBusConnection* _big_dbus_get_weak_ref(DBusBusType which_bus);
 
 G_END_DECLS
 
-#endif  /* __BIG_UTIL_DBUS_PRIVATE_H__ */
+#endif /* __BIG_UTIL_DBUS_PRIVATE_H__ */
diff --git a/modules/dbus/util/dbus-proxy.c b/modules/dbus/util/dbus-proxy.c
index a9a413c..610cde0 100644
--- a/modules/dbus/util/dbus-proxy.c
+++ b/modules/dbus/util/dbus-proxy.c
@@ -9,20 +9,19 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <stdarg.h>
 
-typedef enum {
-    REPLY_CLOSURE_PLAIN,
-    REPLY_CLOSURE_JSON
-} ReplyClosureType;
+typedef enum { REPLY_CLOSURE_PLAIN, REPLY_CLOSURE_JSON } ReplyClosureType;
 
-typedef struct {
-    BigDBusProxy *proxy;
+typedef struct
+{
+    BigDBusProxy* proxy;
     ReplyClosureType type;
-    union {
-        BigDBusProxyReplyFunc     plain;
+    union
+    {
+        BigDBusProxyReplyFunc plain;
         BigDBusProxyJsonReplyFunc json;
     } func;
     BigDBusProxyErrorReplyFunc error_func;
-    void *data;
+    void* data;
     /* this is a debug thing; we want to guarantee
      * we call exactly 1 time either the reply or error
      * callback.
@@ -31,30 +30,33 @@ typedef struct {
     guint error_invoked : 1;
 } ReplyClosure;
 
-static void     big_dbus_proxy_dispose      (GObject               *object);
-static void     big_dbus_proxy_finalize     (GObject               *object);
-static GObject* big_dbus_proxy_constructor  (GType                  type,
-                                             guint                  n_construct_properties,
-                                             GObjectConstructParam *construct_params);
-static void     big_dbus_proxy_get_property (GObject               *object,
-                                             guint                  prop_id,
-                                             GValue                *value,
-                                             GParamSpec            *pspec);
-static void     big_dbus_proxy_set_property (GObject               *object,
-                                             guint                  prop_id,
-                                             const GValue          *value,
-                                             GParamSpec            *pspec);
-
-struct _BigDBusProxy {
+static void big_dbus_proxy_dispose(GObject* object);
+static void big_dbus_proxy_finalize(GObject* object);
+static GObject* big_dbus_proxy_constructor(
+  GType type,
+  guint n_construct_properties,
+  GObjectConstructParam* construct_params);
+static void big_dbus_proxy_get_property(GObject* object,
+                                        guint prop_id,
+                                        GValue* value,
+                                        GParamSpec* pspec);
+static void big_dbus_proxy_set_property(GObject* object,
+                                        guint prop_id,
+                                        const GValue* value,
+                                        GParamSpec* pspec);
+
+struct _BigDBusProxy
+{
     GObject parent;
 
-    DBusConnection *connection;
-    char *bus_name;
-    char *object_path;
-    char *iface;
+    DBusConnection* connection;
+    char* bus_name;
+    char* object_path;
+    char* iface;
 };
 
-struct _BigDBusProxyClass {
+struct _BigDBusProxyClass
+{
     GObjectClass parent;
 };
 
@@ -68,7 +70,8 @@ enum {
 static int signals[LAST_SIGNAL];
 #endif
 
-enum {
+enum
+{
     PROP_0,
     PROP_CONNECTION,
     PROP_BUS_NAME,
@@ -77,15 +80,14 @@ enum {
 };
 
 static void
-big_dbus_proxy_init(BigDBusProxy *proxy)
+big_dbus_proxy_init(BigDBusProxy* proxy)
 {
-
 }
 
 static void
-big_dbus_proxy_class_init(BigDBusProxyClass *klass)
+big_dbus_proxy_class_init(BigDBusProxyClass* klass)
 {
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    GObjectClass* object_class = G_OBJECT_CLASS(klass);
 
     object_class->dispose = big_dbus_proxy_dispose;
     object_class->finalize = big_dbus_proxy_finalize;
@@ -94,41 +96,31 @@ big_dbus_proxy_class_init(BigDBusProxyClass *klass)
     object_class->get_property = big_dbus_proxy_get_property;
     object_class->set_property = big_dbus_proxy_set_property;
 
-    g_object_class_install_property(object_class,
-                                    PROP_CONNECTION,
-                                    g_param_spec_boxed("connection",
-                                                       "DBusConnection",
-                                                       "Our connection to the bus",
-                                                       DBUS_TYPE_CONNECTION,
-                                                       G_PARAM_READWRITE));
-    g_object_class_install_property(object_class,
-                                    PROP_BUS_NAME,
-                                    g_param_spec_string("bus-name",
-                                                        "Bus Name",
-                                                        "Name of app on the bus",
-                                                        NULL,
-                                                        G_PARAM_READWRITE));
-    g_object_class_install_property(object_class,
-                                    PROP_OBJECT_PATH,
-                                    g_param_spec_string("object-path",
-                                                        "Object Path",
-                                                        "Object's dbus path",
-                                                        NULL,
-                                                        G_PARAM_READWRITE));
-
-    g_object_class_install_property(object_class,
-                                    PROP_INTERFACE,
-                                    g_param_spec_string("interface",
-                                                        "Interface",
-                                                        "Interface to invoke methods on",
-                                                        NULL,
-                                                        G_PARAM_READWRITE));
+    g_object_class_install_property(
+      object_class, PROP_CONNECTION,
+      g_param_spec_boxed("connection", "DBusConnection",
+                         "Our connection to the bus", DBUS_TYPE_CONNECTION,
+                         G_PARAM_READWRITE));
+    g_object_class_install_property(
+      object_class, PROP_BUS_NAME,
+      g_param_spec_string("bus-name", "Bus Name", "Name of app on the bus",
+                          NULL, G_PARAM_READWRITE));
+    g_object_class_install_property(
+      object_class, PROP_OBJECT_PATH,
+      g_param_spec_string("object-path", "Object Path", "Object's dbus path",
+                          NULL, G_PARAM_READWRITE));
+
+    g_object_class_install_property(
+      object_class, PROP_INTERFACE,
+      g_param_spec_string("interface", "Interface",
+                          "Interface to invoke methods on", NULL,
+                          G_PARAM_READWRITE));
 }
 
 static void
-big_dbus_proxy_dispose(GObject *object)
+big_dbus_proxy_dispose(GObject* object)
 {
-    BigDBusProxy *proxy;
+    BigDBusProxy* proxy;
 
     proxy = BIG_DBUS_PROXY(object);
 
@@ -156,23 +148,22 @@ big_dbus_proxy_dispose(GObject *object)
 }
 
 static void
-big_dbus_proxy_finalize(GObject *object)
+big_dbus_proxy_finalize(GObject* object)
 {
 
     G_OBJECT_CLASS(big_dbus_proxy_parent_class)->finalize(object);
 }
 
 static GObject*
-big_dbus_proxy_constructor (GType                  type,
-                            guint                  n_construct_properties,
-                            GObjectConstructParam *construct_params)
+big_dbus_proxy_constructor(GType type,
+                           guint n_construct_properties,
+                           GObjectConstructParam* construct_params)
 {
-    GObject *object;
-    BigDBusProxy *proxy;
+    GObject* object;
+    BigDBusProxy* proxy;
 
-    object = (* G_OBJECT_CLASS (big_dbus_proxy_parent_class)->constructor) (type,
-                                                                            n_construct_properties,
-                                                                            construct_params);
+    object = (*G_OBJECT_CLASS(big_dbus_proxy_parent_class)
+                 ->constructor)(type, n_construct_properties, construct_params);
 
     proxy = BIG_DBUS_PROXY(object);
 
@@ -180,76 +171,80 @@ big_dbus_proxy_constructor (GType                  type,
 }
 
 static void
-big_dbus_proxy_get_property (GObject     *object,
-                             guint        prop_id,
-                             GValue      *value,
-                             GParamSpec  *pspec)
+big_dbus_proxy_get_property(GObject* object,
+                            guint prop_id,
+                            GValue* value,
+                            GParamSpec* pspec)
 {
-    BigDBusProxy *proxy;
+    BigDBusProxy* proxy;
 
-    proxy = BIG_DBUS_PROXY (object);
+    proxy = BIG_DBUS_PROXY(object);
 
     switch (prop_id) {
-    case PROP_CONNECTION:
-        g_value_set_boxed(value, proxy->connection);
-        break;
-    case PROP_BUS_NAME:
-        g_value_set_string(value, proxy->bus_name);
-        break;
-    case PROP_OBJECT_PATH:
-        g_value_set_string(value, proxy->object_path);
-        break;
-    case PROP_INTERFACE:
-        g_value_set_string(value, proxy->iface);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
+        case PROP_CONNECTION:
+            g_value_set_boxed(value, proxy->connection);
+            break;
+        case PROP_BUS_NAME:
+            g_value_set_string(value, proxy->bus_name);
+            break;
+        case PROP_OBJECT_PATH:
+            g_value_set_string(value, proxy->object_path);
+            break;
+        case PROP_INTERFACE:
+            g_value_set_string(value, proxy->iface);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+            break;
     }
 }
 
 static void
-big_dbus_proxy_set_property (GObject      *object,
-                             guint         prop_id,
-                             const GValue *value,
-                             GParamSpec   *pspec)
+big_dbus_proxy_set_property(GObject* object,
+                            guint prop_id,
+                            const GValue* value,
+                            GParamSpec* pspec)
 {
-    BigDBusProxy *proxy;
+    BigDBusProxy* proxy;
 
-    proxy = BIG_DBUS_PROXY (object);
+    proxy = BIG_DBUS_PROXY(object);
 
     switch (prop_id) {
-    case PROP_CONNECTION:
-        if (proxy->connection != NULL) {
-            g_warning("Cannot change BigDBusProxy::connection after it's set");
-            return;
-        }
-        proxy->connection = dbus_connection_ref(g_value_get_boxed(value));
-        break;
-    case PROP_BUS_NAME:
-        if (proxy->bus_name != NULL) {
-            g_warning("Cannot change BigDBusProxy::bus-name after it's set");
-            return;
-        }
-        proxy->bus_name = g_value_dup_string(value);
-        break;
-    case PROP_OBJECT_PATH:
-        if (proxy->object_path != NULL) {
-            g_warning("Cannot change BigDBusProxy::object-path after it's set");
-            return;
-        }
-        proxy->object_path = g_value_dup_string(value);
-        break;
-    case PROP_INTERFACE:
-        if (proxy->iface != NULL) {
-            g_warning("Cannot change BigDBusProxy::interface after it's set");
-            return;
-        }
-        proxy->iface = g_value_dup_string(value);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
+        case PROP_CONNECTION:
+            if (proxy->connection != NULL) {
+                g_warning(
+                  "Cannot change BigDBusProxy::connection after it's set");
+                return;
+            }
+            proxy->connection = dbus_connection_ref(g_value_get_boxed(value));
+            break;
+        case PROP_BUS_NAME:
+            if (proxy->bus_name != NULL) {
+                g_warning(
+                  "Cannot change BigDBusProxy::bus-name after it's set");
+                return;
+            }
+            proxy->bus_name = g_value_dup_string(value);
+            break;
+        case PROP_OBJECT_PATH:
+            if (proxy->object_path != NULL) {
+                g_warning(
+                  "Cannot change BigDBusProxy::object-path after it's set");
+                return;
+            }
+            proxy->object_path = g_value_dup_string(value);
+            break;
+        case PROP_INTERFACE:
+            if (proxy->iface != NULL) {
+                g_warning(
+                  "Cannot change BigDBusProxy::interface after it's set");
+                return;
+            }
+            proxy->iface = g_value_dup_string(value);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+            break;
     }
 }
 
@@ -257,48 +252,42 @@ big_dbus_proxy_set_property (GObject      *object,
  * iface is allowed to be NULL but likely should not be.
  */
 BigDBusProxy*
-big_dbus_proxy_new(DBusConnection *connection,
-                   const char     *bus_name,
-                   const char     *object_path,
-                   const char     *iface)
+big_dbus_proxy_new(DBusConnection* connection,
+                   const char* bus_name,
+                   const char* object_path,
+                   const char* iface)
 {
-    BigDBusProxy *proxy;
+    BigDBusProxy* proxy;
 
     g_return_val_if_fail(connection != NULL, NULL);
     g_return_val_if_fail(object_path != NULL, NULL);
 
-    proxy = g_object_new(BIG_TYPE_DBUS_PROXY,
-                         "connection", connection,
-                         "bus-name", bus_name,
-                         "object-path", object_path,
-                         "interface", iface,
-                         NULL);
+    proxy = g_object_new(BIG_TYPE_DBUS_PROXY, "connection", connection,
+                         "bus-name", bus_name, "object-path", object_path,
+                         "interface", iface, NULL);
 
     return proxy;
 }
 
 DBusConnection*
-big_dbus_proxy_get_connection(BigDBusProxy *proxy)
+big_dbus_proxy_get_connection(BigDBusProxy* proxy)
 {
     return proxy->connection;
 }
 
 const char*
-big_dbus_proxy_get_bus_name(BigDBusProxy *proxy)
+big_dbus_proxy_get_bus_name(BigDBusProxy* proxy)
 {
     return proxy->bus_name;
 }
 
 DBusMessage*
-big_dbus_proxy_new_method_call(BigDBusProxy *proxy,
-                               const char   *method_name)
+big_dbus_proxy_new_method_call(BigDBusProxy* proxy, const char* method_name)
 {
-    DBusMessage *message;
+    DBusMessage* message;
 
-    message = dbus_message_new_method_call(proxy->bus_name,
-                                           proxy->object_path,
-                                           proxy->iface,
-                                           method_name);
+    message = dbus_message_new_method_call(proxy->bus_name, proxy->object_path,
+                                           proxy->iface, method_name);
     if (message == NULL)
         g_error("no memory");
 
@@ -312,29 +301,30 @@ big_dbus_proxy_new_method_call(BigDBusProxy *proxy,
 }
 
 DBusMessage*
-big_dbus_proxy_new_json_call(BigDBusProxy    *proxy,
-                             const char      *method_name,
-                             DBusMessageIter *arg_iter,
-                             DBusMessageIter *dict_iter)
+big_dbus_proxy_new_json_call(BigDBusProxy* proxy,
+                             const char* method_name,
+                             DBusMessageIter* arg_iter,
+                             DBusMessageIter* dict_iter)
 {
-    DBusMessage *message;
+    DBusMessage* message;
 
     message = big_dbus_proxy_new_method_call(proxy, method_name);
 
     dbus_message_iter_init_append(message, arg_iter);
-    dbus_message_iter_open_container(arg_iter, DBUS_TYPE_ARRAY, "{sv}", dict_iter);
+    dbus_message_iter_open_container(arg_iter, DBUS_TYPE_ARRAY, "{sv}",
+                                     dict_iter);
 
     return message;
 }
 
 static ReplyClosure*
-reply_closure_new(BigDBusProxy              *proxy,
-                  BigDBusProxyReplyFunc      plain_func,
-                  BigDBusProxyJsonReplyFunc  json_func,
+reply_closure_new(BigDBusProxy* proxy,
+                  BigDBusProxyReplyFunc plain_func,
+                  BigDBusProxyJsonReplyFunc json_func,
                   BigDBusProxyErrorReplyFunc error_func,
-                  void                      *data)
+                  void* data)
 {
-    ReplyClosure *c;
+    ReplyClosure* c;
 
     c = g_slice_new0(ReplyClosure);
 
@@ -357,19 +347,18 @@ reply_closure_new(BigDBusProxy              *proxy,
 }
 
 static void
-reply_closure_free(ReplyClosure *c)
+reply_closure_free(ReplyClosure* c)
 {
     /* call exactly one of these */
-    g_assert(!(c->error_invoked &&
-               c->reply_invoked));
+    g_assert(!(c->error_invoked && c->reply_invoked));
 
-    if (!(c->error_invoked ||
-          c->reply_invoked)) {
+    if (!(c->error_invoked || c->reply_invoked)) {
         c->error_invoked = TRUE;
         if (c->error_func) {
-            (* c->error_func) (c->proxy, DBUS_ERROR_FAILED,
-                               "Pending call was freed (due to dbus_shutdown() probably) before it was ever notified",
-                               c->data);
+            (*c->error_func)(c->proxy, DBUS_ERROR_FAILED,
+                             "Pending call was freed (due to dbus_shutdown() "
+                             "probably) before it was ever notified",
+                             c->data);
         }
     }
 
@@ -378,8 +367,7 @@ reply_closure_free(ReplyClosure *c)
 }
 
 static void
-reply_closure_invoke_error(ReplyClosure *c,
-                           DBusMessage  *reply)
+reply_closure_invoke_error(ReplyClosure* c, DBusMessage* reply)
 {
     g_assert(dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR);
 
@@ -395,17 +383,14 @@ reply_closure_invoke_error(ReplyClosure *c,
 
         dbus_set_error_from_message(&derror, reply);
 
-        (* c->error_func) (c->proxy, derror.name,
-                           derror.message,
-                           c->data);
+        (*c->error_func)(c->proxy, derror.name, derror.message, c->data);
 
         dbus_error_free(&derror);
     }
 }
 
 static void
-reply_closure_invoke(ReplyClosure *c,
-                     DBusMessage  *reply)
+reply_closure_invoke(ReplyClosure* c, DBusMessage* reply)
 {
     if (c->type == REPLY_CLOSURE_PLAIN) {
         if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN) {
@@ -415,9 +400,7 @@ reply_closure_invoke(ReplyClosure *c,
             c->reply_invoked = TRUE;
 
             if (c->func.plain != NULL) {
-                (* c->func.plain) (c->proxy,
-                                   reply,
-                                   c->data);
+                (*c->func.plain)(c->proxy, reply, c->data);
             }
         } else if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
             reply_closure_invoke_error(c, reply);
@@ -428,9 +411,9 @@ reply_closure_invoke(ReplyClosure *c,
             c->error_invoked = TRUE;
 
             if (c->error_func) {
-                (* c->error_func) (c->proxy, DBUS_ERROR_FAILED,
-                                   "Got weird message type back as a reply",
-                                   c->data);
+                (*c->error_func)(c->proxy, DBUS_ERROR_FAILED,
+                                 "Got weird message type back as a reply",
+                                 c->data);
             }
         }
     } else if (c->type == REPLY_CLOSURE_JSON) {
@@ -448,10 +431,7 @@ reply_closure_invoke(ReplyClosure *c,
                     dbus_message_iter_init(reply, &arg_iter);
                     dbus_message_iter_recurse(&arg_iter, &dict_iter);
 
-                    (* c->func.json) (c->proxy,
-                                      reply,
-                                      &dict_iter,
-                                      c->data);
+                    (*c->func.json)(c->proxy, reply, &dict_iter, c->data);
                 }
             } else {
                 g_assert(!c->reply_invoked);
@@ -460,10 +440,10 @@ reply_closure_invoke(ReplyClosure *c,
                 c->error_invoked = TRUE;
 
                 if (c->error_func) {
-                    (* c->error_func) (c->proxy,
-                                       DBUS_ERROR_FAILED,
-                                       "Message we got back did not have the right signature",
-                                       c->data);
+                    (*c->error_func)(
+                      c->proxy, DBUS_ERROR_FAILED,
+                      "Message we got back did not have the right signature",
+                      c->data);
                 }
             }
         } else if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
@@ -475,9 +455,9 @@ reply_closure_invoke(ReplyClosure *c,
             c->error_invoked = TRUE;
 
             if (c->error_func) {
-                (* c->error_func) (c->proxy, DBUS_ERROR_FAILED,
-                                   "Got weird message type back as a reply",
-                                   c->data);
+                (*c->error_func)(c->proxy, DBUS_ERROR_FAILED,
+                                 "Got weird message type back as a reply",
+                                 c->data);
             }
         }
     } else {
@@ -485,11 +465,10 @@ reply_closure_invoke(ReplyClosure *c,
     }
 }
 
-
 static gboolean
-failed_to_send_idle(void *data)
+failed_to_send_idle(void* data)
 {
-    ReplyClosure *c;
+    ReplyClosure* c;
 
     c = data;
 
@@ -499,10 +478,8 @@ failed_to_send_idle(void *data)
     c->error_invoked = TRUE;
 
     if (c->error_func) {
-        (* c->error_func) (c->proxy,
-                           DBUS_ERROR_NO_MEMORY,
-                           "Unable to send method call",
-                           c->data);
+        (*c->error_func)(c->proxy, DBUS_ERROR_NO_MEMORY,
+                         "Unable to send method call", c->data);
     }
 
     reply_closure_free(c);
@@ -510,13 +487,11 @@ failed_to_send_idle(void *data)
     return FALSE;
 }
 
-
 static void
-pending_call_notify(DBusPendingCall *pending,
-                    void            *user_data)
+pending_call_notify(DBusPendingCall* pending, void* user_data)
 {
-    DBusMessage *reply;
-    ReplyClosure *c;
+    DBusMessage* reply;
+    ReplyClosure* c;
 
     big_debug(BIG_DEBUG_UTIL_DBUS,
               "BigDBusProxy received reply to pending call");
@@ -540,10 +515,8 @@ pending_call_notify(DBusPendingCall *pending,
         c->error_invoked = TRUE;
 
         if (c->error_func) {
-            (* c->error_func) (c->proxy,
-                               DBUS_ERROR_TIMED_OUT,
-                               "Did not receive a reply or error",
-                               c->data);
+            (*c->error_func)(c->proxy, DBUS_ERROR_TIMED_OUT,
+                             "Did not receive a reply or error", c->data);
         }
     }
 
@@ -551,41 +524,40 @@ pending_call_notify(DBusPendingCall *pending,
 }
 
 static void
-pending_call_free_data(void *data)
+pending_call_free_data(void* data)
 {
-    ReplyClosure *c = data;
+    ReplyClosure* c = data;
     reply_closure_free(c);
 }
 
 static void
-big_dbus_proxy_send_internal(BigDBusProxy              *proxy,
-                             DBusMessage               *message,
-                             BigDBusProxyReplyFunc      plain_func,
-                             BigDBusProxyJsonReplyFunc  json_func,
+big_dbus_proxy_send_internal(BigDBusProxy* proxy,
+                             DBusMessage* message,
+                             BigDBusProxyReplyFunc plain_func,
+                             BigDBusProxyJsonReplyFunc json_func,
                              BigDBusProxyErrorReplyFunc error_func,
-                             void                      *data)
+                             void* data)
 {
-    ReplyClosure *c;
-    DBusPendingCall *pending;
+    ReplyClosure* c;
+    DBusPendingCall* pending;
 
     if (!(plain_func || json_func || error_func)) {
         /* Fire and forget! */
 
-        big_debug(BIG_DEBUG_UTIL_DBUS,
-                  "Firing and forgetting dbus proxy call");
+        big_debug(BIG_DEBUG_UTIL_DBUS, "Firing and forgetting dbus proxy call");
 
         dbus_connection_send(proxy->connection, message, NULL);
         return;
     }
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Sending dbus proxy call %s",
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Sending dbus proxy call %s",
               dbus_message_get_member(message));
 
     c = reply_closure_new(proxy, plain_func, json_func, error_func, data);
     pending = NULL;
-    if (!dbus_connection_send_with_reply(proxy->connection, message, &pending, -1) ||
-        pending == NULL) {
+    if (!dbus_connection_send_with_reply(proxy->connection, message, &pending,
+                                         -1)
+        || pending == NULL) {
 
         big_debug(BIG_DEBUG_UTIL_DBUS,
                   "Failed to send call, will report error in idle handler");
@@ -598,27 +570,30 @@ big_dbus_proxy_send_internal(BigDBusProxy              *proxy,
     dbus_pending_call_set_notify(pending, pending_call_notify, c,
                                  pending_call_free_data);
 
-    dbus_pending_call_unref(pending); /* DBusConnection should still hold a ref until it's completed */
+    dbus_pending_call_unref(
+      pending); /* DBusConnection should still hold a ref until it's completed
+                   */
 }
 
 void
-big_dbus_proxy_send(BigDBusProxy              *proxy,
-                    DBusMessage               *message,
-                    BigDBusProxyReplyFunc      reply_func,
+big_dbus_proxy_send(BigDBusProxy* proxy,
+                    DBusMessage* message,
+                    BigDBusProxyReplyFunc reply_func,
                     BigDBusProxyErrorReplyFunc error_func,
-                    void                      *data)
+                    void* data)
 {
-    big_dbus_proxy_send_internal(proxy, message, reply_func, NULL, error_func, data);
+    big_dbus_proxy_send_internal(proxy, message, reply_func, NULL, error_func,
+                                 data);
 }
 
 static void
-append_entries_from_valist(DBusMessageIter *dict_iter,
-                           const char      *first_key,
-                           va_list          args)
+append_entries_from_valist(DBusMessageIter* dict_iter,
+                           const char* first_key,
+                           va_list args)
 {
-    const char *key;
+    const char* key;
     int dbus_type;
-    void *value_p;
+    void* value_p;
 
     key = first_key;
     dbus_type = va_arg(args, int);
@@ -638,19 +613,20 @@ append_entries_from_valist(DBusMessageIter *dict_iter,
 }
 
 void
-big_dbus_proxy_call_json_async (BigDBusProxy              *proxy,
-                                const char                *method_name,
-                                BigDBusProxyJsonReplyFunc  reply_func,
-                                BigDBusProxyErrorReplyFunc error_func,
-                                void                      *data,
-                                const char                *first_key,
-                                ...)
+big_dbus_proxy_call_json_async(BigDBusProxy* proxy,
+                               const char* method_name,
+                               BigDBusProxyJsonReplyFunc reply_func,
+                               BigDBusProxyErrorReplyFunc error_func,
+                               void* data,
+                               const char* first_key,
+                               ...)
 {
     DBusMessageIter arg_iter, dict_iter;
-    DBusMessage *message;
+    DBusMessage* message;
     va_list args;
 
-    message = big_dbus_proxy_new_json_call(proxy, method_name, &arg_iter, &dict_iter);
+    message
+      = big_dbus_proxy_new_json_call(proxy, method_name, &arg_iter, &dict_iter);
 
     if (first_key != NULL) {
         va_start(args, first_key);
@@ -660,7 +636,8 @@ big_dbus_proxy_call_json_async (BigDBusProxy              *proxy,
 
     dbus_message_iter_close_container(&arg_iter, &dict_iter);
 
-    big_dbus_proxy_send_internal(proxy, message, NULL, reply_func, error_func, data);
+    big_dbus_proxy_send_internal(proxy, message, NULL, reply_func, error_func,
+                                 data);
 
     dbus_message_unref(message);
 }
diff --git a/modules/dbus/util/dbus-proxy.h b/modules/dbus/util/dbus-proxy.h
index 6b793e6..c90e2f4 100644
--- a/modules/dbus/util/dbus-proxy.h
+++ b/modules/dbus/util/dbus-proxy.h
@@ -9,49 +9,52 @@
 
 G_BEGIN_DECLS
 
-
-typedef struct _BigDBusProxy      BigDBusProxy;
+typedef struct _BigDBusProxy BigDBusProxy;
 typedef struct _BigDBusProxyClass BigDBusProxyClass;
 
-typedef void (* BigDBusProxyReplyFunc)      (BigDBusProxy    *proxy,
-                                             DBusMessage     *message,
-                                             void            *data);
-typedef void (* BigDBusProxyJsonReplyFunc)  (BigDBusProxy    *proxy,
-                                             DBusMessage     *message,
-                                             DBusMessageIter *return_value_iter,
-                                             void            *data);
-typedef void (* BigDBusProxyErrorReplyFunc) (BigDBusProxy    *proxy,
-                                             const char      *error_name,
-                                             const char      *error_message,
-                                             void            *data);
-
-#define BIG_TYPE_DBUS_PROXY              (big_dbus_proxy_get_type ())
-#define BIG_DBUS_PROXY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), BIG_TYPE_DBUS_PROXY, BigDBusProxy))
-#define BIG_DBUS_PROXY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), BIG_TYPE_DBUS_PROXY, BigDBusProxyClass))
-#define BIG_IS_DBUS_PROXY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), BIG_TYPE_DBUS_PROXY))
-#define BIG_IS_DBUS_PROXY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), BIG_TYPE_DBUS_PROXY))
-#define BIG_DBUS_PROXY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), BIG_TYPE_DBUS_PROXY, BigDBusProxyClass))
+typedef void (*BigDBusProxyReplyFunc)(BigDBusProxy* proxy,
+                                      DBusMessage* message,
+                                      void* data);
+typedef void (*BigDBusProxyJsonReplyFunc)(BigDBusProxy* proxy,
+                                          DBusMessage* message,
+                                          DBusMessageIter* return_value_iter,
+                                          void* data);
+typedef void (*BigDBusProxyErrorReplyFunc)(BigDBusProxy* proxy,
+                                           const char* error_name,
+                                           const char* error_message,
+                                           void* data);
 
-GType           big_dbus_proxy_get_type      (void) G_GNUC_CONST;
+#define BIG_TYPE_DBUS_PROXY (big_dbus_proxy_get_type())
+#define BIG_DBUS_PROXY(object)                                                 \
+    (G_TYPE_CHECK_INSTANCE_CAST((object), BIG_TYPE_DBUS_PROXY, BigDBusProxy))
+#define BIG_DBUS_PROXY_CLASS(klass)                                            \
+    (G_TYPE_CHECK_CLASS_CAST((klass), BIG_TYPE_DBUS_PROXY, BigDBusProxyClass))
+#define BIG_IS_DBUS_PROXY(object)                                              \
+    (G_TYPE_CHECK_INSTANCE_TYPE((object), BIG_TYPE_DBUS_PROXY))
+#define BIG_IS_DBUS_PROXY_CLASS(klass)                                         \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), BIG_TYPE_DBUS_PROXY))
+#define BIG_DBUS_PROXY_GET_CLASS(obj)                                          \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), BIG_TYPE_DBUS_PROXY, BigDBusProxyClass))
 
+GType big_dbus_proxy_get_type(void) G_GNUC_CONST;
 
-BigDBusProxy*   big_dbus_proxy_new             (DBusConnection             *connection,
-                                                const char                 *bus_name,
-                                                const char                 *object_path,
-                                                const char                 *iface);
-DBusConnection* big_dbus_proxy_get_connection  (BigDBusProxy               *proxy);
-const char*     big_dbus_proxy_get_bus_name    (BigDBusProxy               *proxy);
-DBusMessage*    big_dbus_proxy_new_method_call (BigDBusProxy               *proxy,
-                                                const char                 *method_name);
-DBusMessage*    big_dbus_proxy_new_json_call   (BigDBusProxy               *proxy,
-                                                const char                 *method_name,
-                                                DBusMessageIter            *arg_iter,
-                                                DBusMessageIter            *dict_iter);
-void            big_dbus_proxy_send            (BigDBusProxy               *proxy,
-                                                DBusMessage                *message,
-                                                BigDBusProxyReplyFunc       reply_func,
-                                                BigDBusProxyErrorReplyFunc  error_func,
-                                                void                       *data);
+BigDBusProxy* big_dbus_proxy_new(DBusConnection* connection,
+                                 const char* bus_name,
+                                 const char* object_path,
+                                 const char* iface);
+DBusConnection* big_dbus_proxy_get_connection(BigDBusProxy* proxy);
+const char* big_dbus_proxy_get_bus_name(BigDBusProxy* proxy);
+DBusMessage* big_dbus_proxy_new_method_call(BigDBusProxy* proxy,
+                                            const char* method_name);
+DBusMessage* big_dbus_proxy_new_json_call(BigDBusProxy* proxy,
+                                          const char* method_name,
+                                          DBusMessageIter* arg_iter,
+                                          DBusMessageIter* dict_iter);
+void big_dbus_proxy_send(BigDBusProxy* proxy,
+                         DBusMessage* message,
+                         BigDBusProxyReplyFunc reply_func,
+                         BigDBusProxyErrorReplyFunc error_func,
+                         void* data);
 
 /* varargs are like:
  *
@@ -61,14 +64,14 @@ void            big_dbus_proxy_send            (BigDBusProxy               *prox
  *
  * Basic types only (no arrays)
  */
-void          big_dbus_proxy_call_json_async (BigDBusProxy              *proxy,
-                                              const char                *method_name,
-                                              BigDBusProxyJsonReplyFunc  reply_func,
-                                              BigDBusProxyErrorReplyFunc error_func,
-                                              void                      *data,
-                                              const char                *first_key,
-                                              ...);
+void big_dbus_proxy_call_json_async(BigDBusProxy* proxy,
+                                    const char* method_name,
+                                    BigDBusProxyJsonReplyFunc reply_func,
+                                    BigDBusProxyErrorReplyFunc error_func,
+                                    void* data,
+                                    const char* first_key,
+                                    ...);
 
 G_END_DECLS
 
-#endif  /* __BIG_UTIL_DBUS_PROXY_H__ */
+#endif /* __BIG_UTIL_DBUS_PROXY_H__ */
diff --git a/modules/dbus/util/dbus-signals.c b/modules/dbus/util/dbus-signals.c
index f2e5ba2..e91d4e6 100644
--- a/modules/dbus/util/dbus-signals.c
+++ b/modules/dbus/util/dbus-signals.c
@@ -10,41 +10,41 @@
 
 #define INVALID_SIGNAL_ID (-1)
 
-typedef struct {
-    DBusBusType            bus_type;
-    int                    refcount;
-    char                  *sender;
-    char                  *path;
-    char                  *iface;
-    char                  *name;
-    BigDBusSignalHandler   handler;
-    void                  *data;
-    GDestroyNotify         data_dnotify;
-    int                    id;
-    unsigned int           matching : 1;
-    unsigned int           destroyed : 1;
+typedef struct
+{
+    DBusBusType bus_type;
+    int refcount;
+    char* sender;
+    char* path;
+    char* iface;
+    char* name;
+    BigDBusSignalHandler handler;
+    void* data;
+    GDestroyNotify data_dnotify;
+    int id;
+    unsigned int matching : 1;
+    unsigned int destroyed : 1;
 } BigSignalWatcher;
 
-static GSList *pending_signal_watchers = NULL;
-
-static void signal_watcher_remove (DBusConnection   *connection,
-                                   BigDBusInfo      *info,
-                                   BigSignalWatcher *watcher);
+static GSList* pending_signal_watchers = NULL;
 
+static void signal_watcher_remove(DBusConnection* connection,
+                                  BigDBusInfo* info,
+                                  BigSignalWatcher* watcher);
 
 static int global_handler_id = 0;
 
 static BigSignalWatcher*
-signal_watcher_new(DBusBusType                  bus_type,
-                   const char                  *sender,
-                   const char                  *path,
-                   const char                  *iface,
-                   const char                  *name,
-                   BigDBusSignalHandler         handler,
-                   void                        *data,
-                   GDestroyNotify               data_dnotify)
+signal_watcher_new(DBusBusType bus_type,
+                   const char* sender,
+                   const char* path,
+                   const char* iface,
+                   const char* name,
+                   BigDBusSignalHandler handler,
+                   void* data,
+                   GDestroyNotify data_dnotify)
 {
-    BigSignalWatcher *watcher;
+    BigSignalWatcher* watcher;
 
     watcher = g_slice_new0(BigSignalWatcher);
 
@@ -64,23 +64,23 @@ signal_watcher_new(DBusBusType                  bus_type,
 }
 
 static void
-signal_watcher_dnotify(BigSignalWatcher *watcher)
+signal_watcher_dnotify(BigSignalWatcher* watcher)
 {
     if (watcher->data_dnotify != NULL) {
-        (* watcher->data_dnotify) (watcher->data);
+        (*watcher->data_dnotify)(watcher->data);
         watcher->data_dnotify = NULL;
     }
     watcher->destroyed = TRUE;
 }
 
 static void
-signal_watcher_ref(BigSignalWatcher *watcher)
+signal_watcher_ref(BigSignalWatcher* watcher)
 {
     watcher->refcount += 1;
 }
 
 static void
-signal_watcher_unref(BigSignalWatcher *watcher)
+signal_watcher_unref(BigSignalWatcher* watcher)
 {
     watcher->refcount -= 1;
 
@@ -97,9 +97,9 @@ signal_watcher_unref(BigSignalWatcher *watcher)
 }
 
 static char*
-signal_watcher_build_match_rule(BigSignalWatcher *watcher)
+signal_watcher_build_match_rule(BigSignalWatcher* watcher)
 {
-    GString *s;
+    GString* s;
 
     s = g_string_new("type='signal'");
 
@@ -122,10 +122,8 @@ signal_watcher_build_match_rule(BigSignalWatcher *watcher)
     return g_string_free(s, FALSE);
 }
 
-
 static GSList*
-signal_watcher_table_lookup(GHashTable *table,
-                            const char *key)
+signal_watcher_table_lookup(GHashTable* table, const char* key)
 {
     if (table == NULL) {
         return NULL;
@@ -135,11 +133,11 @@ signal_watcher_table_lookup(GHashTable *table,
 }
 
 static void
-signal_watcher_list_free(void *data)
+signal_watcher_list_free(void* data)
 {
-    GSList *l = data;
+    GSList* l = data;
     while (l != NULL) {
-        GSList *next = l->next;
+        GSList* next = l->next;
         signal_watcher_unref(l->data);
         g_slist_free_1(l);
         l = next;
@@ -147,25 +145,22 @@ signal_watcher_list_free(void *data)
 }
 
 static void
-signal_watcher_table_add(GHashTable      **table_p,
-                         const char       *key,
-                         BigSignalWatcher *watcher)
+signal_watcher_table_add(GHashTable** table_p,
+                         const char* key,
+                         BigSignalWatcher* watcher)
 {
-    GSList *list;
-    char *original_key;
+    GSList* list;
+    char* original_key;
 
     if (*table_p == NULL) {
         list = NULL;
         original_key = g_strdup(key);
-        *table_p = g_hash_table_new_full(g_str_hash,
-                                         g_str_equal,
-                                         g_free,
+        *table_p = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
                                          signal_watcher_list_free);
     } else {
-        if (!g_hash_table_lookup_extended(*table_p,
-                                          key,
-                                          (gpointer*)&original_key,
-                                          (gpointer*)&list)) {
+        if (!g_hash_table_lookup_extended(*table_p, key,
+                                          (gpointer*) &original_key,
+                                          (gpointer*) &list)) {
             original_key = g_strdup(key);
             list = NULL;
         }
@@ -179,21 +174,19 @@ signal_watcher_table_add(GHashTable      **table_p,
 }
 
 static void
-signal_watcher_table_remove(GHashTable       *table,
-                            const char       *key,
-                            BigSignalWatcher *watcher)
+signal_watcher_table_remove(GHashTable* table,
+                            const char* key,
+                            BigSignalWatcher* watcher)
 {
-    GSList *list;
-    GSList *l;
-    char *original_key;
+    GSList* list;
+    GSList* l;
+    char* original_key;
 
     if (table == NULL)
         return; /* Never lazily-created the table, nothing ever added */
 
-    if (!g_hash_table_lookup_extended(table,
-                                      key,
-                                      (gpointer*)&original_key,
-                                      (gpointer*)&list)) {
+    if (!g_hash_table_lookup_extended(table, key, (gpointer*) &original_key,
+                                      (gpointer*) &list)) {
         return;
     }
 
@@ -214,10 +207,10 @@ signal_watcher_table_remove(GHashTable       *table,
 }
 
 static void
-signal_emitter_name_appeared(DBusConnection *connection,
-                             const char     *name,
-                             const char     *new_owner_unique_name,
-                             void           *data)
+signal_emitter_name_appeared(DBusConnection* connection,
+                             const char* name,
+                             const char* new_owner_unique_name,
+                             void* data)
 {
     /* We don't need to do anything here, we installed a name watch so
      * we could call big_dbus_get_watched_name_owner() to dispatch
@@ -226,26 +219,25 @@ signal_emitter_name_appeared(DBusConnection *connection,
 }
 
 static void
-signal_emitter_name_vanished(DBusConnection *connection,
-                             const char     *name,
-                             const char     *old_owner_unique_name,
-                             void           *data)
+signal_emitter_name_vanished(DBusConnection* connection,
+                             const char* name,
+                             const char* old_owner_unique_name,
+                             void* data)
 {
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Signal emitter '%s' is now gone",
-              name);
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Signal emitter '%s' is now gone", name);
 
     /* If a watcher is matching on a unique name sender, once the unique
      * name goes away, the watcher can never see anything so nuke it.
      */
     if (*name == ':') {
-        GSList *list;
-        BigDBusInfo *info;
+        GSList* list;
+        BigDBusInfo* info;
 
         info = _big_dbus_ensure_info(connection);
 
-        list = signal_watcher_table_lookup(info->signal_watchers_by_unique_sender,
-                                           name);
+        list
+          = signal_watcher_table_lookup(info->signal_watchers_by_unique_sender,
+                                        name);
 
         if (list == NULL)
             return;
@@ -261,17 +253,15 @@ signal_emitter_name_vanished(DBusConnection *connection,
     }
 }
 
-static BigDBusWatchNameFuncs signal_emitter_name_funcs = {
-    signal_emitter_name_appeared,
-    signal_emitter_name_vanished
-};
+static BigDBusWatchNameFuncs signal_emitter_name_funcs
+  = { signal_emitter_name_appeared, signal_emitter_name_vanished };
 
 static void
-signal_watcher_set_matching(DBusConnection   *connection,
-                            BigSignalWatcher *watcher,
-                            gboolean          matching)
+signal_watcher_set_matching(DBusConnection* connection,
+                            BigSignalWatcher* watcher,
+                            gboolean matching)
 {
-    char *rule;
+    char* rule;
 
     if (watcher->matching == (matching != FALSE)) {
         return;
@@ -291,8 +281,8 @@ signal_watcher_set_matching(DBusConnection   *connection,
     rule = signal_watcher_build_match_rule(watcher);
 
     if (matching)
-        dbus_bus_add_match(connection,
-                           rule, NULL); /* asking for error would make this block */
+        dbus_bus_add_match(connection, rule,
+                           NULL); /* asking for error would make this block */
     else
         dbus_bus_remove_match(connection, rule, NULL);
 
@@ -306,115 +296,102 @@ signal_watcher_set_matching(DBusConnection   *connection,
          * the watcher if the unique name goes away
          */
         if (matching) {
-            big_dbus_watch_name(watcher->bus_type,
-                                watcher->sender,
-                                0,
-                                &signal_emitter_name_funcs,
-                                NULL);
+            big_dbus_watch_name(watcher->bus_type, watcher->sender, 0,
+                                &signal_emitter_name_funcs, NULL);
         } else {
-            big_dbus_unwatch_name(watcher->bus_type,
-                                  watcher->sender,
-                                  &signal_emitter_name_funcs,
-                                  NULL);
+            big_dbus_unwatch_name(watcher->bus_type, watcher->sender,
+                                  &signal_emitter_name_funcs, NULL);
         }
     }
 }
 
 static void
-signal_watcher_add(DBusConnection   *connection,
-                   BigDBusInfo      *info,
-                   BigSignalWatcher *watcher)
+signal_watcher_add(DBusConnection* connection,
+                   BigDBusInfo* info,
+                   BigSignalWatcher* watcher)
 {
     gboolean in_some_table;
 
     signal_watcher_set_matching(connection, watcher, TRUE);
 
-    info->all_signal_watchers = g_slist_prepend(info->all_signal_watchers, watcher);
+    info->all_signal_watchers
+      = g_slist_prepend(info->all_signal_watchers, watcher);
     signal_watcher_ref(watcher);
 
     in_some_table = FALSE;
 
     if (watcher->sender && *(watcher->sender) == ':') {
         signal_watcher_table_add(&info->signal_watchers_by_unique_sender,
-                                 watcher->sender,
-                                 watcher);
+                                 watcher->sender, watcher);
         in_some_table = TRUE;
     }
 
     if (watcher->path) {
-        signal_watcher_table_add(&info->signal_watchers_by_path,
-                                 watcher->path,
+        signal_watcher_table_add(&info->signal_watchers_by_path, watcher->path,
                                  watcher);
         in_some_table = TRUE;
     }
 
     if (watcher->iface) {
         signal_watcher_table_add(&info->signal_watchers_by_iface,
-                                 watcher->iface,
-                                 watcher);
+                                 watcher->iface, watcher);
         in_some_table = TRUE;
     }
 
     if (watcher->name) {
         signal_watcher_table_add(&info->signal_watchers_by_signal,
-                                 watcher->name,
-                                 watcher);
+                                 watcher->name, watcher);
         in_some_table = TRUE;
     }
 
     if (!in_some_table) {
-        info->signal_watchers_in_no_table =
-            g_slist_prepend(info->signal_watchers_in_no_table,
-                            watcher);
+        info->signal_watchers_in_no_table
+          = g_slist_prepend(info->signal_watchers_in_no_table, watcher);
         signal_watcher_ref(watcher);
     }
 }
 
 static void
-signal_watcher_remove(DBusConnection   *connection,
-                      BigDBusInfo      *info,
-                      BigSignalWatcher *watcher)
+signal_watcher_remove(DBusConnection* connection,
+                      BigDBusInfo* info,
+                      BigSignalWatcher* watcher)
 {
     gboolean in_some_table;
 
     signal_watcher_set_matching(connection, watcher, FALSE);
 
-    info->all_signal_watchers = g_slist_remove(info->all_signal_watchers, watcher);
+    info->all_signal_watchers
+      = g_slist_remove(info->all_signal_watchers, watcher);
 
     in_some_table = FALSE;
 
     if (watcher->sender && *(watcher->sender) == ':') {
         signal_watcher_table_remove(info->signal_watchers_by_unique_sender,
-                                    watcher->sender,
-                                    watcher);
+                                    watcher->sender, watcher);
         in_some_table = TRUE;
     }
 
     if (watcher->path) {
         signal_watcher_table_remove(info->signal_watchers_by_path,
-                                    watcher->path,
-                                    watcher);
+                                    watcher->path, watcher);
         in_some_table = TRUE;
     }
 
     if (watcher->iface) {
         signal_watcher_table_remove(info->signal_watchers_by_iface,
-                                    watcher->iface,
-                                    watcher);
+                                    watcher->iface, watcher);
         in_some_table = TRUE;
     }
 
     if (watcher->name) {
         signal_watcher_table_remove(info->signal_watchers_by_signal,
-                                    watcher->name,
-                                    watcher);
+                                    watcher->name, watcher);
         in_some_table = TRUE;
     }
 
     if (!in_some_table) {
-        info->signal_watchers_in_no_table =
-            g_slist_remove(info->signal_watchers_in_no_table,
-                           watcher);
+        info->signal_watchers_in_no_table
+          = g_slist_remove(info->signal_watchers_in_no_table, watcher);
         signal_watcher_unref(watcher);
     }
 
@@ -433,14 +410,14 @@ signal_watcher_remove(DBusConnection   *connection,
  * callback needs to be first.
  */
 void
-_big_dbus_process_pending_signal_watchers(DBusConnection *connection,
-                                          BigDBusInfo    *info)
+_big_dbus_process_pending_signal_watchers(DBusConnection* connection,
+                                          BigDBusInfo* info)
 {
-    GSList *remaining;
+    GSList* remaining;
 
     remaining = NULL;
     while (pending_signal_watchers) {
-        BigSignalWatcher *watcher = pending_signal_watchers->data;
+        BigSignalWatcher* watcher = pending_signal_watchers->data;
         pending_signal_watchers = g_slist_delete_link(pending_signal_watchers,
                                                       pending_signal_watchers);
 
@@ -460,8 +437,7 @@ _big_dbus_process_pending_signal_watchers(DBusConnection *connection,
 }
 
 static void
-signal_watchers_disconnected(DBusConnection *connection,
-                             BigDBusInfo    *info)
+signal_watchers_disconnected(DBusConnection* connection, BigDBusInfo* info)
 {
     /* None should be pending on this bus, because at start of
      * _big_dbus_signal_watch_filter_message() we process all the pending ones.
@@ -469,26 +445,23 @@ signal_watchers_disconnected(DBusConnection *connection,
      * another bus. Anyway bottom line we can ignore pending_signal_watchers
      * in here.
      */
-    GSList *list;
-    GSList *destroyed;
+    GSList* list;
+    GSList* destroyed;
 
     /* Build a separate list to destroy to avoid re-entrancy as we are
      * walking the list
      */
     destroyed = NULL;
-    for (list = info->all_signal_watchers;
-         list != NULL;
-         list = list->next) {
-        BigSignalWatcher *watcher = list->data;
+    for (list = info->all_signal_watchers; list != NULL; list = list->next) {
+        BigSignalWatcher* watcher = list->data;
         if (watcher->sender && *(watcher->sender) == ':') {
-            destroyed = g_slist_prepend(destroyed,
-                                        watcher);
+            destroyed = g_slist_prepend(destroyed, watcher);
             signal_watcher_ref(watcher);
         }
     }
 
     while (destroyed != NULL) {
-        BigSignalWatcher *watcher = destroyed->data;
+        BigSignalWatcher* watcher = destroyed->data;
         destroyed = g_slist_delete_link(destroyed, destroyed);
 
         signal_watcher_remove(connection, info, watcher);
@@ -497,46 +470,39 @@ signal_watchers_disconnected(DBusConnection *connection,
 }
 
 static void
-concat_candidates(GSList    **candidates_p,
-                  GHashTable *table,
-                  const char *key)
+concat_candidates(GSList** candidates_p, GHashTable* table, const char* key)
 {
-    GSList *list;
+    GSList* list;
 
     list = signal_watcher_table_lookup(table, key);
     if (list == NULL)
         return;
 
-    *candidates_p = g_slist_concat(*candidates_p,
-                                   g_slist_copy(list));
+    *candidates_p = g_slist_concat(*candidates_p, g_slist_copy(list));
 }
 
 static int
-direct_cmp(gconstpointer a,
-           gconstpointer b)
+direct_cmp(gconstpointer a, gconstpointer b)
 {
     /* gcc dislikes pointer math on void* so cast */
-    return ((const char*)a) - ((const char*)b);
+    return ((const char*) a) - ((const char*) b);
 }
 
 static gboolean
-signal_watcher_watches(BigDBusInfo      *info,
-                       BigSignalWatcher *watcher,
-                       const char       *sender,
-                       const char       *path,
-                       const char       *iface,
-                       const char       *name)
+signal_watcher_watches(BigDBusInfo* info,
+                       BigSignalWatcher* watcher,
+                       const char* sender,
+                       const char* path,
+                       const char* iface,
+                       const char* name)
 {
-    if (watcher->path &&
-        strcmp(watcher->path, path) != 0)
+    if (watcher->path && strcmp(watcher->path, path) != 0)
         return FALSE;
 
-    if (watcher->iface &&
-        strcmp(watcher->iface, iface) != 0)
+    if (watcher->iface && strcmp(watcher->iface, iface) != 0)
         return FALSE;
 
-    if (watcher->name &&
-        strcmp(watcher->name, name) != 0)
+    if (watcher->name && strcmp(watcher->name, name) != 0)
         return FALSE;
 
     /* "sender" from message is always the unique name, but
@@ -546,17 +512,15 @@ signal_watcher_watches(BigDBusInfo      *info,
     if (watcher->sender == NULL)
         return TRUE;
 
-
-    if (* (watcher->sender) == ':') {
+    if (*(watcher->sender) == ':') {
         return strcmp(watcher->sender, sender) == 0;
     } else {
-        const char *owner;
+        const char* owner;
 
-        owner = big_dbus_get_watched_name_owner(info->bus_type,
-                                                watcher->sender);
+        owner
+          = big_dbus_get_watched_name_owner(info->bus_type, watcher->sender);
 
-        if (owner != NULL &&
-            strcmp(sender, owner) == 0)
+        if (owner != NULL && strcmp(sender, owner) == 0)
             return TRUE;
         else
             return FALSE;
@@ -564,9 +528,9 @@ signal_watcher_watches(BigDBusInfo      *info,
 }
 
 DBusHandlerResult
-_big_dbus_signal_watch_filter_message(DBusConnection *connection,
-                                      DBusMessage    *message,
-                                      void           *data)
+_big_dbus_signal_watch_filter_message(DBusConnection* connection,
+                                      DBusMessage* message,
+                                      void* data)
 {
     /* Two things we're looking for
      * 1) signals
@@ -574,13 +538,13 @@ _big_dbus_signal_watch_filter_message(DBusConnection *connection,
      *    we want to destroy notify when it vanishes or
      *    when the bus disconnects.
      */
-    BigDBusInfo *info;
-    const char *sender;
-    const char *path;
-    const char *iface;
-    const char *name;
-    GSList *candidates;
-    BigSignalWatcher *previous;
+    BigDBusInfo* info;
+    const char* sender;
+    const char* path;
+    const char* iface;
+    const char* name;
+    GSList* candidates;
+    BigSignalWatcher* previous;
 
     info = _big_dbus_ensure_info(connection);
 
@@ -603,35 +567,28 @@ _big_dbus_signal_watch_filter_message(DBusConnection *connection,
     g_assert(iface != NULL);
     g_assert(name != NULL);
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Signal from %s %s.%s sender %s",
-              path, iface, name, sender ? sender : "(none)");
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Signal from %s %s.%s sender %s", path,
+              iface, name, sender ? sender : "(none)");
 
     candidates = NULL;
 
     if (sender != NULL) {
-        concat_candidates(&candidates,
-                          info->signal_watchers_by_unique_sender,
+        concat_candidates(&candidates, info->signal_watchers_by_unique_sender,
                           sender);
     }
-    concat_candidates(&candidates,
-                      info->signal_watchers_by_path,
-                      path);
-    concat_candidates(&candidates,
-                      info->signal_watchers_by_iface,
-                      iface);
-    concat_candidates(&candidates,
-                      info->signal_watchers_by_signal,
-                      name);
-    candidates = g_slist_concat(candidates,
-                                g_slist_copy(info->signal_watchers_in_no_table));
+    concat_candidates(&candidates, info->signal_watchers_by_path, path);
+    concat_candidates(&candidates, info->signal_watchers_by_iface, iface);
+    concat_candidates(&candidates, info->signal_watchers_by_signal, name);
+    candidates
+      = g_slist_concat(candidates,
+                       g_slist_copy(info->signal_watchers_in_no_table));
 
     /* Sort so we can find dups */
     candidates = g_slist_sort(candidates, direct_cmp);
 
     previous = NULL;
     while (candidates != NULL) {
-        BigSignalWatcher *watcher;
+        BigSignalWatcher* watcher;
 
         watcher = candidates->data;
         candidates = g_slist_delete_link(candidates, candidates);
@@ -641,9 +598,7 @@ _big_dbus_signal_watch_filter_message(DBusConnection *connection,
 
         previous = watcher;
 
-        if (!signal_watcher_watches(info,
-                                    watcher,
-                                    sender, path, iface, name))
+        if (!signal_watcher_watches(info, watcher, sender, path, iface, name))
             continue;
 
         /* destroyed would happen if e.g. removed while we are going
@@ -656,9 +611,7 @@ _big_dbus_signal_watch_filter_message(DBusConnection *connection,
 
         signal_watcher_ref(watcher);
 
-        (* watcher->handler) (connection,
-                              message,
-                              watcher->data);
+        (*watcher->handler)(connection, message, watcher->data);
 
         signal_watcher_unref(watcher);
     }
@@ -676,20 +629,19 @@ _big_dbus_signal_watch_filter_message(DBusConnection *connection,
 }
 
 int
-big_dbus_watch_signal(DBusBusType                  bus_type,
-                      const char                  *sender,
-                      const char                  *path,
-                      const char                  *iface,
-                      const char                  *name,
-                      BigDBusSignalHandler         handler,
-                      void                        *data,
-                      GDestroyNotify               data_dnotify)
+big_dbus_watch_signal(DBusBusType bus_type,
+                      const char* sender,
+                      const char* path,
+                      const char* iface,
+                      const char* name,
+                      BigDBusSignalHandler handler,
+                      void* data,
+                      GDestroyNotify data_dnotify)
 {
-    BigSignalWatcher *watcher;
-    DBusConnection *weak;
+    BigSignalWatcher* watcher;
+    DBusConnection* weak;
 
-    watcher = signal_watcher_new(bus_type, sender, path,
-                                 iface, name, handler,
+    watcher = signal_watcher_new(bus_type, sender, path, iface, name, handler,
                                  data, data_dnotify);
 
     /* If we're already connected, it's essential to get the
@@ -716,7 +668,8 @@ big_dbus_watch_signal(DBusBusType                  bus_type,
         signal_watcher_add(weak, _big_dbus_ensure_info(weak), watcher);
         signal_watcher_unref(watcher);
     } else {
-        pending_signal_watchers = g_slist_prepend(pending_signal_watchers, watcher);
+        pending_signal_watchers
+          = g_slist_prepend(pending_signal_watchers, watcher);
         _big_dbus_ensure_connect_idle(bus_type);
     }
 
@@ -725,15 +678,15 @@ big_dbus_watch_signal(DBusBusType                  bus_type,
 
 /* Does the watcher match a removal request? */
 static gboolean
-signal_watcher_matches(BigSignalWatcher     *watcher,
-                       DBusBusType           bus_type,
-                       const char           *sender,
-                       const char           *path,
-                       const char           *iface,
-                       const char           *name,
-                       int                   id,
-                       BigDBusSignalHandler  handler,
-                       void                 *data)
+signal_watcher_matches(BigSignalWatcher* watcher,
+                       DBusBusType bus_type,
+                       const char* sender,
+                       const char* path,
+                       const char* iface,
+                       const char* name,
+                       int id,
+                       BigDBusSignalHandler handler,
+                       void* data)
 {
     /* If we have an ID, check that first. If it matches, we are
      * done
@@ -770,44 +723,36 @@ signal_watcher_matches(BigSignalWatcher     *watcher,
 }
 
 static void
-unwatch_signal(DBusBusType                  bus_type,
-               const char                  *sender,
-               const char                  *path,
-               const char                  *iface,
-               const char                  *name,
-               int                          id,
-               BigDBusSignalHandler         handler,
-               void                        *data)
+unwatch_signal(DBusBusType bus_type,
+               const char* sender,
+               const char* path,
+               const char* iface,
+               const char* name,
+               int id,
+               BigDBusSignalHandler handler,
+               void* data)
 {
-    GSList *list;
-    DBusConnection *weak;
-    BigDBusInfo *info;
+    GSList* list;
+    DBusConnection* weak;
+    BigDBusInfo* info;
 
     /* Always remove only ONE watcher (the first one we find) */
 
     weak = _big_dbus_get_weak_ref(bus_type);
 
     /* First see if it's still pending */
-    for (list = pending_signal_watchers;
-         list != NULL;
-         list = list->next) {
-        if (signal_watcher_matches(list->data,
-                                   bus_type,
-                                   sender,
-                                   path,
-                                   iface,
-                                   name,
-                                   id,
-                                   handler,
-                                   data)) {
-            BigSignalWatcher *watcher = list->data;
-            pending_signal_watchers = g_slist_remove_link(pending_signal_watchers,
-                                                          list);
+    for (list = pending_signal_watchers; list != NULL; list = list->next) {
+        if (signal_watcher_matches(list->data, bus_type, sender, path, iface,
+                                   name, id, handler, data)) {
+            BigSignalWatcher* watcher = list->data;
+            pending_signal_watchers
+              = g_slist_remove_link(pending_signal_watchers, list);
 
             if (weak != NULL)
                 signal_watcher_set_matching(weak, watcher, FALSE);
 
-            signal_watcher_dnotify(watcher); /* destroy even if we don't finalize */
+            signal_watcher_dnotify(
+              watcher); /* destroy even if we don't finalize */
             signal_watcher_unref(watcher);
             return;
         }
@@ -823,18 +768,9 @@ unwatch_signal(DBusBusType                  bus_type,
 
     info = _big_dbus_ensure_info(weak);
 
-    for (list = info->all_signal_watchers;
-         list != NULL;
-         list = list->next) {
-        if (signal_watcher_matches(list->data,
-                                   bus_type,
-                                   sender,
-                                   path,
-                                   iface,
-                                   name,
-                                   id,
-                                   handler,
-                                   data)) {
+    for (list = info->all_signal_watchers; list != NULL; list = list->next) {
+        if (signal_watcher_matches(list->data, bus_type, sender, path, iface,
+                                   name, id, handler, data)) {
             signal_watcher_remove(weak, info, list->data);
             /* note that "list" node is now invalid */
             return;
@@ -847,36 +783,23 @@ unwatch_signal(DBusBusType                  bus_type,
 }
 
 void
-big_dbus_unwatch_signal(DBusBusType                  bus_type,
-                        const char                  *sender,
-                        const char                  *path,
-                        const char                  *iface,
-                        const char                  *name,
-                        BigDBusSignalHandler         handler,
-                        void                        *data)
+big_dbus_unwatch_signal(DBusBusType bus_type,
+                        const char* sender,
+                        const char* path,
+                        const char* iface,
+                        const char* name,
+                        BigDBusSignalHandler handler,
+                        void* data)
 {
-    unwatch_signal(bus_type,
-                   sender,
-                   path,
-                   iface,
-                   name,
-                   INVALID_SIGNAL_ID,
-                   handler,
-                   data);
+    unwatch_signal(bus_type, sender, path, iface, name, INVALID_SIGNAL_ID,
+                   handler, data);
 }
 
 void
-big_dbus_unwatch_signal_by_id(DBusBusType                  bus_type,
-                              int                          id)
+big_dbus_unwatch_signal_by_id(DBusBusType bus_type, int id)
 {
-    unwatch_signal(bus_type,
-                   NULL,
-                   NULL,
-                   NULL,
-                   NULL,
-                   id,
-                   (BigDBusSignalHandler)NULL,
-                   NULL);
+    unwatch_signal(bus_type, NULL, NULL, NULL, NULL, id,
+                   (BigDBusSignalHandler) NULL, NULL);
 }
 
 #if BIG_BUILD_TESTS
@@ -892,29 +815,29 @@ big_dbus_unwatch_signal_by_id(DBusBusType                  bus_type,
 #include <sys/wait.h>
 
 static pid_t test_service_pid = 0;
-static BigDBusProxy *test_service_proxy = NULL;
+static BigDBusProxy* test_service_proxy = NULL;
 
-static GMainLoop *outer_loop = NULL;
-static GMainLoop *inner_loop = NULL;
+static GMainLoop* outer_loop = NULL;
+static GMainLoop* inner_loop = NULL;
 
 static int n_running_children = 0;
 
-typedef struct {
-    const char *sender;
-    const char *path;
-    const char *iface;
-    const char *member;
+typedef struct
+{
+    const char* sender;
+    const char* path;
+    const char* iface;
+    const char* member;
 } SignalWatchTest;
 
-static SignalWatchTest watch_tests[] = {
-    { NULL, NULL, NULL, NULL },
-    { "com.litl.TestService", NULL, NULL, NULL },
-    { NULL, "/com/litl/test/object42", NULL, NULL },
-    { NULL, NULL, "com.litl.TestIface", NULL },
-    { NULL, NULL, NULL, "TheSignal" }
-};
+static SignalWatchTest watch_tests[]
+  = { { NULL, NULL, NULL, NULL },
+      { "com.litl.TestService", NULL, NULL, NULL },
+      { NULL, "/com/litl/test/object42", NULL, NULL },
+      { NULL, NULL, "com.litl.TestIface", NULL },
+      { NULL, NULL, NULL, "TheSignal" } };
 
-static void do_test_service_child (void);
+static void do_test_service_child(void);
 
 /* quit when all children are gone */
 static void
@@ -962,7 +885,8 @@ static void
 kill_child(void)
 {
     if (kill(test_service_pid, SIGTERM) < 0) {
-        g_error("Test service was no longer around... it must have failed somehow (%s)",
+        g_error("Test service was no longer around... it must have failed "
+                "somehow (%s)",
                 strerror(errno));
     }
 
@@ -973,31 +897,28 @@ static int signal_received_count = 0;
 static int destroy_notify_count = 0;
 
 static void
-the_destroy_notifier(void *data)
+the_destroy_notifier(void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "got destroy notification on signal watch");
+    big_debug(BIG_DEBUG_IN_TESTS, "got destroy notification on signal watch");
     destroy_notify_count += 1;
 }
 
 static void
-the_destroy_notifier_that_quits(void *data)
+the_destroy_notifier_that_quits(void* data)
 {
     the_destroy_notifier(data);
     g_main_loop_quit(inner_loop);
 }
 
 static void
-expect_receive_signal_handler(DBusConnection *connection,
-                              DBusMessage    *message,
-                              void           *data)
+expect_receive_signal_handler(DBusConnection* connection,
+                              DBusMessage* message,
+                              void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "dbus signal watch handler called");
+    big_debug(BIG_DEBUG_IN_TESTS, "dbus signal watch handler called");
 
-    g_assert(dbus_message_is_signal(message,
-                                    "com.litl.TestIface",
-                                    "TheSignal"));
+    g_assert(
+      dbus_message_is_signal(message, "com.litl.TestIface", "TheSignal"));
 
     signal_received_count += 1;
 
@@ -1005,73 +926,51 @@ expect_receive_signal_handler(DBusConnection *connection,
 }
 
 static void
-test_match_combo(const char *sender,
-                 const char *path,
-                 const char *iface,
-                 const char *member)
+test_match_combo(const char* sender,
+                 const char* path,
+                 const char* iface,
+                 const char* member)
 {
     signal_received_count = 0;
     destroy_notify_count = 0;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "Watching %s %s %s %s",
-              sender,
-              path,
-              iface,
+    big_debug(BIG_DEBUG_IN_TESTS, "Watching %s %s %s %s", sender, path, iface,
               member);
 
-    big_dbus_watch_signal(DBUS_BUS_SESSION,
-                          sender,
-                          path,
-                          iface,
-                          member,
-                          expect_receive_signal_handler,
-                          GINT_TO_POINTER(1),
+    big_dbus_watch_signal(DBUS_BUS_SESSION, sender, path, iface, member,
+                          expect_receive_signal_handler, GINT_TO_POINTER(1),
                           the_destroy_notifier);
 
-    big_dbus_proxy_call_json_async(test_service_proxy,
-                                   "emitTheSignal",
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   NULL);
+    big_dbus_proxy_call_json_async(test_service_proxy, "emitTheSignal", NULL,
+                                   NULL, NULL, NULL);
     g_main_loop_run(inner_loop);
 
     g_assert(signal_received_count == 1);
     g_assert(destroy_notify_count == 0);
 
-    big_dbus_unwatch_signal(DBUS_BUS_SESSION,
-                            sender,
-                            path,
-                            iface,
-                            member,
-                            expect_receive_signal_handler,
-                            GINT_TO_POINTER(1));
+    big_dbus_unwatch_signal(DBUS_BUS_SESSION, sender, path, iface, member,
+                            expect_receive_signal_handler, GINT_TO_POINTER(1));
 
     g_assert(destroy_notify_count == 1);
 }
 
 static gboolean
-run_signal_tests_idle(void *data)
+run_signal_tests_idle(void* data)
 {
     int i;
-    const char *unique_name;
+    const char* unique_name;
 
     for (i = 0; i < (int) G_N_ELEMENTS(watch_tests); ++i) {
-        SignalWatchTest *test = &watch_tests[i];
+        SignalWatchTest* test = &watch_tests[i];
 
-        test_match_combo(test->sender,
-                         test->path,
-                         test->iface,
-                         test->member);
+        test_match_combo(test->sender, test->path, test->iface, test->member);
     }
 
     /* Now try on the unique bus name */
 
     unique_name = big_dbus_proxy_get_bus_name(test_service_proxy);
 
-    test_match_combo(unique_name,
-                     NULL, NULL, NULL);
+    test_match_combo(unique_name, NULL, NULL, NULL);
 
     /* Now test we get destroy notify when the unique name disappears
      * on killing the child.
@@ -1079,15 +978,10 @@ run_signal_tests_idle(void *data)
     signal_received_count = 0;
     destroy_notify_count = 0;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "Watching unique name %s",
-              unique_name);
+    big_debug(BIG_DEBUG_IN_TESTS, "Watching unique name %s", unique_name);
 
-    big_dbus_watch_signal(DBUS_BUS_SESSION,
-                          unique_name,
-                          NULL, NULL, NULL,
-                          expect_receive_signal_handler,
-                          GINT_TO_POINTER(1),
+    big_dbus_watch_signal(DBUS_BUS_SESSION, unique_name, NULL, NULL, NULL,
+                          expect_receive_signal_handler, GINT_TO_POINTER(1),
                           the_destroy_notifier_that_quits);
 
     /* kill owner of unique_name */
@@ -1101,11 +995,8 @@ run_signal_tests_idle(void *data)
     g_assert(destroy_notify_count > 0);
     g_assert(destroy_notify_count < 2);
 
-    big_dbus_unwatch_signal(DBUS_BUS_SESSION,
-                            unique_name,
-                            NULL, NULL, NULL,
-                            expect_receive_signal_handler,
-                            GINT_TO_POINTER(1));
+    big_dbus_unwatch_signal(DBUS_BUS_SESSION, unique_name, NULL, NULL, NULL,
+                            expect_receive_signal_handler, GINT_TO_POINTER(1));
 
     g_assert(signal_received_count == 0);
     g_assert(destroy_notify_count == 1);
@@ -1115,41 +1006,35 @@ run_signal_tests_idle(void *data)
 }
 
 static void
-on_test_service_appeared(DBusConnection *connection,
-                         const char     *name,
-                         const char     *new_owner_unique_name,
-                         void           *data)
+on_test_service_appeared(DBusConnection* connection,
+                         const char* name,
+                         const char* new_owner_unique_name,
+                         void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "%s appeared",
-              name);
+    big_debug(BIG_DEBUG_IN_TESTS, "%s appeared", name);
 
     inner_loop = g_main_loop_new(NULL, FALSE);
 
-    test_service_proxy =
-        big_dbus_proxy_new(connection, new_owner_unique_name,
-                           "/com/litl/test/object42",
-                           "com.litl.TestIface");
+    test_service_proxy
+      = big_dbus_proxy_new(connection, new_owner_unique_name,
+                           "/com/litl/test/object42", "com.litl.TestIface");
 
     g_idle_add(run_signal_tests_idle, NULL);
 }
 
 static void
-on_test_service_vanished(DBusConnection *connection,
-                         const char     *name,
-                         const char     *old_owner_unique_name,
-                         void           *data)
+on_test_service_vanished(DBusConnection* connection,
+                         const char* name,
+                         const char* old_owner_unique_name,
+                         void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "%s vanished", name);
+    big_debug(BIG_DEBUG_IN_TESTS, "%s vanished", name);
 
     another_child_down();
 }
 
-static BigDBusWatchNameFuncs watch_test_service_funcs = {
-    on_test_service_appeared,
-    on_test_service_vanished
-};
+static BigDBusWatchNameFuncs watch_test_service_funcs
+  = { on_test_service_appeared, on_test_service_vanished };
 
 void
 bigtest_test_func_util_dbus_signals_client(void)
@@ -1175,11 +1060,8 @@ bigtest_test_func_util_dbus_signals_client(void)
     /* We rely on the child-forking test functions being called first */
     g_assert(test_service_pid != 0);
 
-    big_dbus_watch_name(DBUS_BUS_SESSION,
-                        "com.litl.TestService",
-                        0,
-                        &watch_test_service_funcs,
-                        NULL);
+    big_dbus_watch_name(DBUS_BUS_SESSION, "com.litl.TestService", 0,
+                        &watch_test_service_funcs, NULL);
 
     outer_loop = g_main_loop_new(NULL, FALSE);
 
@@ -1188,8 +1070,7 @@ bigtest_test_func_util_dbus_signals_client(void)
     if (test_service_proxy != NULL)
         g_object_unref(test_service_proxy);
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "waitpid() for first child");
+    big_debug(BIG_DEBUG_IN_TESTS, "waitpid() for first child");
 
     result = waitpid(test_service_pid, &status, 0);
     if (result < 0) {
@@ -1197,11 +1078,13 @@ bigtest_test_func_util_dbus_signals_client(void)
     }
 
     if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
-        g_error("Forked dbus service child exited with error code %d", WEXITSTATUS(status));
+        g_error("Forked dbus service child exited with error code %d",
+                WEXITSTATUS(status));
     }
 
     if (WIFSIGNALED(status) && WTERMSIG(status) != SIGTERM) {
-        g_error("Forked dbus service child exited on wrong signal number %d", WTERMSIG(status));
+        g_error("Forked dbus service child exited on wrong signal number %d",
+                WTERMSIG(status));
     }
 
     big_debug(BIG_DEBUG_IN_TESTS, "dbus signals test completed");
@@ -1224,90 +1107,74 @@ bigtest_test_func_util_dbus_signals_client(void)
  */
 
 static gboolean currently_have_test_service = FALSE;
-static GObject *test_service_object = NULL;
+static GObject* test_service_object = NULL;
 
 static void
-test_service_emit_the_signal(DBusConnection  *connection,
-                             DBusMessage     *message,
-                             DBusMessageIter *in_iter,
-                             DBusMessageIter *out_iter,
-                             void            *data,
-                             DBusError       *error)
+test_service_emit_the_signal(DBusConnection* connection,
+                             DBusMessage* message,
+                             DBusMessageIter* in_iter,
+                             DBusMessageIter* out_iter,
+                             void* data,
+                             DBusError* error)
 {
-    DBusMessage *signal;
+    DBusMessage* signal;
 
     signal = dbus_message_new_signal("/com/litl/test/object42",
-                                     "com.litl.TestIface",
-                                     "TheSignal");
+                                     "com.litl.TestIface", "TheSignal");
     dbus_connection_send(connection, signal, NULL);
     dbus_message_unref(signal);
 }
 
-static BigDBusJsonMethod test_service_methods[] = {
-    { "emitTheSignal", test_service_emit_the_signal, NULL }
-};
+static BigDBusJsonMethod test_service_methods[]
+  = { { "emitTheSignal", test_service_emit_the_signal, NULL } };
 
 static void
-on_test_service_acquired(DBusConnection *connection,
-                         const char     *name,
-                         void           *data)
+on_test_service_acquired(DBusConnection* connection,
+                         const char* name,
+                         void* data)
 {
     g_assert(!currently_have_test_service);
     currently_have_test_service = TRUE;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestService acquired by child");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestService acquired by child");
 
-    big_dbus_register_json(connection,
-                           "com.litl.TestIface",
+    big_dbus_register_json(connection, "com.litl.TestIface",
                            test_service_methods,
                            G_N_ELEMENTS(test_service_methods));
 
     test_service_object = g_object_new(G_TYPE_OBJECT, NULL);
 
-    big_dbus_register_g_object(connection,
-                               "/com/litl/test/object42",
-                               test_service_object,
-                               "com.litl.TestIface");
+    big_dbus_register_g_object(connection, "/com/litl/test/object42",
+                               test_service_object, "com.litl.TestIface");
 }
 
 static void
-on_test_service_lost(DBusConnection *connection,
-                     const char     *name,
-                     void           *data)
+on_test_service_lost(DBusConnection* connection, const char* name, void* data)
 {
     g_assert(currently_have_test_service);
     currently_have_test_service = FALSE;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestService lost by child");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestService lost by child");
 
-    big_dbus_unregister_g_object(connection,
-                                 "/com/litl/test/object42");
+    big_dbus_unregister_g_object(connection, "/com/litl/test/object42");
 
-    big_dbus_unregister_json(connection,
-                             "com.litl.TestIface");
+    big_dbus_unregister_json(connection, "com.litl.TestIface");
 }
 
-static BigDBusNameOwnerFuncs test_service_funcs = {
-    "com.litl.TestService",
-    DBUS_BUS_SESSION,
-    on_test_service_acquired,
-    on_test_service_lost
-};
+static BigDBusNameOwnerFuncs test_service_funcs
+  = { "com.litl.TestService", DBUS_BUS_SESSION, on_test_service_acquired,
+      on_test_service_lost };
 
 static void
 do_test_service_child(void)
 {
-    GMainLoop *loop;
+    GMainLoop* loop;
 
     g_type_init();
 
     loop = g_main_loop_new(NULL, FALSE);
 
-    big_dbus_acquire_name(DBUS_BUS_SESSION,
-                          &test_service_funcs,
-                          NULL);
+    big_dbus_acquire_name(DBUS_BUS_SESSION, &test_service_funcs, NULL);
 
     g_main_loop_run(loop);
 
diff --git a/modules/dbus/util/dbus.c b/modules/dbus/util/dbus.c
index 89adf27..a918059 100644
--- a/modules/dbus/util/dbus.c
+++ b/modules/dbus/util/dbus.c
@@ -16,9 +16,10 @@
 #include "log.h"
 #include "glib.h"
 
-typedef struct {
-    const BigDBusConnectFuncs *funcs;
-    void *data;
+typedef struct
+{
+    const BigDBusConnectFuncs* funcs;
+    void* data;
     unsigned int opened : 1;
 } ConnectFuncs;
 
@@ -29,84 +30,90 @@ typedef enum {
     NAME_NOT_OWNED
 } NameOwnershipState;
 
-typedef struct {
-    char *name;
-    const BigDBusJsonMethod *methods;
+typedef struct
+{
+    char* name;
+    const BigDBusJsonMethod* methods;
     int n_methods;
 } BigJsonIface;
 
-typedef struct {
+typedef struct
+{
     DBusBusType bus_type;
     /* If prev_state != state then we may need to notify */
     NameOwnershipState prev_state;
     NameOwnershipState state;
-    const BigDBusNameOwnerFuncs *funcs;
-    void *data;
+    const BigDBusNameOwnerFuncs* funcs;
+    void* data;
     unsigned int id;
 } BigNameOwnershipMonitor;
 
-typedef struct {
-    char *name;
-    char *current_owner;
-    GSList *watchers;
+typedef struct
+{
+    char* name;
+    char* current_owner;
+    GSList* watchers;
 } BigNameWatch;
 
-typedef struct {
+typedef struct
+{
     BigDBusWatchNameFlags flags;
-    const BigDBusWatchNameFuncs *funcs;
-    void *data;
+    const BigDBusWatchNameFuncs* funcs;
+    void* data;
     DBusBusType bus_type;
-    BigNameWatch *watch;
+    BigNameWatch* watch;
     guint notify_idle;
     int refcount;
     guint destroyed : 1;
 } BigNameWatcher;
 
-typedef struct {
+typedef struct
+{
     DBusBusType bus_type;
-    char *name;
-    BigNameWatcher *watcher;
+    char* name;
+    BigNameWatcher* watcher;
 } BigPendingNameWatcher;
 
-static DBusConnection *session_bus_weak_ref = NULL;
-static GSList *session_bus_weak_refs = NULL;
-static DBusConnection *system_bus_weak_ref = NULL;
-static GSList *system_bus_weak_refs = NULL;
+static DBusConnection* session_bus_weak_ref = NULL;
+static GSList* session_bus_weak_refs = NULL;
+static DBusConnection* system_bus_weak_ref = NULL;
+static GSList* system_bus_weak_refs = NULL;
 static guint session_connect_idle_id = 0;
 static guint system_connect_idle_id = 0;
-static GSList *all_connect_funcs = NULL;
+static GSList* all_connect_funcs = NULL;
 
-static GSList *pending_name_ownership_monitors = NULL;
-static GSList *pending_name_watchers = NULL;
+static GSList* pending_name_ownership_monitors = NULL;
+static GSList* pending_name_watchers = NULL;
 
 #define BIG_DBUS_NAME_OWNER_MONITOR_INVALID_ID 0
 
 static unsigned int global_monitor_id = 0;
 
-static DBusHandlerResult disconnect_filter_message             (DBusConnection   *connection,
-                                                                DBusMessage      *message,
-                                                                void             *data);
-static DBusHandlerResult name_ownership_monitor_filter_message (DBusConnection   *connection,
-                                                                DBusMessage      *message,
-                                                                void             *data);
-static void              process_name_ownership_monitors       (DBusConnection   *connection,
-                                                                BigDBusInfo      *info);
-static void              name_watch_remove_watcher             (BigNameWatch     *watch,
-                                                                BigNameWatcher   *watcher);
-static DBusHandlerResult name_watch_filter_message             (DBusConnection   *connection,
-                                                                DBusMessage      *message,
-                                                                void             *data);
-static void              process_pending_name_watchers         (DBusConnection   *connection,
-                                                                BigDBusInfo      *info);
-static void              json_iface_free                       (BigJsonIface     *iface);
-static void              info_free                             (BigDBusInfo      *info);
-static gboolean          notify_watcher_name_appeared          (gpointer data);
+static DBusHandlerResult disconnect_filter_message(DBusConnection* connection,
+                                                   DBusMessage* message,
+                                                   void* data);
+static DBusHandlerResult name_ownership_monitor_filter_message(
+  DBusConnection* connection,
+  DBusMessage* message,
+  void* data);
+static void process_name_ownership_monitors(DBusConnection* connection,
+                                            BigDBusInfo* info);
+static void name_watch_remove_watcher(BigNameWatch* watch,
+                                      BigNameWatcher* watcher);
+static DBusHandlerResult name_watch_filter_message(DBusConnection* connection,
+                                                   DBusMessage* message,
+                                                   void* data);
+static void process_pending_name_watchers(DBusConnection* connection,
+                                          BigDBusInfo* info);
+static void json_iface_free(BigJsonIface* iface);
+static void info_free(BigDBusInfo* info);
+static gboolean notify_watcher_name_appeared(gpointer data);
 
 static dbus_int32_t info_slot = -1;
 BigDBusInfo*
-_big_dbus_ensure_info(DBusConnection *connection)
+_big_dbus_ensure_info(DBusConnection* connection)
 {
-    BigDBusInfo *info;
+    BigDBusInfo* info;
 
     dbus_connection_allocate_data_slot(&info_slot);
 
@@ -124,32 +131,33 @@ _big_dbus_ensure_info(DBusConnection *connection)
         else
             g_error("Unknown bus type opened in %s", __FILE__);
 
-        info->json_ifaces = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                                  NULL, (GFreeFunc) json_iface_free);
+        info->json_ifaces = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+                                                  (GFreeFunc) json_iface_free);
         info->name_watches = g_hash_table_new(g_str_hash, g_str_equal);
-        dbus_connection_set_data(connection, info_slot, info, (DBusFreeFunction) info_free);
+        dbus_connection_set_data(connection, info_slot, info,
+                                 (DBusFreeFunction) info_free);
 
-        dbus_connection_add_filter(connection, name_ownership_monitor_filter_message,
-                                   NULL, NULL);
-        dbus_connection_add_filter(connection, name_watch_filter_message,
-                                   NULL, NULL);
-        dbus_connection_add_filter(connection, _big_dbus_signal_watch_filter_message,
-                                   NULL, NULL);
+        dbus_connection_add_filter(connection,
+                                   name_ownership_monitor_filter_message, NULL,
+                                   NULL);
+        dbus_connection_add_filter(connection, name_watch_filter_message, NULL,
+                                   NULL);
+        dbus_connection_add_filter(connection,
+                                   _big_dbus_signal_watch_filter_message, NULL,
+                                   NULL);
 
         /* Important: disconnect_filter_message() must be LAST so
          * it runs last when the disconnect message arrives.
          */
-        dbus_connection_add_filter(connection, disconnect_filter_message,
-                                   NULL, NULL);
+        dbus_connection_add_filter(connection, disconnect_filter_message, NULL,
+                                   NULL);
 
         /* caution, this could get circular if proxy_new() goes back around
          * and tries to use dbus.c - but we'll fix it when it happens.
          * Also, this refs the connection ...
          */
-        info->driver_proxy =
-            big_dbus_proxy_new(connection,
-                               DBUS_SERVICE_DBUS,
-                               DBUS_PATH_DBUS,
+        info->driver_proxy
+          = big_dbus_proxy_new(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS,
                                DBUS_INTERFACE_DBUS);
     }
 
@@ -157,9 +165,9 @@ _big_dbus_ensure_info(DBusConnection *connection)
 }
 
 void
-_big_dbus_dispose_info(DBusConnection *connection)
+_big_dbus_dispose_info(DBusConnection* connection)
 {
-    BigDBusInfo *info;
+    BigDBusInfo* info;
 
     if (info_slot < 0)
         return;
@@ -168,8 +176,7 @@ _big_dbus_dispose_info(DBusConnection *connection)
 
     if (info != NULL) {
 
-        big_debug(BIG_DEBUG_UTIL_DBUS,
-                  "Disposing info on connection %p",
+        big_debug(BIG_DEBUG_UTIL_DBUS, "Disposing info on connection %p",
                   connection);
 
         /* the driver proxy refs the connection, we want
@@ -192,15 +199,15 @@ _big_dbus_get_weak_ref(DBusBusType which_bus)
     } else if (which_bus == DBUS_BUS_SYSTEM) {
         return system_bus_weak_ref;
     }
-    
+
     g_assert_not_reached();
     return NULL;
 }
 
 static DBusHandlerResult
-disconnect_filter_message(DBusConnection   *connection,
-                          DBusMessage      *message,
-                          void             *data)
+disconnect_filter_message(DBusConnection* connection,
+                          DBusMessage* message,
+                          void* data)
 {
     /* We should be running after all other filters */
     if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
@@ -222,23 +229,20 @@ static DBusConnection*
 try_connecting(DBusBusType which_bus)
 {
 
-    DBusGConnection *gconnection;
-    DBusConnection *connection;
-    GError *error;
+    DBusGConnection* gconnection;
+    DBusConnection* connection;
+    GError* error;
 
     connection = _big_dbus_get_weak_ref(which_bus);
     if (connection != NULL)
         return connection;
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "trying to connect to message bus");
+    big_debug(BIG_DEBUG_UTIL_DBUS, "trying to connect to message bus");
 
     error = NULL;
-    gconnection = dbus_g_bus_get(which_bus,
-                                 &error);
+    gconnection = dbus_g_bus_get(which_bus, &error);
     if (gconnection == NULL) {
-        big_debug(BIG_DEBUG_UTIL_DBUS,
-                  "bus connection failed: %s",
+        big_debug(BIG_DEBUG_UTIL_DBUS, "bus connection failed: %s",
                   error->message);
         g_error_free(error);
         return NULL;
@@ -249,38 +253,35 @@ try_connecting(DBusBusType which_bus)
     /* Disable this because all our apps will be well-behaved! */
     dbus_connection_set_exit_on_disconnect(connection, FALSE);
 
-    if (which_bus == DBUS_BUS_SESSION &&
-        session_bus_weak_ref == NULL) {
-        GSList *l;
+    if (which_bus == DBUS_BUS_SESSION && session_bus_weak_ref == NULL) {
+        GSList* l;
         session_bus_weak_ref = connection;
         for (l = session_bus_weak_refs; l != NULL; l = l->next) {
-            DBusConnection **connection_p = l->data;
+            DBusConnection** connection_p = l->data;
             *connection_p = session_bus_weak_ref;
         }
-    } else if (which_bus == DBUS_BUS_SYSTEM &&
-               system_bus_weak_ref == NULL) {
-        GSList *l;
+    } else if (which_bus == DBUS_BUS_SYSTEM && system_bus_weak_ref == NULL) {
+        GSList* l;
         system_bus_weak_ref = connection;
         for (l = system_bus_weak_refs; l != NULL; l = l->next) {
-            DBusConnection **connection_p = l->data;
+            DBusConnection** connection_p = l->data;
             *connection_p = system_bus_weak_ref;
         }
     }
 
     dbus_g_connection_unref(gconnection); /* rely on libdbus holding a ref */
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Successfully connected");
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Successfully connected");
 
     return connection;
 }
 
 static gboolean
-connect_idle(void *data)
+connect_idle(void* data)
 {
-    GSList *l;
-    DBusConnection *connection;
-    BigDBusInfo *info;
+    GSList* l;
+    DBusConnection* connection;
+    BigDBusInfo* info;
     DBusBusType bus_type;
 
     bus_type = GPOINTER_TO_INT(data);
@@ -293,7 +294,8 @@ connect_idle(void *data)
         g_assert_not_reached();
 
     big_debug(BIG_DEBUG_UTIL_DBUS,
-              "connection idle with %d connect listeners to traverse", g_slist_length(all_connect_funcs));
+              "connection idle with %d connect listeners to traverse",
+              g_slist_length(all_connect_funcs));
 
     connection = try_connecting(bus_type);
     if (connection == NULL) {
@@ -328,12 +330,12 @@ connect_idle(void *data)
      */
 
     for (l = all_connect_funcs; l != NULL; l = l->next) {
-        ConnectFuncs *f;
+        ConnectFuncs* f;
         f = l->data;
 
         if (!f->opened && f->funcs->which_bus == bus_type) {
             f->opened = TRUE;
-            (* f->funcs->opened) (connection, f->data);
+            (*f->funcs->opened)(connection, f->data);
         }
     }
 
@@ -354,11 +356,13 @@ _big_dbus_ensure_connect_idle(DBusBusType bus_type)
 {
     if (bus_type == DBUS_BUS_SESSION) {
         if (session_connect_idle_id == 0) {
-            session_connect_idle_id = g_idle_add(connect_idle, GINT_TO_POINTER(bus_type));
+            session_connect_idle_id
+              = g_idle_add(connect_idle, GINT_TO_POINTER(bus_type));
         }
     } else if (bus_type == DBUS_BUS_SYSTEM) {
         if (system_connect_idle_id == 0) {
-            system_connect_idle_id = g_idle_add(connect_idle, GINT_TO_POINTER(bus_type));
+            system_connect_idle_id
+              = g_idle_add(connect_idle, GINT_TO_POINTER(bus_type));
         }
     } else {
         g_assert_not_reached();
@@ -366,11 +370,11 @@ _big_dbus_ensure_connect_idle(DBusBusType bus_type)
 }
 
 static void
-internal_add_connect_funcs(const BigDBusConnectFuncs *funcs,
-                           void                      *data,
-                           gboolean                   sync_notify)
+internal_add_connect_funcs(const BigDBusConnectFuncs* funcs,
+                           void* data,
+                           gboolean sync_notify)
 {
-    ConnectFuncs *f;
+    ConnectFuncs* f;
 
     f = g_slice_new0(ConnectFuncs);
     f->funcs = funcs;
@@ -386,13 +390,13 @@ internal_add_connect_funcs(const BigDBusConnectFuncs *funcs,
          * (we have a weak ref != NULL) then notify
          * right away before we return.
          */
-        DBusConnection *connection;
+        DBusConnection* connection;
 
         connection = _big_dbus_get_weak_ref(f->funcs->which_bus);
 
         if (connection != NULL && !f->opened) {
             f->opened = TRUE;
-            (* f->funcs->opened) (connection, f->data);
+            (*f->funcs->opened)(connection, f->data);
         }
     }
 }
@@ -402,8 +406,7 @@ internal_add_connect_funcs(const BigDBusConnectFuncs *funcs,
  * main loop.
  */
 void
-big_dbus_add_connect_funcs(const BigDBusConnectFuncs *funcs,
-                           void                      *data)
+big_dbus_add_connect_funcs(const BigDBusConnectFuncs* funcs, void* data)
 {
     internal_add_connect_funcs(funcs, data, FALSE);
 }
@@ -412,25 +415,23 @@ big_dbus_add_connect_funcs(const BigDBusConnectFuncs *funcs,
  * we are already connected.
  */
 void
-big_dbus_add_connect_funcs_sync_notify(const BigDBusConnectFuncs *funcs,
-                                       void                      *data)
+big_dbus_add_connect_funcs_sync_notify(const BigDBusConnectFuncs* funcs,
+                                       void* data)
 {
     internal_add_connect_funcs(funcs, data, TRUE);
 }
 
 void
-big_dbus_remove_connect_funcs(const BigDBusConnectFuncs *funcs,
-                              void                      *data)
+big_dbus_remove_connect_funcs(const BigDBusConnectFuncs* funcs, void* data)
 {
-    ConnectFuncs *f;
-    GSList *l;
+    ConnectFuncs* f;
+    GSList* l;
 
     f = NULL;
     for (l = all_connect_funcs; l != NULL; l = l->next) {
         f = l->data;
 
-        if (f->funcs == funcs &&
-            f->data == data)
+        if (f->funcs == funcs && f->data == data)
             break;
     }
 
@@ -445,15 +446,16 @@ big_dbus_remove_connect_funcs(const BigDBusConnectFuncs *funcs,
 }
 
 void
-big_dbus_add_bus_weakref(DBusBusType      which_bus,
-                         DBusConnection **connection_p)
+big_dbus_add_bus_weakref(DBusBusType which_bus, DBusConnection** connection_p)
 {
     if (which_bus == DBUS_BUS_SESSION) {
         *connection_p = session_bus_weak_ref;
-        session_bus_weak_refs = g_slist_prepend(session_bus_weak_refs, connection_p);
+        session_bus_weak_refs
+          = g_slist_prepend(session_bus_weak_refs, connection_p);
     } else if (which_bus == DBUS_BUS_SYSTEM) {
         *connection_p = system_bus_weak_ref;
-        system_bus_weak_refs = g_slist_prepend(system_bus_weak_refs, connection_p);
+        system_bus_weak_refs
+          = g_slist_prepend(system_bus_weak_refs, connection_p);
     } else {
         g_assert_not_reached();
     }
@@ -462,15 +464,17 @@ big_dbus_add_bus_weakref(DBusBusType      which_bus,
 }
 
 void
-big_dbus_remove_bus_weakref(DBusBusType      which_bus,
-                            DBusConnection **connection_p)
+big_dbus_remove_bus_weakref(DBusBusType which_bus,
+                            DBusConnection** connection_p)
 {
     if (which_bus == DBUS_BUS_SESSION) {
         *connection_p = NULL;
-        session_bus_weak_refs = g_slist_remove(session_bus_weak_refs, connection_p);
+        session_bus_weak_refs
+          = g_slist_remove(session_bus_weak_refs, connection_p);
     } else if (which_bus == DBUS_BUS_SYSTEM) {
         *connection_p = NULL;
-        system_bus_weak_refs = g_slist_remove(system_bus_weak_refs, connection_p);
+        system_bus_weak_refs
+          = g_slist_remove(system_bus_weak_refs, connection_p);
     } else {
         g_assert_not_reached();
     }
@@ -483,11 +487,11 @@ big_dbus_try_connecting_now(DBusBusType which_bus)
 }
 
 static BigJsonIface*
-json_iface_new(const char *name,
-               const BigDBusJsonMethod *methods,
+json_iface_new(const char* name,
+               const BigDBusJsonMethod* methods,
                int n_methods)
 {
-    BigJsonIface *iface;
+    BigJsonIface* iface;
 
     iface = g_slice_new0(BigJsonIface);
     iface->name = g_strdup(name);
@@ -498,18 +502,18 @@ json_iface_new(const char *name,
 }
 
 static void
-json_iface_free(BigJsonIface *iface)
+json_iface_free(BigJsonIface* iface)
 {
     g_free(iface->name);
     g_slice_free(BigJsonIface, iface);
 }
 
 static BigNameOwnershipMonitor*
-name_ownership_monitor_new(DBusBusType                  bus_type,
-                           const BigDBusNameOwnerFuncs *funcs,
-                           void                        *data)
+name_ownership_monitor_new(DBusBusType bus_type,
+                           const BigDBusNameOwnerFuncs* funcs,
+                           void* data)
 {
-    BigNameOwnershipMonitor *monitor;
+    BigNameOwnershipMonitor* monitor;
 
     monitor = g_slice_new0(BigNameOwnershipMonitor);
     monitor->bus_type = bus_type;
@@ -519,20 +523,20 @@ name_ownership_monitor_new(DBusBusType                  bus_type,
     monitor->data = data;
     monitor->id = ++global_monitor_id;
 
-    return  monitor;
+    return monitor;
 }
 
 static void
-name_ownership_monitor_free(BigNameOwnershipMonitor *monitor)
+name_ownership_monitor_free(BigNameOwnershipMonitor* monitor)
 {
 
     g_slice_free(BigNameOwnershipMonitor, monitor);
 }
 
 static BigNameWatch*
-name_watch_new(const char *name)
+name_watch_new(const char* name)
 {
-    BigNameWatch *watch;
+    BigNameWatch* watch;
 
     watch = g_slice_new0(BigNameWatch);
     watch->name = g_strdup(name);
@@ -549,7 +553,7 @@ name_watch_new(const char *name)
 }
 
 static void
-name_watch_free(BigNameWatch *watch)
+name_watch_free(BigNameWatch* watch)
 {
     g_assert(watch->watchers == NULL);
 
@@ -559,12 +563,12 @@ name_watch_free(BigNameWatch *watch)
 }
 
 static BigNameWatcher*
-name_watcher_new(BigDBusWatchNameFlags        flags,
-                 const BigDBusWatchNameFuncs *funcs,
-                 void                        *data,
-                 DBusBusType                  bus_type)
+name_watcher_new(BigDBusWatchNameFlags flags,
+                 const BigDBusWatchNameFuncs* funcs,
+                 void* data,
+                 DBusBusType bus_type)
 {
-    BigNameWatcher *watcher;
+    BigNameWatcher* watcher;
 
     watcher = g_slice_new0(BigNameWatcher);
     watcher->flags = flags;
@@ -578,13 +582,13 @@ name_watcher_new(BigDBusWatchNameFlags        flags,
 }
 
 static void
-name_watcher_ref(BigNameWatcher *watcher)
+name_watcher_ref(BigNameWatcher* watcher)
 {
     watcher->refcount += 1;
 }
 
 static void
-name_watcher_unref(BigNameWatcher *watcher)
+name_watcher_unref(BigNameWatcher* watcher)
 {
     watcher->refcount -= 1;
 
@@ -593,10 +597,10 @@ name_watcher_unref(BigNameWatcher *watcher)
 }
 
 static void
-info_free(BigDBusInfo *info)
+info_free(BigDBusInfo* info)
 {
-    void *key;
-    void *value;
+    void* key;
+    void* value;
 
     big_debug(BIG_DEBUG_UTIL_DBUS,
               "Destroy notify invoked on bus connection info for %p",
@@ -620,20 +624,20 @@ info_free(BigDBusInfo *info)
 
     while (info->name_ownership_monitors != NULL) {
         name_ownership_monitor_free(info->name_ownership_monitors->data);
-        info->name_ownership_monitors = g_slist_remove(info->name_ownership_monitors,
-                                                       info->name_ownership_monitors->data);
+        info->name_ownership_monitors
+          = g_slist_remove(info->name_ownership_monitors,
+                           info->name_ownership_monitors->data);
     }
 
-    while ((value = g_hash_table_lookup(info->name_watches, &key)))
-    {
-        BigNameWatch *watch = value;
-        
+    while ((value = g_hash_table_lookup(info->name_watches, &key))) {
+        BigNameWatch* watch = value;
+
         while (watch->watchers) {
             name_watch_remove_watcher(watch, watch->watchers->data);
         }
-        
+
         name_watch_free(watch);
-        g_hash_table_steal (info->name_watches, &key);
+        g_hash_table_steal(info->name_watches, &key);
     }
 
     if (info->signal_watchers_by_unique_sender) {
@@ -658,34 +662,33 @@ info_free(BigDBusInfo *info)
 }
 
 static DBusHandlerResult
-name_ownership_monitor_filter_message(DBusConnection *connection,
-                                      DBusMessage    *message,
-                                      void           *data)
+name_ownership_monitor_filter_message(DBusConnection* connection,
+                                      DBusMessage* message,
+                                      void* data)
 {
-    BigDBusInfo *info;
+    BigDBusInfo* info;
     gboolean states_changed;
 
     info = _big_dbus_ensure_info(connection);
 
     states_changed = FALSE;
 
-    if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameLost") &&
-        dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
-        const char *name = NULL;
-        if (dbus_message_get_args(message, NULL,
-                                  DBUS_TYPE_STRING, &name,
+    if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameLost")
+        && dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
+        const char* name = NULL;
+        if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name,
                                   DBUS_TYPE_INVALID)) {
-            GSList *l;
+            GSList* l;
 
             big_debug(BIG_DEBUG_UTIL_DBUS, "Lost name %s", name);
 
             for (l = info->name_ownership_monitors; l != NULL; l = l->next) {
-                BigNameOwnershipMonitor *monitor;
+                BigNameOwnershipMonitor* monitor;
 
                 monitor = l->data;
 
-                if (monitor->state == NAME_PRIMARY_OWNER &&
-                    strcmp(name, monitor->funcs->name) == 0) {
+                if (monitor->state == NAME_PRIMARY_OWNER
+                    && strcmp(name, monitor->funcs->name) == 0) {
                     monitor->prev_state = monitor->state;
                     monitor->state = NAME_NOT_OWNED;
                     states_changed = TRUE;
@@ -695,23 +698,23 @@ name_ownership_monitor_filter_message(DBusConnection *connection,
         } else {
             big_debug(BIG_DEBUG_UTIL_DBUS, "NameLost has wrong arguments???");
         }
-    } else if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameAcquired") &&
-               dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
-        const char *name = NULL;
-        if (dbus_message_get_args(message, NULL,
-                                  DBUS_TYPE_STRING, &name,
+    } else if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS,
+                                      "NameAcquired")
+               && dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
+        const char* name = NULL;
+        if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name,
                                   DBUS_TYPE_INVALID)) {
-            GSList *l;
+            GSList* l;
 
             big_debug(BIG_DEBUG_UTIL_DBUS, "Acquired name %s", name);
 
             for (l = info->name_ownership_monitors; l != NULL; l = l->next) {
-                BigNameOwnershipMonitor *monitor;
+                BigNameOwnershipMonitor* monitor;
 
                 monitor = l->data;
 
-                if (monitor->state != NAME_PRIMARY_OWNER &&
-                    strcmp(name, monitor->funcs->name) == 0) {
+                if (monitor->state != NAME_PRIMARY_OWNER
+                    && strcmp(name, monitor->funcs->name) == 0) {
                     monitor->prev_state = monitor->state;
                     monitor->state = NAME_PRIMARY_OWNER;
                     states_changed = TRUE;
@@ -719,15 +722,17 @@ name_ownership_monitor_filter_message(DBusConnection *connection,
                 }
             }
         } else {
-            big_debug(BIG_DEBUG_UTIL_DBUS, "NameAcquired has wrong arguments???");
+            big_debug(BIG_DEBUG_UTIL_DBUS,
+                      "NameAcquired has wrong arguments???");
         }
-    } else if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
-        GSList *l;
+    } else if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL,
+                                      "Disconnected")) {
+        GSList* l;
 
         big_debug(BIG_DEBUG_UTIL_DBUS, "Disconnected in %s", G_STRFUNC);
 
         for (l = info->name_ownership_monitors; l != NULL; l = l->next) {
-            BigNameOwnershipMonitor *monitor;
+            BigNameOwnershipMonitor* monitor;
 
             monitor = l->data;
 
@@ -739,7 +744,8 @@ name_ownership_monitor_filter_message(DBusConnection *connection,
             }
         }
 
-        /* FIXME move the monitors back to the pending list so they'll be found on reconnect */
+        /* FIXME move the monitors back to the pending list so they'll be found
+         * on reconnect */
     }
 
     if (states_changed)
@@ -749,28 +755,26 @@ name_ownership_monitor_filter_message(DBusConnection *connection,
 }
 
 static void
-process_name_ownership_monitors(DBusConnection *connection,
-                                BigDBusInfo    *info)
+process_name_ownership_monitors(DBusConnection* connection, BigDBusInfo* info)
 {
-    GSList *l;
+    GSList* l;
     gboolean connected;
-    GSList *still_pending;
+    GSList* still_pending;
 
     /* First pull anything out of pending queue */
 
     still_pending = NULL;
     while (pending_name_ownership_monitors != NULL) {
-        BigNameOwnershipMonitor *monitor;
+        BigNameOwnershipMonitor* monitor;
 
         monitor = pending_name_ownership_monitors->data;
-        pending_name_ownership_monitors =
-            g_slist_remove(pending_name_ownership_monitors,
+        pending_name_ownership_monitors
+          = g_slist_remove(pending_name_ownership_monitors,
                            pending_name_ownership_monitors->data);
 
         if (monitor->bus_type == info->bus_type) {
-            info->name_ownership_monitors =
-                g_slist_prepend(info->name_ownership_monitors,
-                                monitor);
+            info->name_ownership_monitors
+              = g_slist_prepend(info->name_ownership_monitors, monitor);
         } else {
             still_pending = g_slist_prepend(still_pending, monitor);
         }
@@ -784,7 +788,7 @@ process_name_ownership_monitors(DBusConnection *connection,
 
     if (connected) {
         for (l = info->name_ownership_monitors; l != NULL; l = l->next) {
-            BigNameOwnershipMonitor *monitor;
+            BigNameOwnershipMonitor* monitor;
 
             monitor = l->data;
 
@@ -798,17 +802,17 @@ process_name_ownership_monitors(DBusConnection *connection,
                     flags |= DBUS_NAME_FLAG_DO_NOT_QUEUE;
 
                 dbus_error_init(&derror);
-                result = dbus_bus_request_name(connection,
-                                               monitor->funcs->name,
-                                               flags,
-                                               &derror);
+                result = dbus_bus_request_name(connection, monitor->funcs->name,
+                                               flags, &derror);
 
                 /* log 'error' word only when one occurred */
                 if (derror.message != NULL) {
-                    big_debug(BIG_DEBUG_UTIL_DBUS, "Requested name %s result %d error %s",
+                    big_debug(BIG_DEBUG_UTIL_DBUS,
+                              "Requested name %s result %d error %s",
                               monitor->funcs->name, result, derror.message);
                 } else {
-                    big_debug(BIG_DEBUG_UTIL_DBUS, "Requested name %s result %d",
+                    big_debug(BIG_DEBUG_UTIL_DBUS,
+                              "Requested name %s result %d",
                               monitor->funcs->name, result);
                 }
 
@@ -827,8 +831,8 @@ process_name_ownership_monitors(DBusConnection *connection,
 
                 monitor->prev_state = monitor->state;
 
-                if (result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ||
-                    result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER) {
+                if (result == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER
+                    || result == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER) {
                     monitor->state = NAME_PRIMARY_OWNER;
                 } else if (result == DBUS_REQUEST_NAME_REPLY_IN_QUEUE) {
                     monitor->state = NAME_IN_QUEUE;
@@ -848,7 +852,7 @@ process_name_ownership_monitors(DBusConnection *connection,
      */
     l = g_slist_copy(info->name_ownership_monitors);
     while (l != NULL) {
-        BigNameOwnershipMonitor *monitor;
+        BigNameOwnershipMonitor* monitor;
 
         monitor = l->data;
         l = g_slist_remove(l, l->data);
@@ -859,25 +863,28 @@ process_name_ownership_monitors(DBusConnection *connection,
             if (monitor->state == NAME_PRIMARY_OWNER) {
                 big_debug(BIG_DEBUG_UTIL_DBUS, "Notifying acquired %s",
                           monitor->funcs->name);
-                (* monitor->funcs->acquired) (connection, monitor->funcs->name, monitor->data);
+                (*monitor->funcs->acquired)(connection, monitor->funcs->name,
+                                            monitor->data);
             } else if (monitor->state != NAME_PRIMARY_OWNER) {
                 big_debug(BIG_DEBUG_UTIL_DBUS, "Notifying lost %s",
                           monitor->funcs->name);
-                (* monitor->funcs->lost) (connection, monitor->funcs->name, monitor->data);
+                (*monitor->funcs->lost)(connection, monitor->funcs->name,
+                                        monitor->data);
             }
         }
     }
 }
 
 unsigned int
-big_dbus_acquire_name (DBusBusType                  bus_type,
-                       const BigDBusNameOwnerFuncs *funcs,
-                       void                        *data)
+big_dbus_acquire_name(DBusBusType bus_type,
+                      const BigDBusNameOwnerFuncs* funcs,
+                      void* data)
 {
-    BigNameOwnershipMonitor *monitor;
+    BigNameOwnershipMonitor* monitor;
 
     monitor = name_ownership_monitor_new(bus_type, funcs, data);
-    pending_name_ownership_monitors = g_slist_prepend(pending_name_ownership_monitors, monitor);
+    pending_name_ownership_monitors
+      = g_slist_prepend(pending_name_ownership_monitors, monitor);
 
     _big_dbus_ensure_connect_idle(bus_type);
 
@@ -885,15 +892,15 @@ big_dbus_acquire_name (DBusBusType                  bus_type,
 }
 
 static void
-release_name_internal (DBusBusType                  bus_type,
-                       const BigDBusNameOwnerFuncs *funcs,
-                       void                        *data,
-                       unsigned int                 id)
+release_name_internal(DBusBusType bus_type,
+                      const BigDBusNameOwnerFuncs* funcs,
+                      void* data,
+                      unsigned int id)
 {
-    BigDBusInfo *info;
-    GSList *l;
-    BigNameOwnershipMonitor *monitor;
-    DBusConnection *connection;
+    BigDBusInfo* info;
+    GSList* l;
+    BigNameOwnershipMonitor* monitor;
+    DBusConnection* connection;
 
     connection = _big_dbus_get_weak_ref(bus_type);
     if (!connection)
@@ -905,14 +912,13 @@ release_name_internal (DBusBusType                  bus_type,
     for (l = pending_name_ownership_monitors; l; l = l->next) {
         monitor = l->data;
         /* If the id is valid an matches, we are done */
-        if (monitor->state == NAME_PRIMARY_OWNER &&
-            ((id != BIG_DBUS_NAME_OWNER_MONITOR_INVALID_ID && monitor->id == id) ||
-             (monitor->funcs == funcs &&
-              monitor->data == data))) {
+        if (monitor->state == NAME_PRIMARY_OWNER
+            && ((id != BIG_DBUS_NAME_OWNER_MONITOR_INVALID_ID
+                 && monitor->id == id)
+                || (monitor->funcs == funcs && monitor->data == data))) {
             dbus_bus_release_name(connection, monitor->funcs->name, NULL);
-            pending_name_ownership_monitors =
-                g_slist_remove(pending_name_ownership_monitors,
-                               monitor);
+            pending_name_ownership_monitors
+              = g_slist_remove(pending_name_ownership_monitors, monitor);
             name_ownership_monitor_free(monitor);
             /* If the monitor was in the pending list it
              * can't be in the processed list
@@ -924,13 +930,13 @@ release_name_internal (DBusBusType                  bus_type,
     for (l = info->name_ownership_monitors; l; l = l->next) {
         monitor = l->data;
         /* If the id is valid an matches, we are done */
-        if (monitor->state == NAME_PRIMARY_OWNER &&
-            ((id != BIG_DBUS_NAME_OWNER_MONITOR_INVALID_ID && monitor->id == id) ||
-             (monitor->funcs == funcs &&
-              monitor->data == data))) {
+        if (monitor->state == NAME_PRIMARY_OWNER
+            && ((id != BIG_DBUS_NAME_OWNER_MONITOR_INVALID_ID
+                 && monitor->id == id)
+                || (monitor->funcs == funcs && monitor->data == data))) {
             dbus_bus_release_name(connection, monitor->funcs->name, NULL);
-            info->name_ownership_monitors = g_slist_remove(info->name_ownership_monitors,
-                                                           monitor);
+            info->name_ownership_monitors
+              = g_slist_remove(info->name_ownership_monitors, monitor);
             name_ownership_monitor_free(monitor);
             break;
         }
@@ -938,30 +944,29 @@ release_name_internal (DBusBusType                  bus_type,
 }
 
 void
-big_dbus_release_name_by_id (DBusBusType  bus_type,
-                             unsigned int id)
+big_dbus_release_name_by_id(DBusBusType bus_type, unsigned int id)
 {
     release_name_internal(bus_type, NULL, NULL, id);
 }
 
 void
-big_dbus_release_name (DBusBusType                  bus_type,
-                       const BigDBusNameOwnerFuncs *funcs,
-                       void                        *data)
+big_dbus_release_name(DBusBusType bus_type,
+                      const BigDBusNameOwnerFuncs* funcs,
+                      void* data)
 {
     release_name_internal(bus_type, funcs, data,
                           BIG_DBUS_NAME_OWNER_MONITOR_INVALID_ID);
 }
 
 static void
-notify_name_owner_changed(DBusConnection *connection,
-                          const char     *name,
-                          const char     *new_owner)
+notify_name_owner_changed(DBusConnection* connection,
+                          const char* name,
+                          const char* new_owner)
 {
-    BigDBusInfo *info;
-    BigNameWatch *watch;
+    BigDBusInfo* info;
+    BigNameWatch* watch;
     GSList *l, *watchers;
-    gchar *old_owner;
+    gchar* old_owner;
 
     info = _big_dbus_ensure_info(connection);
 
@@ -973,9 +978,9 @@ notify_name_owner_changed(DBusConnection *connection,
     if (watch == NULL)
         return;
 
-    if ((watch->current_owner == new_owner) ||
-        (watch->current_owner && new_owner &&
-         strcmp(watch->current_owner, new_owner) == 0)) {
+    if ((watch->current_owner == new_owner)
+        || (watch->current_owner && new_owner
+            && strcmp(watch->current_owner, new_owner) == 0)) {
         /* No change */
         return;
     }
@@ -983,7 +988,7 @@ notify_name_owner_changed(DBusConnection *connection,
     /* we copy the list before iterating, because the
      * callbacks may modify it */
     watchers = g_slist_copy(watch->watchers);
-    g_slist_foreach(watchers, (GFunc)name_watcher_ref, NULL);
+    g_slist_foreach(watchers, (GFunc) name_watcher_ref, NULL);
 
     /* copy the old owner in case the watch is removed in
      * the callbacks */
@@ -991,10 +996,8 @@ notify_name_owner_changed(DBusConnection *connection,
 
     /* vanish the old owner */
     if (old_owner != NULL) {
-        for (l = watchers;
-             l != NULL;
-             l = l->next) {
-            BigNameWatcher *watcher = l->data;
+        for (l = watchers; l != NULL; l = l->next) {
+            BigNameWatcher* watcher = l->data;
 
             if (watcher->notify_idle != 0) {
                 /* Name owner changed before we notified
@@ -1011,10 +1014,8 @@ notify_name_owner_changed(DBusConnection *connection,
             }
 
             if (!watcher->destroyed) {
-                (* watcher->funcs->vanished) (connection,
-                                              name,
-                                              old_owner,
-                                              watcher->data);
+                (*watcher->funcs->vanished)(connection, name, old_owner,
+                                            watcher->data);
             }
         }
     }
@@ -1031,43 +1032,38 @@ notify_name_owner_changed(DBusConnection *connection,
 
     /* appear the new owner */
     if (new_owner != NULL) {
-        for (l = watchers;
-             l != NULL;
-             l = l->next) {
-            BigNameWatcher *watcher = l->data;
+        for (l = watchers; l != NULL; l = l->next) {
+            BigNameWatcher* watcher = l->data;
 
             if (!watcher->destroyed) {
-                (* watcher->funcs->appeared) (connection,
-                                              name,
-                                              new_owner,
-                                              watcher->data);
+                (*watcher->funcs->appeared)(connection, name, new_owner,
+                                            watcher->data);
             }
         }
     }
 
     /* now destroy our copy */
-    g_slist_foreach(watchers, (GFunc)name_watcher_unref, NULL);
+    g_slist_foreach(watchers, (GFunc) name_watcher_unref, NULL);
     g_slist_free(watchers);
 
     g_free(old_owner);
 }
 
 static DBusHandlerResult
-name_watch_filter_message(DBusConnection *connection,
-                          DBusMessage    *message,
-                          void           *data)
+name_watch_filter_message(DBusConnection* connection,
+                          DBusMessage* message,
+                          void* data)
 {
-    BigDBusInfo *info;
+    BigDBusInfo* info;
 
     info = _big_dbus_ensure_info(connection);
 
-    if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") &&
-        dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
-        const char *name = NULL;
-        const char *old_owner = NULL;
-        const char *new_owner = NULL;
-        if (dbus_message_get_args(message, NULL,
-                                  DBUS_TYPE_STRING, &name,
+    if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")
+        && dbus_message_has_sender(message, DBUS_SERVICE_DBUS)) {
+        const char* name = NULL;
+        const char* old_owner = NULL;
+        const char* new_owner = NULL;
+        if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name,
                                   DBUS_TYPE_STRING, &old_owner,
                                   DBUS_TYPE_STRING, &new_owner,
                                   DBUS_TYPE_INVALID)) {
@@ -1076,13 +1072,16 @@ name_watch_filter_message(DBusConnection *connection,
 
             notify_name_owner_changed(connection, name, new_owner);
         } else {
-            big_debug(BIG_DEBUG_UTIL_DBUS, "NameOwnerChanged has wrong arguments???");
+            big_debug(BIG_DEBUG_UTIL_DBUS,
+                      "NameOwnerChanged has wrong arguments???");
         }
-    } else if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+    } else if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL,
+                                      "Disconnected")) {
 
         big_debug(BIG_DEBUG_UTIL_DBUS, "Disconnected in %s", G_STRFUNC);
 
-        /* FIXME set all current owners to NULL, and move watches back to the pending
+        /* FIXME set all current owners to NULL, and move watches back to the
+         * pending
          * list so they are found on reconnect.
          */
     }
@@ -1090,31 +1089,25 @@ name_watch_filter_message(DBusConnection *connection,
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-
 void
-_big_dbus_set_matching_name_owner_changed(DBusConnection *connection,
-                                          const char     *bus_name,
-                                          gboolean        matched)
+_big_dbus_set_matching_name_owner_changed(DBusConnection* connection,
+                                          const char* bus_name,
+                                          gboolean matched)
 {
-    char *s;
+    char* s;
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "%s NameOwnerChanged on name '%s'",
-              matched ? "Matching" : "No longer matching",
-              bus_name);
-
-    s = g_strdup_printf("type='signal',sender='"
-                        DBUS_SERVICE_DBUS
-                        "',interface='"
-                        DBUS_INTERFACE_DBUS
-                        "',member='"
+    big_debug(BIG_DEBUG_UTIL_DBUS, "%s NameOwnerChanged on name '%s'",
+              matched ? "Matching" : "No longer matching", bus_name);
+
+    s = g_strdup_printf("type='signal',sender='" DBUS_SERVICE_DBUS
+                        "',interface='" DBUS_INTERFACE_DBUS "',member='"
                         "NameOwnerChanged"
                         "',arg0='%s'",
                         bus_name);
 
     if (matched)
-        dbus_bus_add_match(connection,
-                           s, NULL); /* asking for error would make this block */
+        dbus_bus_add_match(connection, s,
+                           NULL); /* asking for error would make this block */
     else
         dbus_bus_remove_match(connection, s, NULL);
 
@@ -1122,36 +1115,29 @@ _big_dbus_set_matching_name_owner_changed(DBusConnection *connection,
 }
 
 static void
-on_start_service_reply(BigDBusProxy    *proxy,
-                       DBusMessage     *message,
-                       void            *data)
+on_start_service_reply(BigDBusProxy* proxy, DBusMessage* message, void* data)
 {
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Got successful reply to service start");
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Got successful reply to service start");
 }
 
 static void
-on_start_service_error(BigDBusProxy    *proxy,
-                       const char      *error_name,
-                       const char      *error_message,
-                       void            *data)
+on_start_service_error(BigDBusProxy* proxy,
+                       const char* error_name,
+                       const char* error_message,
+                       void* data)
 {
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Got error starting service: %s: %s",
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Got error starting service: %s: %s",
               error_name, error_message);
 }
 
 void
-big_dbus_start_service(DBusConnection *connection,
-                       const char     *name)
+big_dbus_start_service(DBusConnection* connection, const char* name)
 {
-    DBusMessage *message;
+    DBusMessage* message;
     dbus_uint32_t flags;
-    BigDBusInfo *info;
+    BigDBusInfo* info;
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Starting service '%s'",
-              name);
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Starting service '%s'", name);
 
     info = _big_dbus_ensure_info(connection);
 
@@ -1159,15 +1145,10 @@ big_dbus_start_service(DBusConnection *connection,
                                              "StartServiceByName");
 
     flags = 0;
-    if (dbus_message_append_args(message,
-                                 DBUS_TYPE_STRING, &name,
-                                 DBUS_TYPE_UINT32, &flags,
-                                 DBUS_TYPE_INVALID)) {
-        big_dbus_proxy_send(info->driver_proxy,
-                            message,
-                            on_start_service_reply,
-                            on_start_service_error,
-                            NULL);
+    if (dbus_message_append_args(message, DBUS_TYPE_STRING, &name,
+                                 DBUS_TYPE_UINT32, &flags, DBUS_TYPE_INVALID)) {
+        big_dbus_proxy_send(info->driver_proxy, message, on_start_service_reply,
+                            on_start_service_error, NULL);
     } else {
         big_debug(BIG_DEBUG_UTIL_DBUS,
                   "No memory appending args to StartServiceByName");
@@ -1176,18 +1157,19 @@ big_dbus_start_service(DBusConnection *connection,
     dbus_message_unref(message);
 }
 
-typedef struct {
-    DBusConnection *connection;
-    char *name;
+typedef struct
+{
+    DBusConnection* connection;
+    char* name;
     BigDBusWatchNameFlags flags;
 } GetOwnerRequest;
 
 static GetOwnerRequest*
-get_owner_request_new(DBusConnection       *connection,
-                      const char           *name,
+get_owner_request_new(DBusConnection* connection,
+                      const char* name,
                       BigDBusWatchNameFlags flags)
 {
-    GetOwnerRequest *gor;
+    GetOwnerRequest* gor;
 
     gor = g_slice_new0(GetOwnerRequest);
     gor->connection = connection;
@@ -1199,7 +1181,7 @@ get_owner_request_new(DBusConnection       *connection,
 }
 
 static void
-get_owner_request_free(GetOwnerRequest *gor)
+get_owner_request_free(GetOwnerRequest* gor)
 {
     dbus_connection_unref(gor->connection);
     g_free(gor->name);
@@ -1207,11 +1189,10 @@ get_owner_request_free(GetOwnerRequest *gor)
 }
 
 static void
-on_get_owner_reply(DBusPendingCall *pending,
-                   void            *user_data)
+on_get_owner_reply(DBusPendingCall* pending, void* user_data)
 {
-    DBusMessage *reply;
-    GetOwnerRequest *gor;
+    DBusMessage* reply;
+    GetOwnerRequest* gor;
 
     gor = user_data;
 
@@ -1222,53 +1203,41 @@ on_get_owner_reply(DBusPendingCall *pending,
     }
 
     if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN) {
-        const char *current_owner = NULL;
+        const char* current_owner = NULL;
 
-        if (!dbus_message_get_args(reply, NULL,
-                                   DBUS_TYPE_STRING, &current_owner,
-                                   DBUS_TYPE_INVALID)) {
-            big_debug(BIG_DEBUG_UTIL_DBUS,
-                      "GetNameOwner has wrong args '%s'",
+        if (!dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING,
+                                   &current_owner, DBUS_TYPE_INVALID)) {
+            big_debug(BIG_DEBUG_UTIL_DBUS, "GetNameOwner has wrong args '%s'",
                       dbus_message_get_signature(reply));
         } else {
-            big_debug(BIG_DEBUG_UTIL_DBUS,
-                      "Got owner '%s' for name '%s'",
+            big_debug(BIG_DEBUG_UTIL_DBUS, "Got owner '%s' for name '%s'",
                       current_owner, gor->name);
             if (current_owner != NULL) {
-                notify_name_owner_changed(gor->connection,
-                                          gor->name,
+                notify_name_owner_changed(gor->connection, gor->name,
                                           current_owner);
             }
         }
     } else if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) {
         if (g_str_equal(dbus_message_get_error_name(reply),
                         DBUS_ERROR_NAME_HAS_NO_OWNER)) {
-            big_debug(BIG_DEBUG_UTIL_DBUS,
-                      "'%s' was not running",
-                      gor->name);
+            big_debug(BIG_DEBUG_UTIL_DBUS, "'%s' was not running", gor->name);
             if (gor->flags & BIG_DBUS_NAME_START_IF_NOT_FOUND) {
-                big_debug(BIG_DEBUG_UTIL_DBUS,
-                          "  (starting it up)");
+                big_debug(BIG_DEBUG_UTIL_DBUS, "  (starting it up)");
                 big_dbus_start_service(gor->connection, gor->name);
             } else {
                 /* no owner for now, notify app */
-                notify_name_owner_changed(gor->connection,
-                                          gor->name,
-                                          "");
+                notify_name_owner_changed(gor->connection, gor->name, "");
             }
         } else {
             big_debug(BIG_DEBUG_UTIL_DBUS,
-                      "Error getting owner of name '%s': %s",
-                      gor->name,
+                      "Error getting owner of name '%s': %s", gor->name,
                       dbus_message_get_error_name(reply));
 
             /* Notify no owner for now, ensuring the app
              * gets advised "appeared" or "vanished",
              * one or the other.
              */
-            notify_name_owner_changed(gor->connection,
-                                      gor->name,
-                                      "");
+            notify_name_owner_changed(gor->connection, gor->name, "");
         }
     } else {
         big_debug(BIG_DEBUG_UTIL_DBUS,
@@ -1279,41 +1248,35 @@ on_get_owner_reply(DBusPendingCall *pending,
 }
 
 static void
-request_name_owner(DBusConnection *connection,
-                   BigDBusInfo    *info,
-                   BigNameWatch   *watch)
+request_name_owner(DBusConnection* connection,
+                   BigDBusInfo* info,
+                   BigNameWatch* watch)
 {
-    DBusMessage *message;
-    DBusPendingCall *call;
+    DBusMessage* message;
+    DBusPendingCall* call;
 
-    message = dbus_message_new_method_call(DBUS_SERVICE_DBUS,
-                                           DBUS_PATH_DBUS,
-                                           DBUS_INTERFACE_DBUS,
-                                           "GetNameOwner");
+    message = dbus_message_new_method_call(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS,
+                                           DBUS_INTERFACE_DBUS, "GetNameOwner");
     if (message == NULL)
         g_error("no memory");
 
-    if (!dbus_message_append_args(message,
-                                  DBUS_TYPE_STRING, &watch->name,
+    if (!dbus_message_append_args(message, DBUS_TYPE_STRING, &watch->name,
                                   DBUS_TYPE_INVALID))
         g_error("no memory");
 
     call = NULL;
     dbus_connection_send_with_reply(connection, message, &call, -1);
     if (call != NULL) {
-        GetOwnerRequest *gor;
+        GetOwnerRequest* gor;
         BigDBusWatchNameFlags flags;
-        GSList *l;
+        GSList* l;
 
-        big_debug(BIG_DEBUG_UTIL_DBUS,
-                  "Sent GetNameOwner for '%s'",
+        big_debug(BIG_DEBUG_UTIL_DBUS, "Sent GetNameOwner for '%s'",
                   watch->name);
 
         flags = 0;
-        for (l = watch->watchers;
-             l != NULL;
-             l = l->next) {
-            BigNameWatcher *watcher = l->data;
+        for (l = watch->watchers; l != NULL; l = l->next) {
+            BigNameWatcher* watcher = l->data;
 
             if (watcher->flags & BIG_DBUS_NAME_START_IF_NOT_FOUND)
                 flags |= BIG_DBUS_NAME_START_IF_NOT_FOUND;
@@ -1321,9 +1284,9 @@ request_name_owner(DBusConnection *connection,
 
         gor = get_owner_request_new(connection, watch->name, flags);
 
-        if (!dbus_pending_call_set_notify(call, on_get_owner_reply,
-                                          gor,
-                                          (DBusFreeFunction) get_owner_request_free))
+        if (!dbus_pending_call_set_notify(call, on_get_owner_reply, gor,
+                                          (DBusFreeFunction)
+                                            get_owner_request_free))
             g_error("no memory");
 
         /* the connection will hold a ref to the pending call */
@@ -1338,8 +1301,8 @@ request_name_owner(DBusConnection *connection,
 static gboolean
 notify_watcher_name_appeared(gpointer data)
 {
-    BigNameWatcher *watcher;
-    DBusConnection *connection;
+    BigNameWatcher* watcher;
+    DBusConnection* connection;
 
     watcher = data;
     watcher->notify_idle = 0;
@@ -1349,20 +1312,18 @@ notify_watcher_name_appeared(gpointer data)
     if (!connection)
         return FALSE;
 
-    (* watcher->funcs->appeared) (connection,
-                                  watcher->watch->name,
-                                  watcher->watch->current_owner,
-                                  watcher->data);
+    (*watcher->funcs->appeared)(connection, watcher->watch->name,
+                                watcher->watch->current_owner, watcher->data);
     return FALSE;
 }
 
 static void
-create_watch_for_watcher(DBusConnection *connection,
-                         BigDBusInfo    *info,
-                         const char     *name,
-                         BigNameWatcher *watcher)
+create_watch_for_watcher(DBusConnection* connection,
+                         BigDBusInfo* info,
+                         const char* name,
+                         BigNameWatcher* watcher)
 {
-    BigNameWatch *watch;
+    BigNameWatch* watch;
 
     watch = g_hash_table_lookup(info->name_watches, name);
     if (watch == NULL) {
@@ -1372,7 +1333,8 @@ create_watch_for_watcher(DBusConnection *connection,
 
         watch->watchers = g_slist_prepend(watch->watchers, watcher);
 
-        _big_dbus_set_matching_name_owner_changed(connection, watch->name, TRUE);
+        _big_dbus_set_matching_name_owner_changed(connection, watch->name,
+                                                  TRUE);
 
         request_name_owner(connection, info, watch);
     } else {
@@ -1381,42 +1343,37 @@ create_watch_for_watcher(DBusConnection *connection,
     name_watcher_ref(watcher);
 
     watcher->watch = watch;
-
 }
 
 static void
-process_pending_name_watchers(DBusConnection *connection,
-                              BigDBusInfo    *info)
+process_pending_name_watchers(DBusConnection* connection, BigDBusInfo* info)
 {
-    GSList *still_pending;
+    GSList* still_pending;
 
     still_pending = NULL;
     while (pending_name_watchers != NULL) {
-        BigPendingNameWatcher *pending;
-        BigNameWatch *watch;
+        BigPendingNameWatcher* pending;
+        BigNameWatch* watch;
 
         pending = pending_name_watchers->data;
-        pending_name_watchers = g_slist_remove(pending_name_watchers,
-                                               pending_name_watchers->data);
+        pending_name_watchers
+          = g_slist_remove(pending_name_watchers, pending_name_watchers->data);
 
         if (pending->bus_type != info->bus_type) {
             still_pending = g_slist_prepend(still_pending, pending);
             continue;
         }
 
-        create_watch_for_watcher(connection,
-                                 info,
-                                 pending->name,
+        create_watch_for_watcher(connection, info, pending->name,
                                  pending->watcher);
 
         watch = pending->watcher->watch;
 
         /* If we already know the owner, let the new watcher know */
         if (watch->current_owner != NULL) {
-            (* pending->watcher->funcs->appeared) (connection,
-                                                   watch->name,
-                                                   watch->current_owner,
-                                                   pending->watcher->data);
+            (*pending->watcher->funcs->appeared)(connection, watch->name,
+                                                 watch->current_owner,
+                                                 pending->watcher->data);
         }
 
         g_free(pending->name);
@@ -1429,11 +1386,9 @@ process_pending_name_watchers(DBusConnection *connection,
 }
 
 static void
-name_watch_remove_watcher(BigNameWatch     *watch,
-                          BigNameWatcher   *watcher)
+name_watch_remove_watcher(BigNameWatch* watch, BigNameWatcher* watcher)
 {
-    watch->watchers = g_slist_remove(watch->watchers,
-                                     watcher);
+    watch->watchers = g_slist_remove(watch->watchers, watcher);
 
     if (watcher->notify_idle) {
         g_source_remove(watcher->notify_idle);
@@ -1445,47 +1400,41 @@ name_watch_remove_watcher(BigNameWatch     *watch,
 }
 
 void
-big_dbus_watch_name(DBusBusType                  bus_type,
-                    const char                  *name,
-                    BigDBusWatchNameFlags        flags,
-                    const BigDBusWatchNameFuncs *funcs,
-                    void                        *data)
+big_dbus_watch_name(DBusBusType bus_type,
+                    const char* name,
+                    BigDBusWatchNameFlags flags,
+                    const BigDBusWatchNameFuncs* funcs,
+                    void* data)
 {
-    BigNameWatcher *watcher;
-    DBusConnection *connection;
+    BigNameWatcher* watcher;
+    DBusConnection* connection;
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Adding watch on name '%s'",
-              name);
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Adding watch on name '%s'", name);
 
     watcher = name_watcher_new(flags, funcs, data, bus_type);
 
     connection = _big_dbus_get_weak_ref(bus_type);
 
     if (connection) {
-        BigDBusInfo *info;
+        BigDBusInfo* info;
 
         info = _big_dbus_ensure_info(connection);
 
-        create_watch_for_watcher(connection,
-                                 info,
-                                 name,
-                                 watcher);
+        create_watch_for_watcher(connection, info, name, watcher);
         /* The initial reference is now transferred to the watch */
         name_watcher_unref(watcher);
 
         /* If we already know the owner, notify the user in an idle */
         if (watcher->watch->current_owner) {
-            watcher->notify_idle =
-                g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-                                notify_watcher_name_appeared,
-                                watcher,
-                                (GDestroyNotify)name_watcher_unref);
+            watcher->notify_idle
+              = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+                                notify_watcher_name_appeared, watcher,
+                                (GDestroyNotify) name_watcher_unref);
             name_watcher_ref(watcher);
         }
 
     } else {
-        BigPendingNameWatcher *pending;
+        BigPendingNameWatcher* pending;
 
         pending = g_slice_new0(BigPendingNameWatcher);
 
@@ -1500,20 +1449,18 @@ big_dbus_watch_name(DBusBusType                  bus_type,
 }
 
 void
-big_dbus_unwatch_name(DBusBusType                  bus_type,
-                      const char                  *name,
-                      const BigDBusWatchNameFuncs *funcs,
-                      void                        *data)
+big_dbus_unwatch_name(DBusBusType bus_type,
+                      const char* name,
+                      const BigDBusWatchNameFuncs* funcs,
+                      void* data)
 {
-    DBusConnection *connection;
-    BigDBusInfo *info;
-    BigNameWatch *watch;
-    GSList *l;
-    BigNameWatcher *watcher;
+    DBusConnection* connection;
+    BigDBusInfo* info;
+    BigNameWatch* watch;
+    GSList* l;
+    BigNameWatcher* watcher;
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Removing watch on name '%s'",
-              name);
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Removing watch on name '%s'", name);
 
     connection = _big_dbus_get_weak_ref(bus_type);
     if (connection == NULL) {
@@ -1542,14 +1489,13 @@ big_dbus_unwatch_name(DBusBusType                  bus_type,
     for (l = watch->watchers; l != NULL; l = l->next) {
         watcher = l->data;
 
-        if (watcher->funcs == funcs &&
-            watcher->data == data)
+        if (watcher->funcs == funcs && watcher->data == data)
             break;
     }
 
     if (l == NULL) {
-        g_warning("Could not find a watch on %s matching %p %p",
-                  name, funcs, data);
+        g_warning("Could not find a watch on %s matching %p %p", name, funcs,
+                  data);
         return;
     }
     g_assert(l->data == watcher);
@@ -1560,19 +1506,19 @@ big_dbus_unwatch_name(DBusBusType                  bus_type,
     if (watch->watchers == NULL) {
         g_hash_table_remove(info->name_watches, watch->name);
 
-        _big_dbus_set_matching_name_owner_changed(connection, watch->name, FALSE);
+        _big_dbus_set_matching_name_owner_changed(connection, watch->name,
+                                                  FALSE);
 
         name_watch_free(watch);
     }
 }
 
 const char*
-big_dbus_get_watched_name_owner(DBusBusType   bus_type,
-                                const char   *name)
+big_dbus_get_watched_name_owner(DBusBusType bus_type, const char* name)
 {
-    DBusConnection *connection;
-    BigNameWatch *watch;
-    BigDBusInfo *info;
+    DBusConnection* connection;
+    BigNameWatch* watch;
+    BigDBusInfo* info;
 
     connection = _big_dbus_get_weak_ref(bus_type);
     if (connection == NULL) {
@@ -1595,13 +1541,13 @@ big_dbus_get_watched_name_owner(DBusBusType   bus_type,
 }
 
 void
-big_dbus_register_json(DBusConnection          *connection,
-                       const char              *iface_name,
-                       const BigDBusJsonMethod *methods,
-                       int                      n_methods)
+big_dbus_register_json(DBusConnection* connection,
+                       const char* iface_name,
+                       const BigDBusJsonMethod* methods,
+                       int n_methods)
 {
-    BigDBusInfo *info;
-    BigJsonIface *iface;
+    BigDBusInfo* info;
+    BigJsonIface* iface;
 
     info = _big_dbus_ensure_info(connection);
 
@@ -1611,27 +1557,26 @@ big_dbus_register_json(DBusConnection          *connection,
 }
 
 void
-big_dbus_unregister_json(DBusConnection *connection,
-                         const char     *iface_name)
+big_dbus_unregister_json(DBusConnection* connection, const char* iface_name)
 {
-    BigDBusInfo *info;
+    BigDBusInfo* info;
 
     info = _big_dbus_ensure_info(connection);
 
     g_hash_table_remove(info->json_ifaces, iface_name);
 }
 
-typedef struct {
-    DBusConnection *connection;
-    GObject *gobj;
-    char *iface_name;
+typedef struct
+{
+    DBusConnection* connection;
+    GObject* gobj;
+    char* iface_name;
 } BigDBusGObject;
 
 static void
-gobj_path_unregistered(DBusConnection  *connection,
-                       void            *user_data)
+gobj_path_unregistered(DBusConnection* connection, void* user_data)
 {
-    BigDBusGObject *g;
+    BigDBusGObject* g;
 
     g = user_data;
 
@@ -1645,25 +1590,24 @@ gobj_path_unregistered(DBusConnection  *connection,
 }
 
 static DBusHandlerResult
-gobj_path_message(DBusConnection  *connection,
-                  DBusMessage     *message,
-                  void            *user_data)
-{
-    BigDBusGObject *g;
-    BigDBusInfo *info;
-    BigJsonIface *iface;
-    const char *message_iface;
-    const char *message_method;
+gobj_path_message(DBusConnection* connection,
+                  DBusMessage* message,
+                  void* user_data)
+{
+    BigDBusGObject* g;
+    BigDBusInfo* info;
+    BigJsonIface* iface;
+    const char* message_iface;
+    const char* message_method;
     DBusError derror;
     int i;
-    const BigDBusJsonMethod *method;
+    const BigDBusJsonMethod* method;
     DBusMessageIter arg_iter, dict_iter;
 
     info = _big_dbus_ensure_info(connection);
     g = user_data;
 
-    big_debug(BIG_DEBUG_UTIL_DBUS,
-              "Received message to iface %s gobj %p",
+    big_debug(BIG_DEBUG_UTIL_DBUS, "Received message to iface %s gobj %p",
               g->iface_name, g->gobj);
 
     if (g->gobj == NULL) {
@@ -1680,24 +1624,23 @@ gobj_path_message(DBusConnection  *connection,
 
     /* FIXME implement Introspectable() just to enable dbus debugger */
 
-    if (message_iface != NULL &&
-        strcmp(message_iface, g->iface_name) != 0) {
+    if (message_iface != NULL && strcmp(message_iface, g->iface_name) != 0) {
 
-        dbus_set_error(&derror, DBUS_ERROR_UNKNOWN_METHOD,
-                       "Interface '%s' not implemented by this object, did you mean '%s'?",
-                       message_iface, g->iface_name);
+        dbus_set_error(
+          &derror, DBUS_ERROR_UNKNOWN_METHOD,
+          "Interface '%s' not implemented by this object, did you mean '%s'?",
+          message_iface, g->iface_name);
 
         goto out;
     }
 
-    iface = g_hash_table_lookup(info->json_ifaces,
-                                g->iface_name);
+    iface = g_hash_table_lookup(info->json_ifaces, g->iface_name);
     if (iface == NULL) {
-        g_warning("Object registered with iface %s but that iface is not registered",
-                  g->iface_name);
+        g_warning(
+          "Object registered with iface %s but that iface is not registered",
+          g->iface_name);
         dbus_set_error(&derror, DBUS_ERROR_UNKNOWN_METHOD,
-                       "Bug - '%s' is not registered",
-                       g->iface_name);
+                       "Bug - '%s' is not registered", g->iface_name);
         goto out;
     }
 
@@ -1712,15 +1655,16 @@ gobj_path_message(DBusConnection  *connection,
 
     if (method == NULL) {
         dbus_set_error(&derror, DBUS_ERROR_UNKNOWN_METHOD,
-                       "Interface '%s' has no method '%s'",
-                       g->iface_name, message_method);
+                       "Interface '%s' has no method '%s'", g->iface_name,
+                       message_method);
         goto out;
     }
 
     if (!dbus_message_has_signature(message, "a{sv}")) {
-        dbus_set_error(&derror, DBUS_ERROR_INVALID_ARGS,
-                       "Method %s.%s should have 1 argument which is a dictionary",
-                       g->iface_name, message_method);
+        dbus_set_error(
+          &derror, DBUS_ERROR_INVALID_ARGS,
+          "Method %s.%s should have 1 argument which is a dictionary",
+          g->iface_name, message_method);
         goto out;
     }
 
@@ -1728,26 +1672,22 @@ gobj_path_message(DBusConnection  *connection,
     dbus_message_iter_recurse(&arg_iter, &dict_iter);
 
     if (method->sync_func != NULL) {
-        DBusMessage *reply;
+        DBusMessage* reply;
         DBusMessageIter out_arg_iter, out_dict_iter;
 
         reply = dbus_message_new_method_return(message);
         if (reply == NULL) {
-            dbus_set_error(&derror, DBUS_ERROR_NO_MEMORY,
-                           "No memory");
+            dbus_set_error(&derror, DBUS_ERROR_NO_MEMORY, "No memory");
             goto out;
         }
 
         dbus_message_iter_init_append(reply, &out_arg_iter);
-        dbus_message_iter_open_container(&out_arg_iter,
-                                         DBUS_TYPE_ARRAY, "{sv}",
+        dbus_message_iter_open_container(&out_arg_iter, DBUS_TYPE_ARRAY, "{sv}",
                                          &out_dict_iter);
 
         g_object_ref(g->gobj);
-        (* method->sync_func) (connection, message,
-                               &dict_iter, &out_dict_iter,
-                               g->gobj,
-                               &derror);
+        (*method->sync_func)(connection, message, &dict_iter, &out_dict_iter,
+                             g->gobj, &derror);
         g_object_unref(g->gobj);
 
         dbus_message_iter_close_container(&out_arg_iter, &out_dict_iter);
@@ -1759,21 +1699,17 @@ gobj_path_message(DBusConnection  *connection,
 
     } else if (method->async_func != NULL) {
         g_object_ref(g->gobj);
-        (* method->async_func) (connection, message,
-                                &dict_iter,
-                                g->gobj);
+        (*method->async_func)(connection, message, &dict_iter, g->gobj);
         g_object_unref(g->gobj);
     } else {
         g_warning("Method %s does not have any implementation", method->name);
     }
 
- out:
+out:
     if (dbus_error_is_set(&derror)) {
-        DBusMessage *reply;
+        DBusMessage* reply;
 
-        reply = dbus_message_new_error(message,
-                                       derror.name,
-                                       derror.message);
+        reply = dbus_message_new_error(message, derror.name, derror.message);
         dbus_error_free(&derror);
 
         if (reply != NULL) {
@@ -1792,9 +1728,7 @@ gobj_path_message(DBusConnection  *connection,
 }
 
 static DBusObjectPathVTable gobj_vtable = {
-    gobj_path_unregistered,
-    gobj_path_message,
-    NULL,
+    gobj_path_unregistered, gobj_path_message, NULL,
 };
 
 /* Note that because of how this works, each object can be registered
@@ -1802,19 +1736,19 @@ static DBusObjectPathVTable gobj_vtable = {
  * but we'll fix it when we need it.
  */
 void
-big_dbus_register_g_object(DBusConnection *connection,
-                           const char     *path,
-                           GObject        *gobj,
-                           const char     *iface_name)
+big_dbus_register_g_object(DBusConnection* connection,
+                           const char* path,
+                           GObject* gobj,
+                           const char* iface_name)
 {
-    BigDBusGObject *g;
+    BigDBusGObject* g;
 
     g = g_slice_new0(BigDBusGObject);
     g->iface_name = g_strdup(iface_name);
     g->gobj = gobj;
 
-    if (!dbus_connection_register_object_path(connection, path,
-                                              &gobj_vtable, g)) {
+    if (!dbus_connection_register_object_path(connection, path, &gobj_vtable,
+                                              g)) {
         g_warning("Failed to register object path %s", path);
     }
 
@@ -1822,30 +1756,31 @@ big_dbus_register_g_object(DBusConnection *connection,
 }
 
 void
-big_dbus_unregister_g_object (DBusConnection *connection,
-                              const char     *path)
+big_dbus_unregister_g_object(DBusConnection* connection, const char* path)
 {
     dbus_connection_unregister_object_path(connection, path);
 }
 
 static void
-open_json_entry(DBusMessageIter *dict_iter,
-                const char      *key,
-                const char      *signature,
-                DBusMessageIter *entry_iter,
-                DBusMessageIter *variant_iter)
+open_json_entry(DBusMessageIter* dict_iter,
+                const char* key,
+                const char* signature,
+                DBusMessageIter* entry_iter,
+                DBusMessageIter* variant_iter)
 {
-    dbus_message_iter_open_container(dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, entry_iter);
+    dbus_message_iter_open_container(dict_iter, DBUS_TYPE_DICT_ENTRY, NULL,
+                                     entry_iter);
 
     dbus_message_iter_append_basic(entry_iter, DBUS_TYPE_STRING, &key);
 
-    dbus_message_iter_open_container(entry_iter, DBUS_TYPE_VARIANT, signature, variant_iter);
+    dbus_message_iter_open_container(entry_iter, DBUS_TYPE_VARIANT, signature,
+                                     variant_iter);
 }
 
 static void
-close_json_entry(DBusMessageIter *dict_iter,
-                 DBusMessageIter *entry_iter,
-                 DBusMessageIter *variant_iter)
+close_json_entry(DBusMessageIter* dict_iter,
+                 DBusMessageIter* entry_iter,
+                 DBusMessageIter* variant_iter)
 {
     dbus_message_iter_close_container(entry_iter, variant_iter);
 
@@ -1853,12 +1788,12 @@ close_json_entry(DBusMessageIter *dict_iter,
 }
 
 static void
-open_json_entry_array(DBusMessageIter *dict_iter,
-                      const char      *key,
-                      int              array_element_type,
-                      DBusMessageIter *entry_iter,
-                      DBusMessageIter *variant_iter,
-                      DBusMessageIter *array_iter)
+open_json_entry_array(DBusMessageIter* dict_iter,
+                      const char* key,
+                      int array_element_type,
+                      DBusMessageIter* entry_iter,
+                      DBusMessageIter* variant_iter,
+                      DBusMessageIter* array_iter)
 {
     char buf[3];
     buf[0] = 'a';
@@ -1867,14 +1802,15 @@ open_json_entry_array(DBusMessageIter *dict_iter,
 
     open_json_entry(dict_iter, key, buf, entry_iter, variant_iter);
 
-    dbus_message_iter_open_container(variant_iter, DBUS_TYPE_ARRAY, &buf[1], array_iter);
+    dbus_message_iter_open_container(variant_iter, DBUS_TYPE_ARRAY, &buf[1],
+                                     array_iter);
 }
 
 static void
-close_json_entry_array(DBusMessageIter *dict_iter,
-                       DBusMessageIter *entry_iter,
-                       DBusMessageIter *variant_iter,
-                       DBusMessageIter *array_iter)
+close_json_entry_array(DBusMessageIter* dict_iter,
+                       DBusMessageIter* entry_iter,
+                       DBusMessageIter* variant_iter,
+                       DBusMessageIter* array_iter)
 {
     dbus_message_iter_close_container(variant_iter, array_iter);
 
@@ -1882,10 +1818,10 @@ close_json_entry_array(DBusMessageIter *dict_iter,
 }
 
 void
-big_dbus_append_json_entry (DBusMessageIter *dict_iter,
-                            const char      *key,
-                            int              dbus_type,
-                            void            *basic_value_p)
+big_dbus_append_json_entry(DBusMessageIter* dict_iter,
+                           const char* key,
+                           int dbus_type,
+                           void* basic_value_p)
 {
     DBusMessageIter entry_iter, variant_iter;
     char buf[2];
@@ -1901,138 +1837,128 @@ big_dbus_append_json_entry (DBusMessageIter *dict_iter,
 }
 
 void
-big_dbus_append_json_entry_STRING (DBusMessageIter *dict_iter,
-                                   const char      *key,
-                                   const char      *value)
+big_dbus_append_json_entry_STRING(DBusMessageIter* dict_iter,
+                                  const char* key,
+                                  const char* value)
 {
     big_dbus_append_json_entry(dict_iter, key, DBUS_TYPE_STRING, &value);
 }
 
 void
-big_dbus_append_json_entry_INT32 (DBusMessageIter *dict_iter,
-                                  const char      *key,
-                                  dbus_int32_t     value)
+big_dbus_append_json_entry_INT32(DBusMessageIter* dict_iter,
+                                 const char* key,
+                                 dbus_int32_t value)
 {
     big_dbus_append_json_entry(dict_iter, key, DBUS_TYPE_INT32, &value);
 }
 
 void
-big_dbus_append_json_entry_DOUBLE (DBusMessageIter *dict_iter,
-                                   const char      *key,
-                                   double           value)
+big_dbus_append_json_entry_DOUBLE(DBusMessageIter* dict_iter,
+                                  const char* key,
+                                  double value)
 {
     big_dbus_append_json_entry(dict_iter, key, DBUS_TYPE_DOUBLE, &value);
 }
 
 void
-big_dbus_append_json_entry_BOOLEAN (DBusMessageIter *dict_iter,
-                                  const char      *key,
-                                  dbus_bool_t      value)
+big_dbus_append_json_entry_BOOLEAN(DBusMessageIter* dict_iter,
+                                   const char* key,
+                                   dbus_bool_t value)
 {
     big_dbus_append_json_entry(dict_iter, key, DBUS_TYPE_BOOLEAN, &value);
 }
 
-/* when coming from a dynamic language, we don't know what type of array '[]' is supposed to be */
+/* when coming from a dynamic language, we don't know what type of array '[]' is
+ * supposed to be */
 void
-big_dbus_append_json_entry_EMPTY_ARRAY (DBusMessageIter  *dict_iter,
-                                        const char       *key)
+big_dbus_append_json_entry_EMPTY_ARRAY(DBusMessageIter* dict_iter,
+                                       const char* key)
 {
     DBusMessageIter entry_iter, variant_iter, array_iter;
 
-    /* so just say VARIANT even though there won't be any elements in the array */
-    open_json_entry_array(dict_iter, key, DBUS_TYPE_VARIANT, &entry_iter, &variant_iter, &array_iter);
+    /* so just say VARIANT even though there won't be any elements in the array
+     */
+    open_json_entry_array(dict_iter, key, DBUS_TYPE_VARIANT, &entry_iter,
+                          &variant_iter, &array_iter);
 
     close_json_entry_array(dict_iter, &entry_iter, &variant_iter, &array_iter);
 }
 
 void
-big_dbus_append_json_entry_STRING_ARRAY (DBusMessageIter  *dict_iter,
-                                         const char       *key,
-                                         const char      **value)
+big_dbus_append_json_entry_STRING_ARRAY(DBusMessageIter* dict_iter,
+                                        const char* key,
+                                        const char** value)
 {
     DBusMessageIter entry_iter, variant_iter, array_iter;
     int i;
 
-    open_json_entry_array(dict_iter, key, DBUS_TYPE_STRING, &entry_iter, &variant_iter, &array_iter);
+    open_json_entry_array(dict_iter, key, DBUS_TYPE_STRING, &entry_iter,
+                          &variant_iter, &array_iter);
 
     for (i = 0; value[i] != NULL; ++i) {
-        dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_STRING, &value[i]);
+        dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_STRING,
+                                       &value[i]);
     }
 
     close_json_entry_array(dict_iter, &entry_iter, &variant_iter, &array_iter);
 }
 
 gboolean
-big_dbus_message_iter_get_gsize(DBusMessageIter  *iter,
-                                gsize            *value_p)
+big_dbus_message_iter_get_gsize(DBusMessageIter* iter, gsize* value_p)
 {
     switch (dbus_message_iter_get_arg_type(iter)) {
-    case DBUS_TYPE_INT32:
-        {
+        case DBUS_TYPE_INT32: {
             dbus_int32_t v;
             dbus_message_iter_get_basic(iter, &v);
             if (v < 0)
                 return FALSE;
             *value_p = v;
-        }
-        break;
-    case DBUS_TYPE_UINT32:
-        {
+        } break;
+        case DBUS_TYPE_UINT32: {
             dbus_uint32_t v;
             dbus_message_iter_get_basic(iter, &v);
             *value_p = v;
-        }
-        break;
-    case DBUS_TYPE_INT64:
-        {
+        } break;
+        case DBUS_TYPE_INT64: {
             dbus_int64_t v;
             dbus_message_iter_get_basic(iter, &v);
             if (v < 0)
                 return FALSE;
-            if (((guint64)v) > G_MAXSIZE)
+            if (((guint64) v) > G_MAXSIZE)
                 return FALSE;
             *value_p = v;
-        }
-        break;
-    case DBUS_TYPE_UINT64:
-        {
+        } break;
+        case DBUS_TYPE_UINT64: {
             dbus_uint64_t v;
             dbus_message_iter_get_basic(iter, &v);
             if (v > G_MAXSIZE)
                 return FALSE;
             *value_p = v;
-        }
-        break;
-    default:
-        return FALSE;
+        } break;
+        default:
+            return FALSE;
     }
 
     return TRUE;
 }
 
 gboolean
-big_dbus_message_iter_get_gssize(DBusMessageIter  *iter,
-                                 gssize           *value_p)
+big_dbus_message_iter_get_gssize(DBusMessageIter* iter, gssize* value_p)
 {
     switch (dbus_message_iter_get_arg_type(iter)) {
-    case DBUS_TYPE_INT32:
-        {
+        case DBUS_TYPE_INT32: {
             dbus_int32_t v;
             dbus_message_iter_get_basic(iter, &v);
             *value_p = v;
-        }
-        break;
-    case DBUS_TYPE_UINT32:
-        {
+        } break;
+        case DBUS_TYPE_UINT32: {
             dbus_uint32_t v;
             dbus_message_iter_get_basic(iter, &v);
             if (v > (guint32) G_MAXSSIZE)
                 return FALSE;
             *value_p = v;
-        }
-        break;
-    case DBUS_TYPE_INT64:
-        {
+        } break;
+        case DBUS_TYPE_INT64: {
             dbus_int64_t v;
             dbus_message_iter_get_basic(iter, &v);
             if (v > (gint64) G_MAXSSIZE)
@@ -2040,19 +1966,16 @@ big_dbus_message_iter_get_gssize(DBusMessageIter  *iter,
             if (v < (gint64) G_MINSSIZE)
                 return FALSE;
             *value_p = v;
-        }
-        break;
-    case DBUS_TYPE_UINT64:
-        {
+        } break;
+        case DBUS_TYPE_UINT64: {
             dbus_uint64_t v;
             dbus_message_iter_get_basic(iter, &v);
             if (v > (guint64) G_MAXSSIZE)
                 return FALSE;
             *value_p = v;
-        }
-        break;
-    default:
-        return FALSE;
+        } break;
+        default:
+            return FALSE;
     }
 
     return TRUE;
@@ -2073,23 +1996,27 @@ big_dbus_message_iter_get_gssize(DBusMessageIter  *iter,
 #include <sys/wait.h>
 
 static pid_t test_service_pid = 0;
-static BigDBusProxy *test_service_proxy = NULL;
+static BigDBusProxy* test_service_proxy = NULL;
 
 static pid_t test_io_pid = 0;
-static BigDBusProxy *test_io_proxy = NULL;
+static BigDBusProxy* test_io_proxy = NULL;
 
-static GMainLoop *client_loop = NULL;
+static GMainLoop* client_loop = NULL;
 
 static int n_running_children = 0;
 
-static BigDBusInputStream  *input_from_io_service;
-static BigDBusOutputStream *output_to_io_service;
+static BigDBusInputStream* input_from_io_service;
+static BigDBusOutputStream* output_to_io_service;
 
-static const char stream_data_to_io_service[] = "This is sent from the main test process to the IO service.";
-static const char stream_data_from_io_service[] = "This is sent from the IO service to the main test process. The quick brown fox, etc.";
+static const char stream_data_to_io_service[]
+  = "This is sent from the main test process to the IO service.";
+static const char stream_data_from_io_service[] = "This is sent from the IO "
+                                                  "service to the main test "
+                                                  "process. The quick brown "
+                                                  "fox, etc.";
 
-static void do_test_service_child (void);
-static void do_test_io_child      (void);
+static void do_test_service_child(void);
+static void do_test_io_child(void);
 
 /* quit when all children are gone */
 static void
@@ -2104,16 +2031,16 @@ another_child_down(void)
 }
 
 static const char*
-extract_string_arg(DBusMessageIter *in_iter,
-                   const char      *prop_name,
-                   DBusError       *error)
+extract_string_arg(DBusMessageIter* in_iter,
+                   const char* prop_name,
+                   DBusError* error)
 {
-    const char *s;
+    const char* s;
 
     s = NULL;
     while (dbus_message_iter_get_arg_type(in_iter) == DBUS_TYPE_DICT_ENTRY) {
         DBusMessageIter entry_iter, variant_iter;
-        const char *key;
+        const char* key;
 
         dbus_message_iter_recurse(in_iter, &entry_iter);
 
@@ -2123,7 +2050,8 @@ extract_string_arg(DBusMessageIter *in_iter,
             dbus_message_iter_next(&entry_iter);
 
             dbus_message_iter_recurse(&entry_iter, &variant_iter);
-            if (dbus_message_iter_get_arg_type(&variant_iter) != DBUS_TYPE_STRING) {
+            if (dbus_message_iter_get_arg_type(&variant_iter)
+                != DBUS_TYPE_STRING) {
                 dbus_set_error(error, DBUS_ERROR_INVALID_ARGS,
                                "Value of '%s' prop should be a string",
                                prop_name);
@@ -2136,8 +2064,8 @@ extract_string_arg(DBusMessageIter *in_iter,
         }
     }
 
-    dbus_set_error(error, DBUS_ERROR_INVALID_ARGS,
-                   "No '%s' prop provided", prop_name);
+    dbus_set_error(error, DBUS_ERROR_INVALID_ARGS, "No '%s' prop provided",
+                   prop_name);
     return NULL;
 }
 
@@ -2199,22 +2127,23 @@ fork_child_test_io(void)
 }
 
 static void
-on_expected_fnf_error_reply_kill_child(BigDBusProxy    *proxy,
-                                       const char      *error_name,
-                                       const char      *error_message,
-                                       void            *data)
+on_expected_fnf_error_reply_kill_child(BigDBusProxy* proxy,
+                                       const char* error_name,
+                                       const char* error_message,
+                                       void* data)
 {
     big_debug(BIG_DEBUG_IN_TESTS,
               "got expected error reply to alwaysErrorSync, killing child");
 
     /* We were expecting an error, good. */
     if (strcmp(error_name, DBUS_ERROR_FILE_NOT_FOUND) != 0) {
-        g_error("Got error we did not expect %s: %s",
-                error_name, error_message);
+        g_error("Got error we did not expect %s: %s", error_name,
+                error_message);
     }
 
     if (kill(test_service_pid, SIGTERM) < 0) {
-        g_error("Test service was no longer around... it must have failed somehow (%s)",
+        g_error("Test service was no longer around... it must have failed "
+                "somehow (%s)",
                 strerror(errno));
     }
 
@@ -2222,148 +2151,132 @@ on_expected_fnf_error_reply_kill_child(BigDBusProxy    *proxy,
 }
 
 static void
-on_unexpected_error_reply(BigDBusProxy    *proxy,
-                          const char      *error_name,
-                          const char      *error_message,
-                          void            *data)
+on_unexpected_error_reply(BigDBusProxy* proxy,
+                          const char* error_name,
+                          const char* error_message,
+                          void* data)
 {
-    const char *context_text = data;
+    const char* context_text = data;
 
-    g_error("Got error %s: '%s' context was: %s",
-            error_name, error_message, context_text);
+    g_error("Got error %s: '%s' context was: %s", error_name, error_message,
+            context_text);
 }
 
 static void
-on_get_always_error_reply(BigDBusProxy    *proxy,
-                          DBusMessage     *message,
-                          DBusMessageIter *return_value_iter,
-                          void            *data)
+on_get_always_error_reply(BigDBusProxy* proxy,
+                          DBusMessage* message,
+                          DBusMessageIter* return_value_iter,
+                          void* data)
 {
-    g_error("alwaysError json method supposed to return an error always, not a valid reply");
+    g_error("alwaysError json method supposed to return an error always, not a "
+            "valid reply");
 }
 
 static void
-on_get_some_stuff_reply(BigDBusProxy    *proxy,
-                        DBusMessage     *message,
-                        DBusMessageIter *return_value_iter,
-                        void            *data)
+on_get_some_stuff_reply(BigDBusProxy* proxy,
+                        DBusMessage* message,
+                        DBusMessageIter* return_value_iter,
+                        void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "reply received to getSomeStuffSync");
+    big_debug(BIG_DEBUG_IN_TESTS, "reply received to getSomeStuffSync");
 
     /* FIXME look at the return value to see if it's what
      * the test service sends
      */
 
-    big_dbus_proxy_call_json_async(test_service_proxy,
-                                   "alwaysErrorSync",
+    big_dbus_proxy_call_json_async(test_service_proxy, "alwaysErrorSync",
                                    on_get_always_error_reply,
-                                   on_expected_fnf_error_reply_kill_child,
-                                   NULL,
+                                   on_expected_fnf_error_reply_kill_child, NULL,
                                    NULL);
 }
 
 static void
-on_test_service_appeared(DBusConnection *connection,
-                         const char     *name,
-                         const char     *new_owner_unique_name,
-                         void           *data)
+on_test_service_appeared(DBusConnection* connection,
+                         const char* name,
+                         const char* new_owner_unique_name,
+                         void* data)
 {
     dbus_int32_t v_INT32;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "%s appeared",
-              name);
+    big_debug(BIG_DEBUG_IN_TESTS, "%s appeared", name);
 
-    test_service_proxy =
-        big_dbus_proxy_new(connection, new_owner_unique_name,
-                           "/com/litl/test/object42",
-                           "com.litl.TestIface");
+    test_service_proxy
+      = big_dbus_proxy_new(connection, new_owner_unique_name,
+                           "/com/litl/test/object42", "com.litl.TestIface");
     v_INT32 = 42;
-    big_dbus_proxy_call_json_async(test_service_proxy,
-                                   "getSomeStuffSync",
-                                   on_get_some_stuff_reply,
-                                   on_unexpected_error_reply,
-                                   "getSomeStuffSync call from on_test_service_appeared",
-                                   "yourNameIs", DBUS_TYPE_STRING, &name,
-                                   "yourUniqueNameIs", DBUS_TYPE_STRING, &new_owner_unique_name,
-                                   "anIntegerIs", DBUS_TYPE_INT32, &v_INT32,
-                                   NULL);
+    big_dbus_proxy_call_json_async(
+      test_service_proxy, "getSomeStuffSync", on_get_some_stuff_reply,
+      on_unexpected_error_reply,
+      "getSomeStuffSync call from on_test_service_appeared", "yourNameIs",
+      DBUS_TYPE_STRING, &name, "yourUniqueNameIs", DBUS_TYPE_STRING,
+      &new_owner_unique_name, "anIntegerIs", DBUS_TYPE_INT32, &v_INT32, NULL);
 }
 
 static void
-on_test_service_vanished(DBusConnection *connection,
-                         const char     *name,
-                         const char     *old_owner_unique_name,
-                         void           *data)
+on_test_service_vanished(DBusConnection* connection,
+                         const char* name,
+                         const char* old_owner_unique_name,
+                         void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "%s vanished", name);
+    big_debug(BIG_DEBUG_IN_TESTS, "%s vanished", name);
 
     another_child_down();
 }
 
-static BigDBusWatchNameFuncs watch_test_service_funcs = {
-    on_test_service_appeared,
-    on_test_service_vanished
-};
+static BigDBusWatchNameFuncs watch_test_service_funcs
+  = { on_test_service_appeared, on_test_service_vanished };
 
 static void
-on_confirm_streams_reply(BigDBusProxy    *proxy,
-                         DBusMessage     *message,
-                         DBusMessageIter *return_value_iter,
-                         void            *data)
+on_confirm_streams_reply(BigDBusProxy* proxy,
+                         DBusMessage* message,
+                         DBusMessageIter* return_value_iter,
+                         void* data)
 {
-    const char *received;
+    const char* received;
 
-    received = extract_string_arg(return_value_iter,
-                                  "received",
-                                  NULL);
+    received = extract_string_arg(return_value_iter, "received", NULL);
     g_assert(received != NULL);
 
     if (strcmp(received, stream_data_to_io_service) != 0) {
         g_error("We sent the child process '%s' but it says it got '%s'",
-                stream_data_to_io_service,
-                received);
+                stream_data_to_io_service, received);
     }
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestIO says it got: '%s'", received);
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestIO says it got: '%s'",
+              received);
 
     /* We've exchanged all our streams - time to kill the TestIO
      * child process
      */
     big_debug(BIG_DEBUG_IN_TESTS, "Sending TERM to TestIO child");
     if (kill(test_io_pid, SIGTERM) < 0) {
-        g_error("Test IO service was no longer around... it must have failed somehow (%s)",
+        g_error("Test IO service was no longer around... it must have failed "
+                "somehow (%s)",
                 strerror(errno));
     }
 }
 
 static void
-on_setup_streams_reply(BigDBusProxy    *proxy,
-                       DBusMessage     *message,
-                       DBusMessageIter *return_value_iter,
-                       void            *data)
+on_setup_streams_reply(BigDBusProxy* proxy,
+                       DBusMessage* message,
+                       DBusMessageIter* return_value_iter,
+                       void* data)
 {
-    const char *stream_path;
+    const char* stream_path;
     gsize total;
     gssize result;
     gsize read_size;
-    GError *error;
-    GString *str;
+    GError* error;
+    GString* str;
     char buf[10];
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "Got reply to setupStreams");
+    big_debug(BIG_DEBUG_IN_TESTS, "Got reply to setupStreams");
 
-    stream_path = extract_string_arg(return_value_iter,
-                                     "stream",
-                                     NULL);
+    stream_path = extract_string_arg(return_value_iter, "stream", NULL);
     g_assert(stream_path != NULL);
 
-    output_to_io_service =
-        big_dbus_output_stream_new(big_dbus_proxy_get_connection(proxy),
+    output_to_io_service
+      = big_dbus_output_stream_new(big_dbus_proxy_get_connection(proxy),
                                    dbus_message_get_sender(message),
                                    stream_path);
 
@@ -2375,10 +2288,7 @@ on_setup_streams_reply(BigDBusProxy    *proxy,
 
     error = NULL;
     result = g_output_stream_write(G_OUTPUT_STREAM(output_to_io_service),
-                                   stream_data_to_io_service,
-                                   10,
-                                   NULL,
-                                   &error);
+                                   stream_data_to_io_service, 10, NULL, &error);
     if (result < 0) {
         g_error("Error writing to output stream: %s", error->message);
         g_error_free(error);
@@ -2389,8 +2299,7 @@ on_setup_streams_reply(BigDBusProxy    *proxy,
     }
 
     if (!g_output_stream_write_all(G_OUTPUT_STREAM(output_to_io_service),
-                                   stream_data_to_io_service + 10,
-                                   total - 10,
+                                   stream_data_to_io_service + 10, total - 10,
                                    NULL, NULL, &error)) {
         g_error("Error writing all to output stream: %s", error->message);
         g_error_free(error);
@@ -2399,12 +2308,14 @@ on_setup_streams_reply(BigDBusProxy    *proxy,
     /* flush should do nothing here, and is not needed, but
      * just calling it to test it
      */
-    if (!g_output_stream_flush(G_OUTPUT_STREAM(output_to_io_service), NULL, &error)) {
+    if (!g_output_stream_flush(G_OUTPUT_STREAM(output_to_io_service), NULL,
+                               &error)) {
         g_error("Error flushing output stream: %s", error->message);
         g_error_free(error);
     }
 
-    if (!g_output_stream_close(G_OUTPUT_STREAM(output_to_io_service), NULL, &error)) {
+    if (!g_output_stream_close(G_OUTPUT_STREAM(output_to_io_service), NULL,
+                               &error)) {
         g_error("Error closing output stream: %s", error->message);
         g_error_free(error);
     }
@@ -2420,16 +2331,15 @@ on_setup_streams_reply(BigDBusProxy    *proxy,
 
     while (TRUE) {
         /* test get_received() */
-        g_assert(big_dbus_input_stream_get_received(input_from_io_service) <= strlen(stream_data_from_io_service));
+        g_assert(big_dbus_input_stream_get_received(input_from_io_service)
+                 <= strlen(stream_data_from_io_service));
 
         /* This is a blocking read... in production code, you would
          * want to use the ready-to-read signal instead to avoid
          * blocking when there is nothing to read.
          */
-        result = g_input_stream_read(G_INPUT_STREAM(input_from_io_service),
-                                     buf,
-                                     read_size,
-                                     NULL, &error);
+        result = g_input_stream_read(G_INPUT_STREAM(input_from_io_service), buf,
+                                     read_size, NULL, &error);
         if (result < 0) {
             g_error("Error reading %d bytes from input stream: %s",
                     (int) read_size, error->message);
@@ -2447,7 +2357,8 @@ on_setup_streams_reply(BigDBusProxy    *proxy,
             read_size += 1;
     }
 
-    if (!g_input_stream_close(G_INPUT_STREAM(input_from_io_service), NULL, &error)) {
+    if (!g_input_stream_close(G_INPUT_STREAM(input_from_io_service), NULL,
+                              &error)) {
         g_error("Error closing input stream: %s", error->message);
         g_error_free(error);
     }
@@ -2456,45 +2367,38 @@ on_setup_streams_reply(BigDBusProxy    *proxy,
 
     /* Now make the confirmStreams call
      */
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "Confirming to com.litl.TestIO we got: '%s'", str->str);
+    big_debug(BIG_DEBUG_IN_TESTS, "Confirming to com.litl.TestIO we got: '%s'",
+              str->str);
 
-    big_dbus_proxy_call_json_async(test_io_proxy,
-                                   "confirmStreamsData",
-                                   on_confirm_streams_reply,
-                                   on_unexpected_error_reply,
-                                   "confirmStreamsData call from on_setup_streams_reply",
-                                   "received", DBUS_TYPE_STRING, &str->str,
-                                   NULL);
+    big_dbus_proxy_call_json_async(
+      test_io_proxy, "confirmStreamsData", on_confirm_streams_reply,
+      on_unexpected_error_reply,
+      "confirmStreamsData call from on_setup_streams_reply", "received",
+      DBUS_TYPE_STRING, &str->str, NULL);
 
     g_string_free(str, TRUE);
 }
 
 static void
-on_test_io_appeared(DBusConnection *connection,
-                    const char     *name,
-                    const char     *new_owner_unique_name,
-                    void           *data)
+on_test_io_appeared(DBusConnection* connection,
+                    const char* name,
+                    const char* new_owner_unique_name,
+                    void* data)
 {
-    const char *stream_path;
+    const char* stream_path;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "%s appeared",
-              name);
+    big_debug(BIG_DEBUG_IN_TESTS, "%s appeared", name);
 
-    test_io_proxy =
-        big_dbus_proxy_new(connection, new_owner_unique_name,
-                           "/com/litl/test/object47",
-                           "com.litl.TestIO");
+    test_io_proxy
+      = big_dbus_proxy_new(connection, new_owner_unique_name,
+                           "/com/litl/test/object47", "com.litl.TestIO");
 
-    input_from_io_service =
-        g_object_new(BIG_TYPE_DBUS_INPUT_STREAM, NULL);
+    input_from_io_service = g_object_new(BIG_TYPE_DBUS_INPUT_STREAM, NULL);
     big_dbus_input_stream_attach(input_from_io_service, connection);
 
     stream_path = big_dbus_input_stream_get_path(input_from_io_service);
 
-    big_dbus_proxy_call_json_async(test_io_proxy,
-                                   "setupStreams",
+    big_dbus_proxy_call_json_async(test_io_proxy, "setupStreams",
                                    on_setup_streams_reply,
                                    on_unexpected_error_reply,
                                    "setupStreams call from on_test_io_appeared",
@@ -2503,21 +2407,18 @@ on_test_io_appeared(DBusConnection *connection,
 }
 
 static void
-on_test_io_vanished(DBusConnection *connection,
-                    const char     *name,
-                    const char     *old_owner_unique_name,
-                    void           *data)
+on_test_io_vanished(DBusConnection* connection,
+                    const char* name,
+                    const char* old_owner_unique_name,
+                    void* data)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "%s vanished", name);
+    big_debug(BIG_DEBUG_IN_TESTS, "%s vanished", name);
 
     another_child_down();
 }
 
-static BigDBusWatchNameFuncs watch_test_io_funcs = {
-    on_test_io_appeared,
-    on_test_io_vanished
-};
+static BigDBusWatchNameFuncs watch_test_io_funcs
+  = { on_test_io_appeared, on_test_io_vanished };
 
 void
 bigtest_test_func_util_dbus_client(void)
@@ -2552,17 +2453,11 @@ bigtest_test_func_util_dbus_client(void)
     g_assert(test_service_pid != 0);
     g_assert(test_io_pid != 0);
 
-    big_dbus_watch_name(DBUS_BUS_SESSION,
-                        "com.litl.TestService",
-                        0,
-                        &watch_test_service_funcs,
-                        NULL);
+    big_dbus_watch_name(DBUS_BUS_SESSION, "com.litl.TestService", 0,
+                        &watch_test_service_funcs, NULL);
 
-    big_dbus_watch_name(DBUS_BUS_SESSION,
-                        "com.litl.TestIO",
-                        0,
-                        &watch_test_io_funcs,
-                        NULL);
+    big_dbus_watch_name(DBUS_BUS_SESSION, "com.litl.TestIO", 0,
+                        &watch_test_io_funcs, NULL);
 
     client_loop = g_main_loop_new(NULL, FALSE);
 
@@ -2576,8 +2471,7 @@ bigtest_test_func_util_dbus_client(void)
 
     /* child was killed already, or should have been */
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "waitpid() for first child");
+    big_debug(BIG_DEBUG_IN_TESTS, "waitpid() for first child");
 
     result = waitpid(test_service_pid, &status, 0);
     if (result < 0) {
@@ -2585,15 +2479,16 @@ bigtest_test_func_util_dbus_client(void)
     }
 
     if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
-        g_error("Forked dbus service child exited with error code %d", WEXITSTATUS(status));
+        g_error("Forked dbus service child exited with error code %d",
+                WEXITSTATUS(status));
     }
 
     if (WIFSIGNALED(status) && WTERMSIG(status) != SIGTERM) {
-        g_error("Forked dbus service child exited on wrong signal number %d", WTERMSIG(status));
+        g_error("Forked dbus service child exited on wrong signal number %d",
+                WTERMSIG(status));
     }
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "waitpid() for second child");
+    big_debug(BIG_DEBUG_IN_TESTS, "waitpid() for second child");
 
     result = waitpid(test_io_pid, &status, 0);
     if (result < 0) {
@@ -2601,11 +2496,13 @@ bigtest_test_func_util_dbus_client(void)
     }
 
     if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
-        g_error("Forked dbus service child exited with error code %d", WEXITSTATUS(status));
+        g_error("Forked dbus service child exited with error code %d",
+                WEXITSTATUS(status));
     }
 
     if (WIFSIGNALED(status) && WTERMSIG(status) != SIGTERM) {
-        g_error("Forked dbus service child exited on wrong signal number %d", WTERMSIG(status));
+        g_error("Forked dbus service child exited on wrong signal number %d",
+                WTERMSIG(status));
     }
 
     big_debug(BIG_DEBUG_IN_TESTS, "dbus client test completed");
@@ -2630,36 +2527,33 @@ bigtest_test_func_util_dbus_client(void)
  */
 
 static gboolean currently_have_test_service = FALSE;
-static GObject *test_service_object = NULL;
+static GObject* test_service_object = NULL;
 
 static void
-test_service_get_some_stuff_sync(DBusConnection  *connection,
-                                 DBusMessage     *message,
-                                 DBusMessageIter *in_iter,
-                                 DBusMessageIter *out_iter,
-                                 void            *data,
-                                 DBusError       *error)
+test_service_get_some_stuff_sync(DBusConnection* connection,
+                                 DBusMessage* message,
+                                 DBusMessageIter* in_iter,
+                                 DBusMessageIter* out_iter,
+                                 void* data,
+                                 DBusError* error)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestService got getSomeStuffSync");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestService got getSomeStuffSync");
 
     g_assert(G_IS_OBJECT(data));
 
-    big_dbus_append_json_entry_BOOLEAN(out_iter,
-                                       "haveTestService",
+    big_dbus_append_json_entry_BOOLEAN(out_iter, "haveTestService",
                                        currently_have_test_service);
 }
 
 static void
-test_service_always_error_sync(DBusConnection  *connection,
-                               DBusMessage     *message,
-                               DBusMessageIter *in_iter,
-                               DBusMessageIter *out_iter,
-                               void            *data,
-                               DBusError       *error)
+test_service_always_error_sync(DBusConnection* connection,
+                               DBusMessage* message,
+                               DBusMessageIter* in_iter,
+                               DBusMessageIter* out_iter,
+                               void* data,
+                               DBusError* error)
 {
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestService got alwaysErrorSync");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestService got alwaysErrorSync");
 
     g_assert(G_IS_OBJECT(data));
 
@@ -2667,72 +2561,57 @@ test_service_always_error_sync(DBusConnection  *connection,
                    "Did not find some kind of file! Help!");
 }
 
-static BigDBusJsonMethod test_service_methods[] = {
-    { "getSomeStuffSync", test_service_get_some_stuff_sync, NULL },
-    { "alwaysErrorSync",  test_service_always_error_sync, NULL }
-};
+static BigDBusJsonMethod test_service_methods[]
+  = { { "getSomeStuffSync", test_service_get_some_stuff_sync, NULL },
+      { "alwaysErrorSync", test_service_always_error_sync, NULL } };
 
 static void
-on_test_service_acquired(DBusConnection *connection,
-                         const char     *name,
-                         void           *data)
+on_test_service_acquired(DBusConnection* connection,
+                         const char* name,
+                         void* data)
 {
     g_assert(!currently_have_test_service);
     currently_have_test_service = TRUE;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestService acquired by child");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestService acquired by child");
 
-    big_dbus_register_json(connection,
-                           "com.litl.TestIface",
+    big_dbus_register_json(connection, "com.litl.TestIface",
                            test_service_methods,
                            G_N_ELEMENTS(test_service_methods));
 
     test_service_object = g_object_new(G_TYPE_OBJECT, NULL);
 
-    big_dbus_register_g_object(connection,
-                               "/com/litl/test/object42",
-                               test_service_object,
-                               "com.litl.TestIface");
+    big_dbus_register_g_object(connection, "/com/litl/test/object42",
+                               test_service_object, "com.litl.TestIface");
 }
 
 static void
-on_test_service_lost(DBusConnection *connection,
-                     const char     *name,
-                     void           *data)
+on_test_service_lost(DBusConnection* connection, const char* name, void* data)
 {
     g_assert(currently_have_test_service);
     currently_have_test_service = FALSE;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestService lost by child");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestService lost by child");
 
-    big_dbus_unregister_g_object(connection,
-                                 "/com/litl/test/object42");
+    big_dbus_unregister_g_object(connection, "/com/litl/test/object42");
 
-    big_dbus_unregister_json(connection,
-                             "com.litl.TestIface");
+    big_dbus_unregister_json(connection, "com.litl.TestIface");
 }
 
-static BigDBusNameOwnerFuncs test_service_funcs = {
-    "com.litl.TestService",
-    BIG_DBUS_NAME_SINGLE_INSTANCE,
-    on_test_service_acquired,
-    on_test_service_lost
-};
+static BigDBusNameOwnerFuncs test_service_funcs
+  = { "com.litl.TestService", BIG_DBUS_NAME_SINGLE_INSTANCE,
+      on_test_service_acquired, on_test_service_lost };
 
 static void
 do_test_service_child(void)
 {
-    GMainLoop *loop;
+    GMainLoop* loop;
 
     g_type_init();
 
     loop = g_main_loop_new(NULL, FALSE);
 
-    big_dbus_acquire_name(DBUS_BUS_SESSION,
-                          &test_service_funcs,
-                          NULL);
+    big_dbus_acquire_name(DBUS_BUS_SESSION, &test_service_funcs, NULL);
 
     g_main_loop_run(loop);
 
@@ -2745,25 +2624,24 @@ do_test_service_child(void)
  */
 
 static gboolean currently_have_test_io = FALSE;
-static GObject *test_io_object = NULL;
+static GObject* test_io_object = NULL;
 
-static BigDBusInputStream  *io_input_stream = NULL;
-static BigDBusOutputStream *io_output_stream = NULL;
+static BigDBusInputStream* io_input_stream = NULL;
+static BigDBusOutputStream* io_output_stream = NULL;
 
-static GString *input_buffer = NULL;
+static GString* input_buffer = NULL;
 
 static void
-test_io_confirm_streams_data(DBusConnection  *connection,
-                             DBusMessage     *message,
-                             DBusMessageIter *in_iter,
-                             DBusMessageIter *out_iter,
-                             void            *data,
-                             DBusError       *error)
+test_io_confirm_streams_data(DBusConnection* connection,
+                             DBusMessage* message,
+                             DBusMessageIter* in_iter,
+                             DBusMessageIter* out_iter,
+                             void* data,
+                             DBusError* error)
 {
-    const char *received;
+    const char* received;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestIO got confirmStreamsData");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestIO got confirmStreamsData");
 
     g_assert(G_IS_OBJECT(data));
 
@@ -2775,8 +2653,7 @@ test_io_confirm_streams_data(DBusConnection  *connection,
 
     if (strcmp(received, stream_data_from_io_service) != 0) {
         g_error("We sent the main process '%s' but it says it got '%s'",
-                stream_data_from_io_service,
-                received);
+                stream_data_from_io_service, received);
         return;
     }
 
@@ -2790,46 +2667,41 @@ test_io_confirm_streams_data(DBusConnection  *connection,
         g_main_context_iteration(NULL, TRUE);
     }
 
-    big_dbus_append_json_entry_STRING(out_iter,
-                                      "received",
-                                      input_buffer->str);
+    big_dbus_append_json_entry_STRING(out_iter, "received", input_buffer->str);
 
     g_string_free(input_buffer, TRUE);
     input_buffer = NULL;
 }
 
 static void
-on_input_ready(BigDBusInputStream *dbus_stream,
-               void               *data)
+on_input_ready(BigDBusInputStream* dbus_stream, void* data)
 {
-    GInputStream *stream;
+    GInputStream* stream;
     char buf[3];
     gssize result;
-    GError *error;
+    GError* error;
 
     stream = G_INPUT_STREAM(dbus_stream);
 
     g_assert(dbus_stream == io_input_stream);
 
     /* test get_received() */
-    g_assert(big_dbus_input_stream_get_received(dbus_stream) <= strlen(stream_data_to_io_service));
+    g_assert(big_dbus_input_stream_get_received(dbus_stream)
+             <= strlen(stream_data_to_io_service));
 
     /* Should not block, since we got the ready-to-read signal */
     error = NULL;
-    result = g_input_stream_read(G_INPUT_STREAM(io_input_stream),
-                                 buf,
-                                 sizeof(buf),
-                                 NULL,
-                                 &error);
+    result = g_input_stream_read(G_INPUT_STREAM(io_input_stream), buf,
+                                 sizeof(buf), NULL, &error);
     if (result < 0) {
-        g_error("Error reading bytes from input stream: %s",
-                error->message);
+        g_error("Error reading bytes from input stream: %s", error->message);
         g_error_free(error);
     }
 
     if (result == 0) {
         /* EOF */
-        if (!g_input_stream_close(G_INPUT_STREAM(io_input_stream), NULL, &error)) {
+        if (!g_input_stream_close(G_INPUT_STREAM(io_input_stream), NULL,
+                                  &error)) {
             g_error("Error closing input stream in child: %s", error->message);
             g_error_free(error);
         }
@@ -2847,21 +2719,20 @@ on_input_ready(BigDBusInputStream *dbus_stream,
 }
 
 static void
-test_io_setup_streams(DBusConnection  *connection,
-                      DBusMessage     *message,
-                      DBusMessageIter *in_iter,
-                      DBusMessageIter *out_iter,
-                      void            *data,
-                      DBusError       *error)
-{
-    const char *stream_path;
+test_io_setup_streams(DBusConnection* connection,
+                      DBusMessage* message,
+                      DBusMessageIter* in_iter,
+                      DBusMessageIter* out_iter,
+                      void* data,
+                      DBusError* error)
+{
+    const char* stream_path;
     gsize total;
     gsize remaining;
     gssize result;
-    GError *gerror;
+    GError* gerror;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestIO got setupStreams");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestIO got setupStreams");
 
     g_assert(G_IS_OBJECT(data));
 
@@ -2873,30 +2744,22 @@ test_io_setup_streams(DBusConnection  *connection,
     }
 
     /* Create output stream to write to caller's path */
-    io_output_stream =
-        big_dbus_output_stream_new(connection,
-                                   dbus_message_get_sender(message),
+    io_output_stream
+      = big_dbus_output_stream_new(connection, dbus_message_get_sender(message),
                                    stream_path);
 
     /* Create input stream and return its path to caller */
-    io_input_stream =
-        g_object_new(BIG_TYPE_DBUS_INPUT_STREAM,
-                     NULL);
-    big_dbus_input_stream_attach(io_input_stream,
-                                 connection);
+    io_input_stream = g_object_new(BIG_TYPE_DBUS_INPUT_STREAM, NULL);
+    big_dbus_input_stream_attach(io_input_stream, connection);
     stream_path = big_dbus_input_stream_get_path(io_input_stream);
 
-    big_dbus_append_json_entry_STRING(out_iter,
-                                      "stream",
-                                      stream_path);
+    big_dbus_append_json_entry_STRING(out_iter, "stream", stream_path);
 
     /* Set up callbacks to read input stream in an async way */
     input_buffer = g_string_new(NULL);
 
-    g_signal_connect(io_input_stream,
-                     "ready-to-read",
-                     G_CALLBACK(on_input_ready),
-                     NULL);
+    g_signal_connect(io_input_stream, "ready-to-read",
+                     G_CALLBACK(on_input_ready), NULL);
 
     /* Write to output stream */
     gerror = NULL;
@@ -2907,10 +2770,9 @@ test_io_setup_streams(DBusConnection  *connection,
          * code of course
          */
         result = g_output_stream_write(G_OUTPUT_STREAM(io_output_stream),
-                                       stream_data_from_io_service + (total - remaining),
-                                       1,
-                                       NULL,
-                                       &gerror);
+                                       stream_data_from_io_service
+                                         + (total - remaining),
+                                       1, NULL, &gerror);
         if (result < 0) {
             g_assert(gerror != NULL);
             g_error("Error writing to output stream: %s", gerror->message);
@@ -2927,13 +2789,15 @@ test_io_setup_streams(DBusConnection  *connection,
     /* flush should do nothing here, and is not needed, but
      * just calling it to test it
      */
-    if (!g_output_stream_flush(G_OUTPUT_STREAM(io_output_stream), NULL, &gerror)) {
+    if (!g_output_stream_flush(G_OUTPUT_STREAM(io_output_stream), NULL,
+                               &gerror)) {
         g_assert(gerror != NULL);
         g_error("Error flushing output stream: %s", gerror->message);
         g_error_free(gerror);
     }
 
-    if (!g_output_stream_close(G_OUTPUT_STREAM(io_output_stream), NULL, &gerror)) {
+    if (!g_output_stream_close(G_OUTPUT_STREAM(io_output_stream), NULL,
+                               &gerror)) {
         g_assert(gerror != NULL);
         g_error("Error closing output stream: %s", gerror->message);
         g_error_free(gerror);
@@ -2941,78 +2805,59 @@ test_io_setup_streams(DBusConnection  *connection,
     g_object_unref(io_output_stream);
     io_output_stream = NULL;
 
-
     /* Now return, and wait for our input stream data to come in from
      * the main process
      */
 }
 
-static BigDBusJsonMethod test_io_methods[] = {
-    { "setupStreams", test_io_setup_streams, NULL },
-    { "confirmStreamsData", test_io_confirm_streams_data, NULL }
-};
+static BigDBusJsonMethod test_io_methods[]
+  = { { "setupStreams", test_io_setup_streams, NULL },
+      { "confirmStreamsData", test_io_confirm_streams_data, NULL } };
 
 static void
-on_test_io_acquired(DBusConnection *connection,
-                    const char     *name,
-                    void           *data)
+on_test_io_acquired(DBusConnection* connection, const char* name, void* data)
 {
     g_assert(!currently_have_test_io);
     currently_have_test_io = TRUE;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestIO acquired by child");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestIO acquired by child");
 
-    big_dbus_register_json(connection,
-                           "com.litl.TestIO",
-                           test_io_methods,
+    big_dbus_register_json(connection, "com.litl.TestIO", test_io_methods,
                            G_N_ELEMENTS(test_io_methods));
 
     test_io_object = g_object_new(G_TYPE_OBJECT, NULL);
 
-    big_dbus_register_g_object(connection,
-                               "/com/litl/test/object47",
-                               test_io_object,
-                               "com.litl.TestIO");
+    big_dbus_register_g_object(connection, "/com/litl/test/object47",
+                               test_io_object, "com.litl.TestIO");
 }
 
 static void
-on_test_io_lost(DBusConnection *connection,
-                const char     *name,
-                void           *data)
+on_test_io_lost(DBusConnection* connection, const char* name, void* data)
 {
     g_assert(currently_have_test_io);
     currently_have_test_io = FALSE;
 
-    big_debug(BIG_DEBUG_IN_TESTS,
-              "com.litl.TestIO lost by child");
+    big_debug(BIG_DEBUG_IN_TESTS, "com.litl.TestIO lost by child");
 
-    big_dbus_unregister_g_object(connection,
-                                 "/com/litl/test/object47");
+    big_dbus_unregister_g_object(connection, "/com/litl/test/object47");
 
-    big_dbus_unregister_json(connection,
-                             "com.litl.TestIO");
+    big_dbus_unregister_json(connection, "com.litl.TestIO");
 }
 
-static BigDBusNameOwnerFuncs test_io_funcs = {
-    "com.litl.TestIO",
-    BIG_DBUS_NAME_SINGLE_INSTANCE,
-    on_test_io_acquired,
-    on_test_io_lost
-};
+static BigDBusNameOwnerFuncs test_io_funcs
+  = { "com.litl.TestIO", BIG_DBUS_NAME_SINGLE_INSTANCE, on_test_io_acquired,
+      on_test_io_lost };
 
 static void
 do_test_io_child(void)
 {
-    GMainLoop *loop;
+    GMainLoop* loop;
 
     g_type_init();
 
     loop = g_main_loop_new(NULL, FALSE);
 
-    big_dbus_acquire_name(DBUS_BUS_SESSION,
-                          &test_io_funcs,
-                          NULL);
+    big_dbus_acquire_name(DBUS_BUS_SESSION, &test_io_funcs, NULL);
 
     g_main_loop_run(loop);
 
diff --git a/modules/dbus/util/dbus.h b/modules/dbus/util/dbus.h
index 5b31c39..10f4b63 100644
--- a/modules/dbus/util/dbus.h
+++ b/modules/dbus/util/dbus.h
@@ -11,40 +11,41 @@ G_BEGIN_DECLS
 
 /* Convenience macro */
 
-#define BIG_DBUS_NAME_FROM_TYPE(type) ((type) == DBUS_BUS_SESSION ? "session" : "system")
+#define BIG_DBUS_NAME_FROM_TYPE(type)                                          \
+    ((type) == DBUS_BUS_SESSION ? "session" : "system")
 
 /* Error names */
-#define BIG_DBUS_ERROR_STREAM_RECEIVER_CLOSED "com.litl.Error.Stream.ReceiverClosed"
+#define BIG_DBUS_ERROR_STREAM_RECEIVER_CLOSED                                  \
+    "com.litl.Error.Stream.ReceiverClosed"
 
 /*
  * Monitor whether we are connected / not-connected to the bus
  */
 
-typedef void (* BigDBusConnectionOpenedFunc)   (DBusConnection *connection,
-                                                void           *data);
-typedef void (* BigDBusConnectionClosedFunc)   (DBusConnection *connection,
-                                                void           *data);
+typedef void (*BigDBusConnectionOpenedFunc)(DBusConnection* connection,
+                                            void* data);
+typedef void (*BigDBusConnectionClosedFunc)(DBusConnection* connection,
+                                            void* data);
 
-typedef struct {
+typedef struct
+{
     DBusBusType which_bus;
     BigDBusConnectionOpenedFunc opened;
     BigDBusConnectionClosedFunc closed;
 } BigDBusConnectFuncs;
 
-void big_dbus_add_connect_funcs             (const BigDBusConnectFuncs *funcs,
-                                             void                      *data);
-void big_dbus_remove_connect_funcs          (const BigDBusConnectFuncs *funcs,
-                                             void                      *data);
-void big_dbus_add_connect_funcs_sync_notify (const BigDBusConnectFuncs *funcs,
-                                             void                      *data);
+void big_dbus_add_connect_funcs(const BigDBusConnectFuncs* funcs, void* data);
+void big_dbus_remove_connect_funcs(const BigDBusConnectFuncs* funcs,
+                                   void* data);
+void big_dbus_add_connect_funcs_sync_notify(const BigDBusConnectFuncs* funcs,
+                                            void* data);
 
+void big_dbus_add_bus_weakref(DBusBusType bus_type,
+                              DBusConnection** connection_p);
+void big_dbus_remove_bus_weakref(DBusBusType bus_type,
+                                 DBusConnection** connection_p);
 
-void big_dbus_add_bus_weakref    (DBusBusType      bus_type,
-                                  DBusConnection **connection_p);
-void big_dbus_remove_bus_weakref (DBusBusType      bus_type,
-                                  DBusConnection **connection_p);
-
-void big_dbus_try_connecting_now (DBusBusType which_bus);
+void big_dbus_try_connecting_now(DBusBusType which_bus);
 
 /*
  * Own a bus name
@@ -56,85 +57,82 @@ typedef enum {
     BIG_DBUS_NAME_MANY_INSTANCES
 } BigDBusNameType;
 
-typedef void (* BigDBusNameAcquiredFunc) (DBusConnection *connection,
-                                          const char     *name,
-                                          void           *data);
-typedef void (* BigDBusNameLostFunc)     (DBusConnection *connection,
-                                          const char     *name,
-                                          void           *data);
+typedef void (*BigDBusNameAcquiredFunc)(DBusConnection* connection,
+                                        const char* name,
+                                        void* data);
+typedef void (*BigDBusNameLostFunc)(DBusConnection* connection,
+                                    const char* name,
+                                    void* data);
 
-typedef struct {
-    const char *name;
+typedef struct
+{
+    const char* name;
     BigDBusNameType type;
     BigDBusNameAcquiredFunc acquired;
     BigDBusNameLostFunc lost;
 } BigDBusNameOwnerFuncs;
 
-guint        big_dbus_acquire_name       (DBusBusType                  bus_type,
-                                          const BigDBusNameOwnerFuncs *funcs,
-                                          void                        *data);
-void         big_dbus_release_name       (DBusBusType                  bus_type,
-                                          const BigDBusNameOwnerFuncs *funcs,
-                                          void                        *data);
-void         big_dbus_release_name_by_id (DBusBusType                  bus_type,
-                                          guint                        id);
+guint big_dbus_acquire_name(DBusBusType bus_type,
+                            const BigDBusNameOwnerFuncs* funcs,
+                            void* data);
+void big_dbus_release_name(DBusBusType bus_type,
+                           const BigDBusNameOwnerFuncs* funcs,
+                           void* data);
+void big_dbus_release_name_by_id(DBusBusType bus_type, guint id);
 
 /*
  * Keep track of someone else's bus name
  *
  */
 
-typedef enum {
-    BIG_DBUS_NAME_START_IF_NOT_FOUND = 0x1
-} BigDBusWatchNameFlags;
-
-typedef void (* BigDBusNameAppearedFunc) (DBusConnection *connection,
-                                          const char     *name,
-                                          const char     *new_owner_unique_name,
-                                          void           *data);
-typedef void (* BigDBusNameVanishedFunc) (DBusConnection *connection,
-                                          const char     *name,
-                                          const char     *old_owner_unique_name,
-                                          void           *data);
-
-typedef struct {
+typedef enum { BIG_DBUS_NAME_START_IF_NOT_FOUND = 0x1 } BigDBusWatchNameFlags;
+
+typedef void (*BigDBusNameAppearedFunc)(DBusConnection* connection,
+                                        const char* name,
+                                        const char* new_owner_unique_name,
+                                        void* data);
+typedef void (*BigDBusNameVanishedFunc)(DBusConnection* connection,
+                                        const char* name,
+                                        const char* old_owner_unique_name,
+                                        void* data);
+
+typedef struct
+{
     BigDBusNameAppearedFunc appeared;
     BigDBusNameVanishedFunc vanished;
 } BigDBusWatchNameFuncs;
 
-void        big_dbus_watch_name             (DBusBusType                  bus_type,
-                                             const char                  *name,
-                                             BigDBusWatchNameFlags        flags,
-                                             const BigDBusWatchNameFuncs *funcs,
-                                             void                        *data);
-void        big_dbus_unwatch_name           (DBusBusType                  bus_type,
-                                             const char                  *name,
-                                             const BigDBusWatchNameFuncs *funcs,
-                                             void                        *data);
-const char* big_dbus_get_watched_name_owner (DBusBusType                  bus_type,
-                                             const char                  *name);
-
-
-typedef void (* BigDBusSignalHandler) (DBusConnection *connection,
-                                       DBusMessage    *message,
-                                       void           *data);
-int big_dbus_watch_signal          (DBusBusType           bus_type,
-                                    const char           *sender,
-                                    const char           *path,
-                                    const char           *iface,
-                                    const char           *name,
-                                    BigDBusSignalHandler  handler,
-                                    void                 *data,
-                                    GDestroyNotify        data_dnotify);
-void big_dbus_unwatch_signal       (DBusBusType           bus_type,
-                                    const char           *sender,
-                                    const char           *path,
-                                    const char           *iface,
-                                    const char           *name,
-                                    BigDBusSignalHandler  handler,
-                                    void                 *data);
-void big_dbus_unwatch_signal_by_id (DBusBusType           bus_type,
-                                    int                   id);
+void big_dbus_watch_name(DBusBusType bus_type,
+                         const char* name,
+                         BigDBusWatchNameFlags flags,
+                         const BigDBusWatchNameFuncs* funcs,
+                         void* data);
+void big_dbus_unwatch_name(DBusBusType bus_type,
+                           const char* name,
+                           const BigDBusWatchNameFuncs* funcs,
+                           void* data);
+const char* big_dbus_get_watched_name_owner(DBusBusType bus_type,
+                                            const char* name);
+
+typedef void (*BigDBusSignalHandler)(DBusConnection* connection,
+                                     DBusMessage* message,
+                                     void* data);
+int big_dbus_watch_signal(DBusBusType bus_type,
+                          const char* sender,
+                          const char* path,
+                          const char* iface,
+                          const char* name,
+                          BigDBusSignalHandler handler,
+                          void* data,
+                          GDestroyNotify data_dnotify);
+void big_dbus_unwatch_signal(DBusBusType bus_type,
+                             const char* sender,
+                             const char* path,
+                             const char* iface,
+                             const char* name,
+                             BigDBusSignalHandler handler,
+                             void* data);
+void big_dbus_unwatch_signal_by_id(DBusBusType bus_type, int id);
 
 /* A "json method" is a D-Bus method with signature
  *      DICT jsonMethodName(DICT)
@@ -149,68 +147,66 @@ void big_dbus_unwatch_signal_by_id (DBusBusType           bus_type,
  * that happens to consist of multiple processes
  * and have bits written in JS.
  */
-typedef void (* BigDBusJsonSyncMethodFunc)  (DBusConnection  *connection,
-                                             DBusMessage     *message,
-                                             DBusMessageIter *in_iter,
-                                             DBusMessageIter *out_iter,
-                                             void            *data,
-                                             DBusError       *error);
-
-typedef void (* BigDBusJsonAsyncMethodFunc) (DBusConnection  *connection,
-                                             DBusMessage     *message,
-                                             DBusMessageIter *in_iter,
-                                             void            *data);
-
-typedef struct {
-    const char *name;
+typedef void (*BigDBusJsonSyncMethodFunc)(DBusConnection* connection,
+                                          DBusMessage* message,
+                                          DBusMessageIter* in_iter,
+                                          DBusMessageIter* out_iter,
+                                          void* data,
+                                          DBusError* error);
+
+typedef void (*BigDBusJsonAsyncMethodFunc)(DBusConnection* connection,
+                                           DBusMessage* message,
+                                           DBusMessageIter* in_iter,
+                                           void* data);
+
+typedef struct
+{
+    const char* name;
     /* one of these two but not both should be non-NULL */
     BigDBusJsonSyncMethodFunc sync_func;
     BigDBusJsonAsyncMethodFunc async_func;
 } BigDBusJsonMethod;
 
-void big_dbus_register_json       (DBusConnection          *connection,
-                                   const char              *iface_name,
-                                   const BigDBusJsonMethod *methods,
-                                   int                      n_methods);
-void big_dbus_unregister_json     (DBusConnection          *connection,
-                                   const char              *iface_name);
-void big_dbus_register_g_object   (DBusConnection          *connection,
-                                   const char              *path,
-                                   GObject                 *gobj,
-                                   const char              *iface_name);
-void big_dbus_unregister_g_object (DBusConnection          *connection,
-                                   const char              *path);
-
-void big_dbus_append_json_entry              (DBusMessageIter  *dict_iter,
-                                              const char       *key,
-                                              int               dbus_type,
-                                              void             *basic_value_p);
-void big_dbus_append_json_entry_STRING       (DBusMessageIter  *dict_iter,
-                                              const char       *key,
-                                              const char       *value);
-void big_dbus_append_json_entry_INT32        (DBusMessageIter  *dict_iter,
-                                              const char       *key,
-                                              dbus_int32_t      value);
-void big_dbus_append_json_entry_DOUBLE       (DBusMessageIter  *dict_iter,
-                                              const char       *key,
-                                              double            value);
-void big_dbus_append_json_entry_BOOLEAN      (DBusMessageIter  *dict_iter,
-                                              const char       *key,
-                                              dbus_bool_t       value);
-void big_dbus_append_json_entry_EMPTY_ARRAY  (DBusMessageIter  *dict_iter,
-                                              const char       *key);
-void big_dbus_append_json_entry_STRING_ARRAY (DBusMessageIter  *dict_iter,
-                                              const char       *key,
-                                              const char      **value);
-
-gboolean big_dbus_message_iter_get_gsize  (DBusMessageIter  *iter,
-                                           gsize            *value_p);
-gboolean big_dbus_message_iter_get_gssize (DBusMessageIter  *iter,
-                                           gssize           *value_p);
-
-void big_dbus_start_service(DBusConnection *connection,
-                            const char     *name);
+void big_dbus_register_json(DBusConnection* connection,
+                            const char* iface_name,
+                            const BigDBusJsonMethod* methods,
+                            int n_methods);
+void big_dbus_unregister_json(DBusConnection* connection,
+                              const char* iface_name);
+void big_dbus_register_g_object(DBusConnection* connection,
+                                const char* path,
+                                GObject* gobj,
+                                const char* iface_name);
+void big_dbus_unregister_g_object(DBusConnection* connection, const char* path);
+
+void big_dbus_append_json_entry(DBusMessageIter* dict_iter,
+                                const char* key,
+                                int dbus_type,
+                                void* basic_value_p);
+void big_dbus_append_json_entry_STRING(DBusMessageIter* dict_iter,
+                                       const char* key,
+                                       const char* value);
+void big_dbus_append_json_entry_INT32(DBusMessageIter* dict_iter,
+                                      const char* key,
+                                      dbus_int32_t value);
+void big_dbus_append_json_entry_DOUBLE(DBusMessageIter* dict_iter,
+                                       const char* key,
+                                       double value);
+void big_dbus_append_json_entry_BOOLEAN(DBusMessageIter* dict_iter,
+                                        const char* key,
+                                        dbus_bool_t value);
+void big_dbus_append_json_entry_EMPTY_ARRAY(DBusMessageIter* dict_iter,
+                                            const char* key);
+void big_dbus_append_json_entry_STRING_ARRAY(DBusMessageIter* dict_iter,
+                                             const char* key,
+                                             const char** value);
+
+gboolean big_dbus_message_iter_get_gsize(DBusMessageIter* iter, gsize* value_p);
+gboolean big_dbus_message_iter_get_gssize(DBusMessageIter* iter,
+                                          gssize* value_p);
+
+void big_dbus_start_service(DBusConnection* connection, const char* name);
 
 G_END_DECLS
 
-#endif  /* __BIG_UTIL_DBUS_H__ */
+#endif /* __BIG_UTIL_DBUS_H__ */
diff --git a/modules/dbus/util/log.h b/modules/dbus/util/log.h
index 39299dd..1e1dcb8 100644
--- a/modules/dbus/util/log.h
+++ b/modules/dbus/util/log.h
@@ -1,2 +1,2 @@
 #define BIG_DEBUG_UTIL_DBUS 1
-#define big_debug(type,...)
+#define big_debug(type, ...)
diff --git a/modules/example/Makefile.in b/modules/example/Makefile.in
index edcc3d4..f2790ee 100644
--- a/modules/example/Makefile.in
+++ b/modules/example/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/example
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -100,12 +141,25 @@ libseed_example_la_OBJECTS = $(am_libseed_example_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_example_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_example_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_EXAMPLE_MODULE_TRUE@am_libseed_example_la_rpath = -rpath \
 @BUILD_EXAMPLE_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -118,20 +172,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_example_la_SOURCES)
 DIST_SOURCES = $(am__libseed_example_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,8 +189,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -204,6 +272,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -217,6 +287,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -240,8 +311,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -253,6 +333,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -347,6 +428,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -392,7 +474,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/example/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/example/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -410,6 +491,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -436,12 +518,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_example.la: $(libseed_example_la_OBJECTS) $(libseed_example_la_DEPENDENCIES) $(EXTRA_libseed_example_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_example_la_LINK) $(am_libseed_example_la_rpath) $(libseed_example_la_OBJECTS) $(libseed_example_la_LIBADD) $(LIBS)
 
@@ -458,14 +543,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -480,26 +565,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -511,15 +585,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -528,6 +598,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -672,19 +757,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/example/seed-example.c b/modules/example/seed-example.c
index 111bc04..d06ca80 100644
--- a/modules/example/seed-example.c
+++ b/modules/example/seed-example.c
@@ -21,8 +21,8 @@
 #include <seed-module.h>
 
 SeedObject
-seed_module_init(SeedEngine * eng)
+seed_module_init(SeedEngine* eng)
 {
-  g_print("Hello Seed Module World\n");
-  return seed_make_object (eng->context, NULL, NULL);
+    g_print("Hello Seed Module World\n");
+    return seed_make_object(eng->context, NULL, NULL);
 }
diff --git a/modules/ffi/Makefile.in b/modules/ffi/Makefile.in
index 02fb66b..6ef151f 100644
--- a/modules/ffi/Makefile.in
+++ b/modules/ffi/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/ffi
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -100,11 +141,24 @@ libseed_ffi_la_OBJECTS = $(am_libseed_ffi_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_ffi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_ffi_la_CFLAGS) $(CFLAGS) $(libseed_ffi_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_FFI_MODULE_TRUE@am_libseed_ffi_la_rpath = -rpath $(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -117,20 +171,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_ffi_la_SOURCES)
 DIST_SOURCES = $(am__libseed_ffi_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,8 +188,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -203,6 +271,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -216,6 +286,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -239,8 +310,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -252,6 +332,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -346,6 +427,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -400,7 +482,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/ffi/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/ffi/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -418,6 +499,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -444,12 +526,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_ffi.la: $(libseed_ffi_la_OBJECTS) $(libseed_ffi_la_DEPENDENCIES) $(EXTRA_libseed_ffi_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_ffi_la_LINK) $(am_libseed_ffi_la_rpath) $(libseed_ffi_la_OBJECTS) $(libseed_ffi_la_LIBADD) $(LIBS)
 
@@ -466,14 +551,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -495,26 +580,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -526,15 +600,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -543,6 +613,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -687,19 +772,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/ffi/seed-ffi.c b/modules/ffi/seed-ffi.c
index cbf93f7..6f966e2 100644
--- a/modules/ffi/seed-ffi.c
+++ b/modules/ffi/seed-ffi.c
@@ -22,492 +22,489 @@
 
 #include <ffi.h>
 
-SeedEngine *eng;
+SeedEngine* eng;
 SeedObject namespace_ref;
 
 SeedClass ffi_library_class;
 SeedClass ffi_function_class;
 
-typedef struct _seed_ffi_function_priv {
-  gchar *name;
-  gpointer symbol;
-  
-  GType *args;
-  gint n_args;
-  
-  GType ret_val;
-  
-  SeedObject signature_obj;
-  SeedObject module_obj;
+typedef struct _seed_ffi_function_priv
+{
+    gchar* name;
+    gpointer symbol;
+
+    GType* args;
+    gint n_args;
+
+    GType ret_val;
+
+    SeedObject signature_obj;
+    SeedObject module_obj;
 } seed_ffi_function_priv;
 
-typedef struct _seed_ffi_library_priv {
-  GModule *mod;
-  GHashTable *symbols;
+typedef struct _seed_ffi_library_priv
+{
+    GModule* mod;
+    GHashTable* symbols;
 } seed_ffi_library_priv;
 
-static ffi_type *
-gtype_to_ffi_type (SeedContext ctx, 
-		   SeedValue value,
-		   GType otype,
-		   GArgument *garg,
-		   gpointer *arg,
-		   SeedException *exception)
+static ffi_type*
+gtype_to_ffi_type(SeedContext ctx,
+                  SeedValue value,
+                  GType otype,
+                  GArgument* garg,
+                  gpointer* arg,
+                  SeedException* exception)
 {
-  ffi_type *return_type;
-  GType type = g_type_fundamental (otype);
-  g_assert (type != G_TYPE_INVALID);
-
-  switch (type)
-    {
-    case G_TYPE_BOOLEAN:
-    case G_TYPE_CHAR:
-    case G_TYPE_INT:
-      return_type = &ffi_type_sint;
-      garg->v_int = seed_value_to_int (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_UCHAR:
-    case G_TYPE_UINT:
-      return_type = &ffi_type_uint;
-      garg->v_uint = seed_value_to_uint (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_STRING:
-      return_type = &ffi_type_pointer;
-      garg->v_pointer = seed_value_to_string (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_OBJECT:
-      //    case G_TYPE_BOXED:
-    case G_TYPE_POINTER:
-      return_type = &ffi_type_pointer;
-      garg->v_pointer = seed_pointer_get_pointer (ctx, value);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_FLOAT:
-      return_type = &ffi_type_float;
-      garg->v_float = seed_value_to_float (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_DOUBLE:
-      return_type = &ffi_type_double;
-      garg->v_double = seed_value_to_double (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_LONG:
-      return_type = &ffi_type_slong;
-      garg->v_uint = seed_value_to_uint (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_ULONG:
-      return_type = &ffi_type_ulong;
-      garg->v_ulong = seed_value_to_ulong (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_INT64:
-      return_type = &ffi_type_sint64;
-      garg->v_int64 = seed_value_to_int64 (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    case G_TYPE_UINT64:
-      return_type = &ffi_type_uint64;
-      garg->v_uint64 = seed_value_to_uint64 (ctx, value, exception);
-      *arg = (gpointer)garg;
-      break;
-    default:
-      g_warning ("Unsupported fundamental in type: %s", g_type_name (type));
-      return_type = &ffi_type_pointer;
-      garg->v_pointer = NULL;
-      *arg = (garg->v_pointer);
-      break;
+    ffi_type* return_type;
+    GType type = g_type_fundamental(otype);
+    g_assert(type != G_TYPE_INVALID);
+
+    switch (type) {
+        case G_TYPE_BOOLEAN:
+        case G_TYPE_CHAR:
+        case G_TYPE_INT:
+            return_type = &ffi_type_sint;
+            garg->v_int = seed_value_to_int(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_UCHAR:
+        case G_TYPE_UINT:
+            return_type = &ffi_type_uint;
+            garg->v_uint = seed_value_to_uint(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_STRING:
+            return_type = &ffi_type_pointer;
+            garg->v_pointer = seed_value_to_string(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_OBJECT:
+        //    case G_TYPE_BOXED:
+        case G_TYPE_POINTER:
+            return_type = &ffi_type_pointer;
+            garg->v_pointer = seed_pointer_get_pointer(ctx, value);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_FLOAT:
+            return_type = &ffi_type_float;
+            garg->v_float = seed_value_to_float(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_DOUBLE:
+            return_type = &ffi_type_double;
+            garg->v_double = seed_value_to_double(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_LONG:
+            return_type = &ffi_type_slong;
+            garg->v_uint = seed_value_to_uint(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_ULONG:
+            return_type = &ffi_type_ulong;
+            garg->v_ulong = seed_value_to_ulong(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_INT64:
+            return_type = &ffi_type_sint64;
+            garg->v_int64 = seed_value_to_int64(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        case G_TYPE_UINT64:
+            return_type = &ffi_type_uint64;
+            garg->v_uint64 = seed_value_to_uint64(ctx, value, exception);
+            *arg = (gpointer) garg;
+            break;
+        default:
+            g_warning("Unsupported fundamental in type: %s", g_type_name(type));
+            return_type = &ffi_type_pointer;
+            garg->v_pointer = NULL;
+            *arg = (garg->v_pointer);
+            break;
     }
-  return return_type;
+    return return_type;
 }
 
-static ffi_type *
-return_type_to_ffi_type (GType otype)
+static ffi_type*
+return_type_to_ffi_type(GType otype)
 {
-  GType type = g_type_fundamental (otype);
-  g_assert (type != G_TYPE_INVALID);
-
-  switch (type)
-    {
-    case G_TYPE_BOOLEAN:
-    case G_TYPE_CHAR:
-    case G_TYPE_INT:
-      return &ffi_type_sint;
-      break;
-    case G_TYPE_UCHAR:
-    case G_TYPE_UINT:
-      return &ffi_type_uint;
-      break;
-    case G_TYPE_STRING:
-      return &ffi_type_pointer;
-      break;
-    case G_TYPE_OBJECT:
-      //    case G_TYPE_BOXED:
-    case G_TYPE_POINTER:
-      return &ffi_type_pointer;
-      break;
-    case G_TYPE_FLOAT:
-      return &ffi_type_float;
-      break;
-    case G_TYPE_DOUBLE:
-      return &ffi_type_double;
-      break;
-    case G_TYPE_LONG:
-      return &ffi_type_slong;
-      break;
-    case G_TYPE_ULONG:
-      return &ffi_type_ulong;
-      break;
-    case G_TYPE_INT64:
-      return &ffi_type_sint64;
-      break;
-    case G_TYPE_UINT64:
-      return &ffi_type_uint64;
-      break;
-    default:
-      g_warning ("Unsupported fundamental out type: %s", g_type_name (type));
-      return &ffi_type_pointer;
-      break;
+    GType type = g_type_fundamental(otype);
+    g_assert(type != G_TYPE_INVALID);
+
+    switch (type) {
+        case G_TYPE_BOOLEAN:
+        case G_TYPE_CHAR:
+        case G_TYPE_INT:
+            return &ffi_type_sint;
+            break;
+        case G_TYPE_UCHAR:
+        case G_TYPE_UINT:
+            return &ffi_type_uint;
+            break;
+        case G_TYPE_STRING:
+            return &ffi_type_pointer;
+            break;
+        case G_TYPE_OBJECT:
+        //    case G_TYPE_BOXED:
+        case G_TYPE_POINTER:
+            return &ffi_type_pointer;
+            break;
+        case G_TYPE_FLOAT:
+            return &ffi_type_float;
+            break;
+        case G_TYPE_DOUBLE:
+            return &ffi_type_double;
+            break;
+        case G_TYPE_LONG:
+            return &ffi_type_slong;
+            break;
+        case G_TYPE_ULONG:
+            return &ffi_type_ulong;
+            break;
+        case G_TYPE_INT64:
+            return &ffi_type_sint64;
+            break;
+        case G_TYPE_UINT64:
+            return &ffi_type_uint64;
+            break;
+        default:
+            g_warning("Unsupported fundamental out type: %s",
+                      g_type_name(type));
+            return &ffi_type_pointer;
+            break;
     }
 }
 
 static SeedValue
-seed_ffi_get_signature (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_ffi_get_signature(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
-  seed_ffi_function_priv *priv = seed_object_get_private (this_object);
-  
-  if (priv->signature_obj)
-    return priv->signature_obj;
-  else
-    return seed_make_null (ctx);
+    seed_ffi_function_priv* priv = seed_object_get_private(this_object);
+
+    if (priv->signature_obj)
+        return priv->signature_obj;
+    else
+        return seed_make_null(ctx);
 }
 
 static gboolean
-seed_ffi_build_signature (SeedContext ctx,
-			  seed_ffi_function_priv *priv,
-			  SeedObject sig,
-			  SeedException *exception)
+seed_ffi_build_signature(SeedContext ctx,
+                         seed_ffi_function_priv* priv,
+                         SeedObject sig,
+                         SeedException* exception)
 {
-  SeedObject arguments;
-  SeedValue ret_type_ref, length_ref;
-  guint length, i;
-  
-  arguments = seed_object_get_property (ctx, sig, "arguments");
-  ret_type_ref = seed_object_get_property (ctx, sig, "returns");
-  
-  if (!seed_value_is_object (ctx, arguments))
-    {
-      seed_make_exception (ctx, exception, "FFIError", 
-			   "Signature arguments member must be an array describing argument types");
-      return FALSE;
+    SeedObject arguments;
+    SeedValue ret_type_ref, length_ref;
+    guint length, i;
+
+    arguments = seed_object_get_property(ctx, sig, "arguments");
+    ret_type_ref = seed_object_get_property(ctx, sig, "returns");
+
+    if (!seed_value_is_object(ctx, arguments)) {
+        seed_make_exception(ctx, exception, "FFIError",
+                            "Signature arguments member must be an "
+                            "array describing argument types");
+        return FALSE;
     }
-  length_ref = seed_object_get_property (ctx, arguments, "length");
-  
-  length = seed_value_to_uint (ctx, length_ref, exception);
-  priv->n_args = length;
-  priv->args = g_slice_alloc (length * sizeof (GType));
-  
-  for (i = 0; i < length; i++)
-    {
-      SeedValue type = seed_object_get_property_at_index (ctx, arguments, 
-							  i, exception);
-      priv->args[i] = seed_value_to_int (ctx, type, exception);
+    length_ref = seed_object_get_property(ctx, arguments, "length");
+
+    length = seed_value_to_uint(ctx, length_ref, exception);
+    priv->n_args = length;
+    priv->args = g_slice_alloc(length * sizeof(GType));
+
+    for (i = 0; i < length; i++) {
+        SeedValue type
+          = seed_object_get_property_at_index(ctx, arguments, i, exception);
+        priv->args[i] = seed_value_to_int(ctx, type, exception);
     }
-  priv->ret_val = seed_value_to_int (ctx, ret_type_ref, exception);
-  
-  priv->signature_obj = sig;
-  seed_value_protect (ctx, sig);
+    priv->ret_val = seed_value_to_int(ctx, ret_type_ref, exception);
 
-  return TRUE;
+    priv->signature_obj = sig;
+    seed_value_protect(ctx, sig);
+
+    return TRUE;
 }
 
 static gboolean
-seed_ffi_set_signature (SeedContext ctx,
-			  SeedObject this_object,
-			  SeedString property_name,
-			  SeedValue value,
-			  SeedException *exception)
+seed_ffi_set_signature(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedValue value,
+                       SeedException* exception)
 {
-  seed_ffi_function_priv *priv = seed_object_get_private (this_object);
-  
-  if (priv->signature_obj)
-    {
-      seed_make_exception (ctx, exception, "FFIError",
-			   "Can not reset signature of function once set");
-      return FALSE;
-    }
-  else if (!seed_value_is_object (ctx, value))
-    {
-      seed_make_exception (ctx, exception, "FFIError",
-			   "Signature must be an object");
-      return FALSE;
-    }
-  else
-    {
-      if (!seed_ffi_build_signature (ctx, priv, (SeedObject) value, exception))
-	return FALSE;
+    seed_ffi_function_priv* priv = seed_object_get_private(this_object);
+
+    if (priv->signature_obj) {
+        seed_make_exception(ctx, exception, "FFIError",
+                            "Can not reset signature of function once set");
+        return FALSE;
+    } else if (!seed_value_is_object(ctx, value)) {
+        seed_make_exception(ctx, exception, "FFIError",
+                            "Signature must be an object");
+        return FALSE;
+    } else {
+        if (!seed_ffi_build_signature(ctx, priv, (SeedObject) value, exception))
+            return FALSE;
     }
-  return TRUE;
+    return TRUE;
 }
 
 static void
-seed_ffi_function_finalize (SeedObject obj)
+seed_ffi_function_finalize(SeedObject obj)
 {
-  seed_ffi_function_priv *priv = seed_object_get_private (obj);
-  
-  if (priv->signature_obj)
-    {
-      seed_value_unprotect (eng->context, priv->signature_obj);
-      
-      g_slice_free1 (priv->n_args * sizeof(GType), priv->args);
+    seed_ffi_function_priv* priv = seed_object_get_private(obj);
+
+    if (priv->signature_obj) {
+        seed_value_unprotect(eng->context, priv->signature_obj);
+
+        g_slice_free1(priv->n_args * sizeof(GType), priv->args);
     }
-  
-  g_free (priv->name);
-  g_slice_free1 (sizeof(seed_ffi_function_priv), priv); 
 
-  seed_value_unprotect (eng->context, priv->module_obj);
+    g_free(priv->name);
+    g_slice_free1(sizeof(seed_ffi_function_priv), priv);
+
+    seed_value_unprotect(eng->context, priv->module_obj);
 }
 
 static SeedObject
-seed_ffi_make_function (SeedContext ctx, SeedObject module_obj, gpointer symbol, const gchar *name, GHashTable *symbols)
+seed_ffi_make_function(SeedContext ctx,
+                       SeedObject module_obj,
+                       gpointer symbol,
+                       const gchar* name,
+                       GHashTable* symbols)
 {
-  SeedValue ret;
-  seed_ffi_function_priv *priv = 
-    g_slice_alloc0 (sizeof (seed_ffi_function_priv));
-  
-  priv->symbol = symbol;
-  priv->module_obj = module_obj;
-  priv->name = g_strdup (name);
-  
-  ret = seed_make_object (ctx, ffi_function_class, priv);
-  seed_value_protect (ctx, ret);
-
-  g_hash_table_insert (symbols, g_strdup (name), ret);
-  return ret;
+    SeedValue ret;
+    seed_ffi_function_priv* priv
+      = g_slice_alloc0(sizeof(seed_ffi_function_priv));
+
+    priv->symbol = symbol;
+    priv->module_obj = module_obj;
+    priv->name = g_strdup(name);
+
+    ret = seed_make_object(ctx, ffi_function_class, priv);
+    seed_value_protect(ctx, ret);
+
+    g_hash_table_insert(symbols, g_strdup(name), ret);
+    return ret;
 }
 
 static SeedValue
-value_from_ffi_type (SeedContext ctx, 
-		     GType otype,
-		     GArgument *value, 
-		     SeedException *exception)
+value_from_ffi_type(SeedContext ctx,
+                    GType otype,
+                    GArgument* value,
+                    SeedException* exception)
 {
-  switch (g_type_fundamental (otype))
-    {
-    case G_TYPE_INT:
-      return seed_value_from_int (ctx, value->v_int, exception);
-      break;
-    case G_TYPE_FLOAT:
-      return seed_value_from_float (ctx, value->v_float, exception);
-      break;
-    case G_TYPE_DOUBLE:
-      return seed_value_from_double (ctx, value->v_double, exception);
-      break;
-    case G_TYPE_BOOLEAN:
-      return seed_value_from_boolean (ctx, value->v_boolean, exception);
-      break;
-    case G_TYPE_STRING:
-      return seed_value_from_string (ctx, value->v_pointer, exception);
-      break;
-    case G_TYPE_CHAR:
-      return seed_value_from_char (ctx, value->v_int, exception);
-      break;
-    case G_TYPE_UCHAR:
-      return seed_value_from_uchar (ctx, value->v_uint, exception);
-      break;
-    case G_TYPE_UINT:
-      return seed_value_from_uint (ctx, value->v_uint, exception);
-      break;
-    case G_TYPE_POINTER:
-      return seed_make_pointer (ctx, value->v_pointer);
-      break;
-    case G_TYPE_LONG:
-      return seed_value_from_long (ctx, value->v_long, exception);
-      break;
-    case G_TYPE_ULONG:
-      return seed_value_from_ulong (ctx, value->v_ulong, exception);
-      break;
-    case G_TYPE_INT64:
-      return seed_value_from_int64 (ctx, value->v_int64, exception);
-      break;
-    case G_TYPE_UINT64:
-      return seed_value_from_uint64 (ctx, value->v_uint64, exception);
-      break;
-    case G_TYPE_NONE:
-      return seed_make_null (ctx);
-    default:
-      g_warning ("Unsupported fundamental type in value_from_ffi_type: %s",
-		 g_type_name(g_type_fundamental (otype)));
-      return seed_make_null (ctx);
+    switch (g_type_fundamental(otype)) {
+        case G_TYPE_INT:
+            return seed_value_from_int(ctx, value->v_int, exception);
+            break;
+        case G_TYPE_FLOAT:
+            return seed_value_from_float(ctx, value->v_float, exception);
+            break;
+        case G_TYPE_DOUBLE:
+            return seed_value_from_double(ctx, value->v_double, exception);
+            break;
+        case G_TYPE_BOOLEAN:
+            return seed_value_from_boolean(ctx, value->v_boolean, exception);
+            break;
+        case G_TYPE_STRING:
+            return seed_value_from_string(ctx, value->v_pointer, exception);
+            break;
+        case G_TYPE_CHAR:
+            return seed_value_from_char(ctx, value->v_int, exception);
+            break;
+        case G_TYPE_UCHAR:
+            return seed_value_from_uchar(ctx, value->v_uint, exception);
+            break;
+        case G_TYPE_UINT:
+            return seed_value_from_uint(ctx, value->v_uint, exception);
+            break;
+        case G_TYPE_POINTER:
+            return seed_make_pointer(ctx, value->v_pointer);
+            break;
+        case G_TYPE_LONG:
+            return seed_value_from_long(ctx, value->v_long, exception);
+            break;
+        case G_TYPE_ULONG:
+            return seed_value_from_ulong(ctx, value->v_ulong, exception);
+            break;
+        case G_TYPE_INT64:
+            return seed_value_from_int64(ctx, value->v_int64, exception);
+            break;
+        case G_TYPE_UINT64:
+            return seed_value_from_uint64(ctx, value->v_uint64, exception);
+            break;
+        case G_TYPE_NONE:
+            return seed_make_null(ctx);
+        default:
+            g_warning("Unsupported fundamental type in value_from_ffi_type: %s",
+                      g_type_name(g_type_fundamental(otype)));
+            return seed_make_null(ctx);
     }
 }
 
 static SeedValue
-seed_ffi_function_call (SeedContext ctx,
-			SeedObject function,
-			SeedObject this_object,
-			gsize argument_count,
-			const SeedValue arguments[],
-			SeedException *exception)
+seed_ffi_function_call(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue arguments[],
+                       SeedException* exception)
 {
-  GArgument rvalue;
-  GArgument *gargs;
-  ffi_type *rtype;
-  ffi_type **atypes;
-  gpointer *args;
-  int i;
-  ffi_cif cif;
-
-  seed_ffi_function_priv *priv = seed_object_get_private (function);
-  
-  if (argument_count != priv->n_args)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError", "%s expected %d arguments got %Zd",
-			   priv->name, priv->n_args, argument_count);
-      return seed_make_null (ctx);
+    GArgument rvalue;
+    GArgument* gargs;
+    ffi_type* rtype;
+    ffi_type** atypes;
+    gpointer* args;
+    int i;
+    ffi_cif cif;
+
+    seed_ffi_function_priv* priv = seed_object_get_private(function);
+
+    if (argument_count != priv->n_args) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "%s expected %d arguments got %zd", priv->name,
+                            priv->n_args, argument_count);
+        return seed_make_null(ctx);
     }
-  atypes = g_alloca (sizeof (ffi_type *) * (argument_count));
-  args = g_alloca (sizeof (gpointer) * (argument_count));
-  gargs = g_alloca (sizeof (GArgument) * (argument_count));
+    atypes = g_alloca(sizeof(ffi_type*) * (argument_count));
+    args = g_alloca(sizeof(gpointer) * (argument_count));
+    gargs = g_alloca(sizeof(GArgument) * (argument_count));
 
-  for (i = 0; i < argument_count; i++)
-    {
-      atypes[i] = gtype_to_ffi_type (ctx, arguments[i], priv->args[i], &(gargs[i]), &args[i],exception);
+    for (i = 0; i < argument_count; i++) {
+        atypes[i] = gtype_to_ffi_type(ctx, arguments[i], priv->args[i],
+                                      &(gargs[i]), &args[i], exception);
     }
-  rtype = return_type_to_ffi_type (priv->ret_val);
-		   
-  if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, argument_count, rtype, atypes) != FFI_OK)
-    g_assert_not_reached();
-  
-  ffi_call (&cif, priv->symbol, &rvalue, args);
-  
-  return value_from_ffi_type (ctx, priv->ret_val, &rvalue, exception);
+    rtype = return_type_to_ffi_type(priv->ret_val);
+
+    if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, argument_count, rtype, atypes)
+        != FFI_OK)
+        g_assert_not_reached();
+
+    ffi_call(&cif, priv->symbol, &rvalue, args);
+
+    return value_from_ffi_type(ctx, priv->ret_val, &rvalue, exception);
 }
 
 static SeedValue
-seed_ffi_library_get_property (SeedContext ctx,
-			       SeedObject this_object,
-			       SeedString property_name,
-			       SeedException *exception)
+seed_ffi_library_get_property(SeedContext ctx,
+                              SeedObject this_object,
+                              SeedString property_name,
+                              SeedException* exception)
 {
-  SeedValue ret;
-  GModule *mod;
-  gchar *prop;
-  gsize len = seed_string_get_maximum_size (property_name);
-  gpointer symbol;
-  seed_ffi_library_priv *priv;
-  
-  prop = g_alloca (len);
-  seed_string_to_utf8_buffer (property_name, prop, len);
-  
-  priv = seed_object_get_private (this_object);
-  mod = priv->mod;
-  
-  if ((ret = g_hash_table_lookup (priv->symbols, prop)))
-    return ret;
+    SeedValue ret;
+    GModule* mod;
+    gchar* prop;
+    gsize len = seed_string_get_maximum_size(property_name);
+    gpointer symbol;
+    seed_ffi_library_priv* priv;
+
+    prop = g_alloca(len);
+    seed_string_to_utf8_buffer(property_name, prop, len);
 
-  if (!g_module_symbol (mod, prop, &symbol))
-    {
-      return NULL;
+    priv = seed_object_get_private(this_object);
+    mod = priv->mod;
+
+    if ((ret = g_hash_table_lookup(priv->symbols, prop)))
+        return ret;
+
+    if (!g_module_symbol(mod, prop, &symbol)) {
+        return NULL;
     }
-  return seed_ffi_make_function (ctx, this_object, symbol, prop, priv->symbols);
+    return seed_ffi_make_function(ctx, this_object, symbol, prop,
+                                  priv->symbols);
 }
-			       
 
 static SeedObject
-seed_ffi_construct_library (SeedContext ctx,
-			    SeedObject constructor,
-			    size_t argument_count,
-			    const SeedValue arguments[],
-			    SeedException *exception)
+seed_ffi_construct_library(SeedContext ctx,
+                           SeedObject constructor,
+                           size_t argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-  GModule *mod;
-  SeedObject ret;
-  gchar *filename;
-  seed_ffi_library_priv *priv;
-  
-  if (argument_count != 1 && argument_count != 0)
-    {
-      seed_make_exception (ctx, exception, 
-			   "ArgumentError", 
-			   "ffi.Library constructor expects 1 argument (filename, or none to use NULL GModule), got %Zd", 
-			   argument_count);
-      return seed_make_null (ctx);
+    GModule* mod;
+    SeedObject ret;
+    gchar* filename;
+    seed_ffi_library_priv* priv;
+
+    if (argument_count != 1 && argument_count != 0) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "ffi.Library constructor expects 1 argument "
+                            "(filename, or none to use NULL GModule), got %zd",
+                            argument_count);
+        return seed_make_null(ctx);
     }
-  if (argument_count == 1)
-    filename = seed_value_to_string (ctx, arguments[0], exception);
-  else
-    filename = NULL;
-  
-  mod = g_module_open (filename, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
-  if (!mod)
-    {
-      seed_make_exception (ctx, exception, "GModuleError",
-			   "Opening module (%s) failed with: %s",
-			   filename, g_module_error ());
-      g_free (filename);
-      return seed_make_null (ctx);
+    if (argument_count == 1)
+        filename = seed_value_to_string(ctx, arguments[0], exception);
+    else
+        filename = NULL;
+
+    mod = g_module_open(filename, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
+    if (!mod) {
+        seed_make_exception(ctx, exception, "GModuleError",
+                            "Opening module (%s) failed with: %s", filename,
+                            g_module_error());
+        g_free(filename);
+        return seed_make_null(ctx);
     }
-  
-  priv = g_slice_alloc (sizeof (seed_ffi_library_priv));
-  priv->mod = mod;
-  
-  // TODO: Value destroy function.
-  priv->symbols = g_hash_table_new_full (g_str_hash, g_str_equal, 
-					 g_free, NULL);
-  
-  ret = seed_make_object (ctx, ffi_library_class, priv);
-  
-  g_free (filename);
-  
-  return ret;
+
+    priv = g_slice_alloc(sizeof(seed_ffi_library_priv));
+    priv->mod = mod;
+
+    // TODO: Value destroy function.
+    priv->symbols
+      = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
+    ret = seed_make_object(ctx, ffi_library_class, priv);
+
+    g_free(filename);
+
+    return ret;
 }
 
 static void
-seed_ffi_library_finalize (SeedObject obj)
+seed_ffi_library_finalize(SeedObject obj)
 {
-  seed_ffi_library_priv *priv;
-  priv = seed_object_get_private (obj);
-  
-  g_module_close (priv->mod);
+    seed_ffi_library_priv* priv;
+    priv = seed_object_get_private(obj);
+
+    g_module_close(priv->mod);
 }
 
-seed_static_value ffi_function_values [] = {
-  {"signature", seed_ffi_get_signature, seed_ffi_set_signature, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-  {NULL, NULL, NULL, 0}
-};
+seed_static_value ffi_function_values[]
+  = { { "signature", seed_ffi_get_signature, seed_ffi_set_signature,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { NULL, NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine *local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-  SeedObject library_constructor;
-  seed_class_definition ffi_library_def = seed_empty_class;
-  seed_class_definition ffi_function_def = seed_empty_class;
-
-  ffi_library_def.class_name = "FFILibrary";
-  ffi_library_def.finalize = seed_ffi_library_finalize;
-  ffi_library_def.get_property = seed_ffi_library_get_property;
-  
-  ffi_function_def.class_name = "FFIFunction";
-  ffi_function_def.finalize = seed_ffi_function_finalize;
-  ffi_function_def.static_values = ffi_function_values;
-  ffi_function_def.call_as_function = seed_ffi_function_call;
-  
-  ffi_library_class = seed_create_class (&ffi_library_def);
-  ffi_function_class = seed_create_class (&ffi_function_def);
-
-  eng = local_eng;
-  namespace_ref = seed_make_object (eng->context, NULL, NULL);
-  
-  library_constructor = seed_make_constructor (eng->context, ffi_library_class, seed_ffi_construct_library);
-  seed_object_set_property (eng->context, namespace_ref, "Library", library_constructor);
-  
-  return namespace_ref;
+    SeedObject library_constructor;
+    seed_class_definition ffi_library_def = seed_empty_class;
+    seed_class_definition ffi_function_def = seed_empty_class;
+
+    ffi_library_def.class_name = "FFILibrary";
+    ffi_library_def.finalize = seed_ffi_library_finalize;
+    ffi_library_def.get_property = seed_ffi_library_get_property;
+
+    ffi_function_def.class_name = "FFIFunction";
+    ffi_function_def.finalize = seed_ffi_function_finalize;
+    ffi_function_def.static_values = ffi_function_values;
+    ffi_function_def.call_as_function = seed_ffi_function_call;
+
+    ffi_library_class = seed_create_class(&ffi_library_def);
+    ffi_function_class = seed_create_class(&ffi_function_def);
+
+    eng = local_eng;
+    namespace_ref = seed_make_object(eng->context, NULL, NULL);
+
+    library_constructor = seed_make_constructor(eng->context, ffi_library_class,
+                                                seed_ffi_construct_library);
+    seed_object_set_property(eng->context, namespace_ref, "Library",
+                             library_constructor);
+
+    return namespace_ref;
 }
diff --git a/modules/gettext/Makefile.in b/modules/gettext/Makefile.in
index 1172f34..19d0ee4 100644
--- a/modules/gettext/Makefile.in
+++ b/modules/gettext/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/gettext
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -100,12 +141,25 @@ libseed_gettext_la_OBJECTS = $(am_libseed_gettext_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_gettext_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_gettext_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_GETTEXT_MODULE_TRUE@am_libseed_gettext_la_rpath = -rpath \
 @BUILD_GETTEXT_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -118,20 +172,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_gettext_la_SOURCES)
 DIST_SOURCES = $(am__libseed_gettext_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,8 +189,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -204,6 +272,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -217,6 +287,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -240,8 +311,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -253,6 +333,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -347,6 +428,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -392,7 +474,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/gettext/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/gettext/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -410,6 +491,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -436,12 +518,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_gettext.la: $(libseed_gettext_la_OBJECTS) $(libseed_gettext_la_DEPENDENCIES) $(EXTRA_libseed_gettext_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_gettext_la_LINK) $(am_libseed_gettext_la_rpath) $(libseed_gettext_la_OBJECTS) $(libseed_gettext_la_LIBADD) $(LIBS)
 
@@ -458,14 +543,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -480,26 +565,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -511,15 +585,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -528,6 +598,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -672,19 +757,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/gettext/seed-gettext.c b/modules/gettext/seed-gettext.c
index a1b285f..84fbd4f 100644
--- a/modules/gettext/seed-gettext.c
+++ b/modules/gettext/seed-gettext.c
@@ -23,304 +23,317 @@
 #include <locale.h>
 
 SeedObject ns_ref;
-SeedEngine * eng;
+SeedEngine* eng;
 
 static SeedValue
-seed_gettext_gettext (SeedContext ctx,
-                      SeedObject function,
-                      SeedObject this_object,
-                      gsize argument_count,
-                      const SeedValue arguments[],
-                      SeedException * exception)
+seed_gettext_gettext(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue arguments[],
+                     SeedException* exception)
 {
-	gchar * msgid;
-	SeedValue ret;
+    gchar* msgid;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.gettext", 1);
+    CHECK_ARG_COUNT("gettext.gettext", 1);
 
-	msgid = seed_value_to_string (ctx, arguments[0], exception);
+    msgid = seed_value_to_string(ctx, arguments[0], exception);
 
-	ret = seed_value_from_string (ctx, gettext(msgid), exception);
+    ret = seed_value_from_string(ctx, gettext(msgid), exception);
 
-	g_free(msgid);
+    g_free(msgid);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_textdomain (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue arguments[],
-                         SeedException * exception)
+seed_gettext_textdomain(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue arguments[],
+                        SeedException* exception)
 {
-	gchar * domain_name;
-	SeedValue ret;
+    gchar* domain_name;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.textdomain", 1);
+    CHECK_ARG_COUNT("gettext.textdomain", 1);
 
-	domain_name = seed_value_to_string (ctx, arguments[0], exception);
+    domain_name = seed_value_to_string(ctx, arguments[0], exception);
 
-	ret = seed_value_from_string (ctx, textdomain(domain_name), exception);
-	g_free(domain_name);
+    ret = seed_value_from_string(ctx, textdomain(domain_name), exception);
+    g_free(domain_name);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_bindtextdomain (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException * exception)
+seed_gettext_bindtextdomain(SeedContext ctx,
+                            SeedObject function,
+                            SeedObject this_object,
+                            gsize argument_count,
+                            const SeedValue args[],
+                            SeedException* exception)
 {
-	gchar * domainname, * dirname;
-	SeedValue ret;
+    gchar *domainname, *dirname;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.bindtextdomain", 2);
+    CHECK_ARG_COUNT("gettext.bindtextdomain", 2);
 
-	domainname = seed_value_to_string (ctx, args[0], exception);
-	dirname = seed_value_to_string (ctx, args[1], exception);
+    domainname = seed_value_to_string(ctx, args[0], exception);
+    dirname = seed_value_to_string(ctx, args[1], exception);
 
-	ret = seed_value_from_string (ctx,
-	                              bindtextdomain(domainname, dirname),
-	                              exception);
-	g_free(domainname);
-	g_free(dirname);
+    ret = seed_value_from_string(ctx, bindtextdomain(domainname, dirname),
+                                 exception);
+    g_free(domainname);
+    g_free(dirname);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_bind_textdomain_codeset (SeedContext ctx,
-                                      SeedObject function,
-                                      SeedObject this_object,
-                                      gsize argument_count,
-                                      const SeedValue args[],
-                                      SeedException * exception)
+seed_gettext_bind_textdomain_codeset(SeedContext ctx,
+                                     SeedObject function,
+                                     SeedObject this_object,
+                                     gsize argument_count,
+                                     const SeedValue args[],
+                                     SeedException* exception)
 {
-	gchar * domainname, * codeset;
-	SeedValue ret;
+    gchar *domainname, *codeset;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.bind_textdomain_codeset", 2);
+    CHECK_ARG_COUNT("gettext.bind_textdomain_codeset", 2);
 
-	domainname = seed_value_to_string (ctx, args[0], exception);
-	codeset = seed_value_to_string (ctx, args[1], exception);
+    domainname = seed_value_to_string(ctx, args[0], exception);
+    codeset = seed_value_to_string(ctx, args[1], exception);
 
-	ret = seed_value_from_string (ctx,
-	                              bind_textdomain_codeset(domainname, codeset),
-	                              exception);
-	g_free(domainname);
-	g_free(codeset);
+    ret = seed_value_from_string(ctx,
+                                 bind_textdomain_codeset(domainname, codeset),
+                                 exception);
+    g_free(domainname);
+    g_free(codeset);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_dgettext (SeedContext ctx,
-                       SeedObject function,
-                       SeedObject this_object,
-                       gsize argument_count,
-                       const SeedValue args[],
-                       SeedException * exception)
+seed_gettext_dgettext(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
-	gchar * domainname, * msgid;
-	SeedValue ret;
+    gchar *domainname, *msgid;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.dgettext", 2);
+    CHECK_ARG_COUNT("gettext.dgettext", 2);
 
-	domainname = seed_value_to_string (ctx, args[0], exception);
-	msgid = seed_value_to_string (ctx, args[1], exception);
+    domainname = seed_value_to_string(ctx, args[0], exception);
+    msgid = seed_value_to_string(ctx, args[1], exception);
 
-	ret = seed_value_from_string (ctx, dgettext(domainname, msgid), exception);
-	g_free(domainname);
-	g_free(msgid);
+    ret = seed_value_from_string(ctx, dgettext(domainname, msgid), exception);
+    g_free(domainname);
+    g_free(msgid);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_dcgettext (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException * exception)
-{
-	gchar * domainname, * msgid;
-	gint category;
-	SeedValue ret;
-
-	CHECK_ARG_COUNT("gettext.dcgettext", 3);
-
-	domainname = seed_value_to_string (ctx, args[0], exception);
-	msgid = seed_value_to_string (ctx, args[1], exception);
-	category = seed_value_to_int (ctx, args[2], exception);
-
-	ret = seed_value_from_string (ctx,
-	                              dcgettext(domainname, msgid, category),
-	                              exception);
-	g_free(domainname);
-	g_free(msgid);
-	
-	return ret;
-}
-
-static SeedValue
-seed_gettext_ngettext (SeedContext ctx,
+seed_gettext_dcgettext(SeedContext ctx,
                        SeedObject function,
                        SeedObject this_object,
                        gsize argument_count,
                        const SeedValue args[],
-                       SeedException * exception)
+                       SeedException* exception)
 {
-	gchar * msgid, * msgid_plural;
-	guint n;
-	SeedValue ret;
+    gchar *domainname, *msgid;
+    gint category;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.ngettext", 3);
+    CHECK_ARG_COUNT("gettext.dcgettext", 3);
 
-	msgid = seed_value_to_string (ctx, args[0], exception);
-	msgid_plural = seed_value_to_string (ctx, args[1], exception);
-	n = seed_value_to_uint (ctx, args[2], exception);
+    domainname = seed_value_to_string(ctx, args[0], exception);
+    msgid = seed_value_to_string(ctx, args[1], exception);
+    category = seed_value_to_int(ctx, args[2], exception);
 
-	ret = seed_value_from_string (ctx, ngettext(msgid, msgid_plural, n), exception);
-	g_free(msgid);
-	g_free(msgid_plural);
+    ret = seed_value_from_string(ctx, dcgettext(domainname, msgid, category),
+                                 exception);
+    g_free(domainname);
+    g_free(msgid);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_dngettext (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException * exception)
+seed_gettext_ngettext(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
-	gchar * domainname, * msgid, * msgid_plural;
-	guint n;
-	SeedValue ret;
+    gchar *msgid, *msgid_plural;
+    guint n;
+    SeedValue ret;
 
-	CHECK_ARG_COUNT("gettext.dngettext", 4);
+    CHECK_ARG_COUNT("gettext.ngettext", 3);
 
-	domainname = seed_value_to_string (ctx, args[0], exception);
-	msgid = seed_value_to_string (ctx, args[1], exception);
-	msgid_plural = seed_value_to_string (ctx, args[2], exception);
-	n = seed_value_to_uint (ctx, args[3], exception);
+    msgid = seed_value_to_string(ctx, args[0], exception);
+    msgid_plural = seed_value_to_string(ctx, args[1], exception);
+    n = seed_value_to_uint(ctx, args[2], exception);
 
-	ret = seed_value_from_string (ctx, dngettext(domainname, msgid, msgid_plural, n), exception);
-	g_free(domainname);
-	g_free(msgid);
-	g_free(msgid_plural);
+    ret = seed_value_from_string(ctx, ngettext(msgid, msgid_plural, n),
+                                 exception);
+    g_free(msgid);
+    g_free(msgid_plural);
 
-	return ret;
+    return ret;
 }
 
 static SeedValue
-seed_gettext_dcngettext (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException * exception)
+seed_gettext_dngettext(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue args[],
+                       SeedException* exception)
 {
-	gchar * domainname, * msgid, * msgid_plural;
-	guint n;
-	gint category;
-	SeedValue ret;
-
-	CHECK_ARG_COUNT("gettext.dcngettext", 5);
-
-	domainname = seed_value_to_string (ctx, args[0], exception);
-	msgid = seed_value_to_string (ctx, args[1], exception);
-	msgid_plural = seed_value_to_string (ctx, args[2], exception);
-	n = seed_value_to_uint (ctx, args[3], exception);
-	category = seed_value_to_int (ctx, args[4], exception);
-
-	ret = seed_value_from_string (ctx,
-	                              dcngettext(domainname, msgid, msgid_plural, n, category),
-	                              exception);
-	g_free(domainname);
-	g_free(msgid);
-	g_free(msgid_plural);
-
-	return ret;
+    gchar *domainname, *msgid, *msgid_plural;
+    guint n;
+    SeedValue ret;
+
+    CHECK_ARG_COUNT("gettext.dngettext", 4);
+
+    domainname = seed_value_to_string(ctx, args[0], exception);
+    msgid = seed_value_to_string(ctx, args[1], exception);
+    msgid_plural = seed_value_to_string(ctx, args[2], exception);
+    n = seed_value_to_uint(ctx, args[3], exception);
+
+    ret = seed_value_from_string(ctx,
+                                 dngettext(domainname, msgid, msgid_plural, n),
+                                 exception);
+    g_free(domainname);
+    g_free(msgid);
+    g_free(msgid_plural);
+
+    return ret;
 }
 
 static SeedValue
-seed_gettext_setlocale (SeedContext ctx,
+seed_gettext_dcngettext(SeedContext ctx,
                         SeedObject function,
                         SeedObject this_object,
                         gsize argument_count,
                         const SeedValue args[],
-                        SeedException * exception)
+                        SeedException* exception)
 {
-	gchar * locale;
-	gint category;
-	SeedValue ret;
+    gchar *domainname, *msgid, *msgid_plural;
+    guint n;
+    gint category;
+    SeedValue ret;
+
+    CHECK_ARG_COUNT("gettext.dcngettext", 5);
+
+    domainname = seed_value_to_string(ctx, args[0], exception);
+    msgid = seed_value_to_string(ctx, args[1], exception);
+    msgid_plural = seed_value_to_string(ctx, args[2], exception);
+    n = seed_value_to_uint(ctx, args[3], exception);
+    category = seed_value_to_int(ctx, args[4], exception);
+
+    ret = seed_value_from_string(ctx, dcngettext(domainname, msgid,
+                                                 msgid_plural, n, category),
+                                 exception);
+    g_free(domainname);
+    g_free(msgid);
+    g_free(msgid_plural);
+
+    return ret;
+}
 
-	CHECK_ARG_COUNT("gettext.setlocale", 2);
+static SeedValue
+seed_gettext_setlocale(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue args[],
+                       SeedException* exception)
+{
+    gchar* locale;
+    gint category;
+    SeedValue ret;
 
-	category = seed_value_to_int (ctx, args[0], exception);
-	locale = seed_value_to_string (ctx, args[1], exception);
+    CHECK_ARG_COUNT("gettext.setlocale", 2);
 
-	ret = seed_value_from_string (ctx,
-	                              setlocale(category, locale),
-	                              exception);
-	g_free(locale);
+    category = seed_value_to_int(ctx, args[0], exception);
+    locale = seed_value_to_string(ctx, args[1], exception);
 
-	return ret;
+    ret = seed_value_from_string(ctx, setlocale(category, locale), exception);
+    g_free(locale);
+
+    return ret;
 }
 
-seed_static_function gettext_funcs[] = {
-	{"gettext", seed_gettext_gettext, 0},
-	{"textdomain", seed_gettext_textdomain, 0},
-	{"bindtextdomain", seed_gettext_bindtextdomain, 0},
-	{"bind_textdomain_codeset", seed_gettext_bind_textdomain_codeset, 0},
-	{"dgettext", seed_gettext_dgettext, 0},
-	{"dcgettext", seed_gettext_dcgettext, 0},
-	{"ngettext", seed_gettext_ngettext, 0},
-	{"dngettext", seed_gettext_dngettext, 0},
-	{"dcngettext", seed_gettext_dcngettext, 0},
-	{"setlocale", seed_gettext_setlocale, 0},
-	{"gettext", seed_gettext_gettext, 0},
-	{NULL, NULL, 0}
-};
+seed_static_function gettext_funcs[]
+  = { { "gettext", seed_gettext_gettext, 0 },
+      { "textdomain", seed_gettext_textdomain, 0 },
+      { "bindtextdomain", seed_gettext_bindtextdomain, 0 },
+      { "bind_textdomain_codeset", seed_gettext_bind_textdomain_codeset, 0 },
+      { "dgettext", seed_gettext_dgettext, 0 },
+      { "dcgettext", seed_gettext_dcgettext, 0 },
+      { "ngettext", seed_gettext_ngettext, 0 },
+      { "dngettext", seed_gettext_dngettext, 0 },
+      { "dcngettext", seed_gettext_dcngettext, 0 },
+      { "setlocale", seed_gettext_setlocale, 0 },
+      { "gettext", seed_gettext_gettext, 0 },
+      { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine *local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-	SeedGlobalContext ctx = local_eng->context;
+    SeedGlobalContext ctx = local_eng->context;
 
-	seed_class_definition gettext_ns_class_def = seed_empty_class;
+    seed_class_definition gettext_ns_class_def = seed_empty_class;
     gettext_ns_class_def.static_functions = gettext_funcs;
 
-	SeedClass gettext_ns_class = seed_create_class(&gettext_ns_class_def);
-
-	ns_ref = seed_make_object (ctx, gettext_ns_class, NULL);
-	seed_value_protect (ctx, ns_ref);
-
-	/* define enums for setlocale. Where to put them?  */
-
-	DEFINE_ENUM_MEMBER(ns_ref, LC_CTYPE);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_NUMERIC);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_TIME);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_COLLATE);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_ALL);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_PAPER);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_NAME);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_ADDRESS);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_TELEPHONE);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_MEASUREMENT);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_IDENTIFICATION);
-	DEFINE_ENUM_MEMBER(ns_ref, LC_CTYPE);
-
-	return ns_ref;
+    SeedClass gettext_ns_class = seed_create_class(&gettext_ns_class_def);
+
+    ns_ref = seed_make_object(ctx, gettext_ns_class, NULL);
+    seed_value_protect(ctx, ns_ref);
+
+    /* define enums for setlocale. Where to put them?  */
+
+    DEFINE_ENUM_MEMBER(ns_ref, LC_CTYPE);
+    DEFINE_ENUM_MEMBER(ns_ref, LC_NUMERIC);
+    DEFINE_ENUM_MEMBER(ns_ref, LC_TIME);
+    DEFINE_ENUM_MEMBER(ns_ref, LC_COLLATE);
+    DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY);
+    DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES);
+    DEFINE_ENUM_MEMBER(ns_ref, LC_ALL);
+
+/* these are gnu extensions - and not available on BSD systems */
+
+#ifdef LC_PAPER
+    DEFINE_ENUM_MEMBER(ns_ref, LC_PAPER);
+#endif
+#ifdef LC_NAME
+    DEFINE_ENUM_MEMBER(ns_ref, LC_NAME);
+#endif
+#ifdef LC_ADDRESS
+    DEFINE_ENUM_MEMBER(ns_ref, LC_ADDRESS);
+#endif
+#ifdef LC_TELEPHONE
+    DEFINE_ENUM_MEMBER(ns_ref, LC_TELEPHONE);
+#endif
+#ifdef LC_MEASUREMENT
+    DEFINE_ENUM_MEMBER(ns_ref, LC_MEASUREMENT);
+#endif
+#ifdef LC_IDENTIFICATION
+    DEFINE_ENUM_MEMBER(ns_ref, LC_IDENTIFICATION);
+#endif
+
+    DEFINE_ENUM_MEMBER(ns_ref, LC_CTYPE);
+
+    return ns_ref;
 }
-
diff --git a/modules/gjs/Makefile.am b/modules/gjs/Makefile.am
new file mode 100644
index 0000000..d9a106c
--- /dev/null
+++ b/modules/gjs/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = system _gi
+
+EXTRA_DIST= cairo.js coverage.js format.js gettext.js jsUnit.js lang.js mainloop.js package.js signals.js
+
+gjs_extensiondir=$(datadir)/seed@SEED_GTK_VERSION@/gjs
+gjs_extension_DATA = cairo.js coverage.js format.js gettext.js jsUnit.js lang.js mainloop.js package.js signals.js
diff --git a/modules/gjs/Makefile.in b/modules/gjs/Makefile.in
new file mode 100644
index 0000000..acf50b4
--- /dev/null
+++ b/modules/gjs/Makefile.in
@@ -0,0 +1,787 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = modules/gjs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+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__installdirs = "$(DESTDIR)$(gjs_extensiondir)"
+DATA = $(gjs_extension_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CAIRO_MODULE = @BUILD_CAIRO_MODULE@
+BUILD_CANVAS_MODULE = @BUILD_CANVAS_MODULE@
+BUILD_DBUS_MODULE = @BUILD_DBUS_MODULE@
+BUILD_DYNAMICOBJECT_MODULE = @BUILD_DYNAMICOBJECT_MODULE@
+BUILD_EXAMPLE_MODULE = @BUILD_EXAMPLE_MODULE@
+BUILD_FFI_MODULE = @BUILD_FFI_MODULE@
+BUILD_GETTEXT_MODULE = @BUILD_GETTEXT_MODULE@
+BUILD_GTKBUILDER_MODULE = @BUILD_GTKBUILDER_MODULE@
+BUILD_LIBXML_MODULE = @BUILD_LIBXML_MODULE@
+BUILD_MPFR_MODULE = @BUILD_MPFR_MODULE@
+BUILD_MULTIPROCESSING_MODULE = @BUILD_MULTIPROCESSING_MODULE@
+BUILD_OS_MODULE = @BUILD_OS_MODULE@
+BUILD_READLINE_MODULE = @BUILD_READLINE_MODULE@
+BUILD_SQLITE_MODULE = @BUILD_SQLITE_MODULE@
+BUILD_XORG_MODULE = @BUILD_XORG_MODULE@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
+DBUSGLIB_LDFLAGS = @DBUSGLIB_LDFLAGS@
+DBUSGLIB_LIBS = @DBUSGLIB_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LDFLAGS = @DBUS_LDFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+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_LDFLAGS = @FFI_LDFLAGS@
+FFI_LIBS = @FFI_LIBS@
+FGREP = @FGREP@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LDFLAGS = @GDK_LDFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
+GNOME_JS_DIR = @GNOME_JS_DIR@
+GNOME_JS_LIBS = @GNOME_JS_LIBS@
+GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
+GOBJECT_INTROSPECTION_LDFLAGS = @GOBJECT_INTROSPECTION_LDFLAGS@
+GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
+GOBJECT_INTROSPECTION_VERSION = @GOBJECT_INTROSPECTION_VERSION@
+GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LDFLAGS = @GTK_LDFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LDFLAGS = @LIBXML_LDFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXSS_CFLAGS = @LIBXSS_CFLAGS@
+LIBXSS_LIBS = @LIBXSS_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SEED_DEBUG_CFLAGS = @SEED_DEBUG_CFLAGS@
+SEED_GTK_VERSION = @SEED_GTK_VERSION@
+SEED_PROFILE_CFLAGS = @SEED_PROFILE_CFLAGS@
+SEED_PROFILE_LIBS = @SEED_PROFILE_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LDFLAGS = @WEBKIT_LDFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_PC = @WEBKIT_PC@
+XGETTEXT = @XGETTEXT@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+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@
+SUBDIRS = system _gi
+EXTRA_DIST = cairo.js coverage.js format.js gettext.js jsUnit.js lang.js mainloop.js package.js signals.js
+gjs_extensiondir = $(datadir)/seed@SEED_GTK_VERSION@/gjs
+gjs_extension_DATA = cairo.js coverage.js format.js gettext.js jsUnit.js lang.js mainloop.js package.js signals.js
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/gjs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu modules/gjs/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(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-gjs_extensionDATA: $(gjs_extension_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(gjs_extension_DATA)'; test -n "$(gjs_extensiondir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(gjs_extensiondir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(gjs_extensiondir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gjs_extensiondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gjs_extensiondir)" || exit $$?; \
+	done
+
+uninstall-gjs_extensionDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gjs_extension_DATA)'; test -n "$(gjs_extensiondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(gjs_extensiondir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  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
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(gjs_extensiondir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-gjs_extensionDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-gjs_extensionDATA
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-gjs_extensionDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
+	uninstall-gjs_extensionDATA
+
+.PRECIOUS: Makefile
+
+
+# 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/modules/gjs/_gi/Makefile.am b/modules/gjs/_gi/Makefile.am
new file mode 100644
index 0000000..925a99a
--- /dev/null
+++ b/modules/gjs/_gi/Makefile.am
@@ -0,0 +1,22 @@
+seedlibdir = ${libdir}/seed@SEED_GTK_VERSION@/gjs
+
+seedlib_LTLIBRARIES = \
+	libseed__gi.la
+
+libseed__gi_la_SOURCES = \
+	seed-gi.c
+
+AM_CPPFLAGS = \
+	-I@top_srcdir@/libseed/ \
+	$(GOBJECT_INTROSPECTION_CFLAGS) \
+	$(SEED_DEBUG_CFLAGS) \
+	$(SEED_PROFILE_CFLAGS)
+
+libseed__gi_la_LDFLAGS = \
+	-module -avoid-version \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed__gi_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(SEED_PROFILE_LIBS)
+
diff --git a/modules/gjs/_gi/Makefile.in b/modules/gjs/_gi/Makefile.in
new file mode 100644
index 0000000..26bdad9
--- /dev/null
+++ b/modules/gjs/_gi/Makefile.in
@@ -0,0 +1,777 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = modules/gjs/_gi
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+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__installdirs = "$(DESTDIR)$(seedlibdir)"
+LTLIBRARIES = $(seedlib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libseed__gi_la_DEPENDENCIES =  \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(am__DEPENDENCIES_1)
+am_libseed__gi_la_OBJECTS = seed-gi.lo
+libseed__gi_la_OBJECTS = $(am_libseed__gi_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libseed__gi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libseed__gi_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libseed__gi_la_SOURCES)
+DIST_SOURCES = $(libseed__gi_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CAIRO_MODULE = @BUILD_CAIRO_MODULE@
+BUILD_CANVAS_MODULE = @BUILD_CANVAS_MODULE@
+BUILD_DBUS_MODULE = @BUILD_DBUS_MODULE@
+BUILD_DYNAMICOBJECT_MODULE = @BUILD_DYNAMICOBJECT_MODULE@
+BUILD_EXAMPLE_MODULE = @BUILD_EXAMPLE_MODULE@
+BUILD_FFI_MODULE = @BUILD_FFI_MODULE@
+BUILD_GETTEXT_MODULE = @BUILD_GETTEXT_MODULE@
+BUILD_GTKBUILDER_MODULE = @BUILD_GTKBUILDER_MODULE@
+BUILD_LIBXML_MODULE = @BUILD_LIBXML_MODULE@
+BUILD_MPFR_MODULE = @BUILD_MPFR_MODULE@
+BUILD_MULTIPROCESSING_MODULE = @BUILD_MULTIPROCESSING_MODULE@
+BUILD_OS_MODULE = @BUILD_OS_MODULE@
+BUILD_READLINE_MODULE = @BUILD_READLINE_MODULE@
+BUILD_SQLITE_MODULE = @BUILD_SQLITE_MODULE@
+BUILD_XORG_MODULE = @BUILD_XORG_MODULE@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
+DBUSGLIB_LDFLAGS = @DBUSGLIB_LDFLAGS@
+DBUSGLIB_LIBS = @DBUSGLIB_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LDFLAGS = @DBUS_LDFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+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_LDFLAGS = @FFI_LDFLAGS@
+FFI_LIBS = @FFI_LIBS@
+FGREP = @FGREP@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LDFLAGS = @GDK_LDFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
+GNOME_JS_DIR = @GNOME_JS_DIR@
+GNOME_JS_LIBS = @GNOME_JS_LIBS@
+GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
+GOBJECT_INTROSPECTION_LDFLAGS = @GOBJECT_INTROSPECTION_LDFLAGS@
+GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
+GOBJECT_INTROSPECTION_VERSION = @GOBJECT_INTROSPECTION_VERSION@
+GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LDFLAGS = @GTK_LDFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LDFLAGS = @LIBXML_LDFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXSS_CFLAGS = @LIBXSS_CFLAGS@
+LIBXSS_LIBS = @LIBXSS_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SEED_DEBUG_CFLAGS = @SEED_DEBUG_CFLAGS@
+SEED_GTK_VERSION = @SEED_GTK_VERSION@
+SEED_PROFILE_CFLAGS = @SEED_PROFILE_CFLAGS@
+SEED_PROFILE_LIBS = @SEED_PROFILE_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LDFLAGS = @WEBKIT_LDFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_PC = @WEBKIT_PC@
+XGETTEXT = @XGETTEXT@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+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@
+seedlibdir = ${libdir}/seed@SEED_GTK_VERSION@/gjs
+seedlib_LTLIBRARIES = \
+	libseed__gi.la
+
+libseed__gi_la_SOURCES = \
+	seed-gi.c
+
+AM_CPPFLAGS = \
+	-I@top_srcdir@/libseed/ \
+	$(GOBJECT_INTROSPECTION_CFLAGS) \
+	$(SEED_DEBUG_CFLAGS) \
+	$(SEED_PROFILE_CFLAGS)
+
+libseed__gi_la_LDFLAGS = \
+	-module -avoid-version \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed__gi_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(SEED_PROFILE_LIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/gjs/_gi/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu modules/gjs/_gi/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(seedlibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(seedlibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(seedlibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(seedlibdir)"; \
+	}
+
+uninstall-seedlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(seedlibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(seedlibdir)/$$f"; \
+	done
+
+clean-seedlibLTLIBRARIES:
+	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libseed__gi.la: $(libseed__gi_la_OBJECTS) $(libseed__gi_la_DEPENDENCIES) $(EXTRA_libseed__gi_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libseed__gi_la_LINK) -rpath $(seedlibdir) $(libseed__gi_la_OBJECTS) $(libseed__gi_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seed-gi.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  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 $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(seedlibdir)"; 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 clean-seedlibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-seedlibLTLIBRARIES
+
+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 -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-seedlibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/modules/gjs/_gi/seed-gi.c b/modules/gjs/_gi/seed-gi.c
new file mode 100644
index 0000000..c07403b
--- /dev/null
+++ b/modules/gjs/_gi/seed-gi.c
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2015 Collabora 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.
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include <glib.h>
+#include <seed-module.h>
+#include <config.h>
+
+#define GJS_COMPAT_VERSION (1 * 100 + 40) * 100 + 0
+
+#define NUMARG_EXPECTED_EXCEPTION(name, argc)                                  \
+    seed_make_exception(ctx, exception, "ArgumentError",                       \
+                        name " expected " argc " but got %zd", argumentCount); \
+    return seed_make_undefined(ctx);
+
+static SeedValue
+gjs_override_property(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      size_t argumentCount,
+                      const SeedValue arguments[],
+                      SeedException* exception)
+{
+    // TODO: to be implemented.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "Not implemented yet");
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+gjs_register_interface(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       size_t argumentCount,
+                       const SeedValue arguments[],
+                       SeedException* exception)
+{
+    // TODO: to be implemented.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "Not implemented yet");
+    return seed_make_undefined(ctx);
+}
+static SeedValue
+gjs_register_type(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argumentCount,
+                  const SeedValue arguments[],
+                  SeedException* exception)
+{
+    // TODO: to be implemented.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "Not implemented yet");
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+gjs_add_interface(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argumentCount,
+                  const SeedValue arguments[],
+                  SeedException* exception)
+{
+    // TODO: to be implemented.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "Not implemented yet");
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+gjs_hook_up_vfunc(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argumentCount,
+                  const SeedValue arguments[],
+                  SeedException* exception)
+{
+    // TODO: to be implemented.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "Not implemented yet");
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+gjs_signal_new(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argumentCount,
+               const SeedValue arguments[],
+               SeedException* exception)
+{
+    // TODO: to be implemented.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "Not implemented yet");
+    return seed_make_undefined(ctx);
+}
+
+static seed_static_function module_funcs[]
+  = { { "override_property", gjs_override_property, 0 },
+      { "register_interface", gjs_register_interface, 0 },
+      { "register_type", gjs_register_type, 0 },
+      { "add_interface", gjs_add_interface, 0 },
+      { "hook_up_vfunc", gjs_hook_up_vfunc, 0 },
+      { "signal_new", gjs_signal_new, 0 },
+      { 0, 0, 0 } };
+
+static seed_class_definition system_def = {
+    0,                                        /* Version, always 0 */
+    SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE, /* JSClassAttributes */
+    "_gi",                                    /* Class Name */
+    NULL,                                     /* Parent Class */
+    NULL,                                     /* Static Values */
+    module_funcs,                             /* Static Functions */
+    NULL,
+    NULL, /* Finalize */
+    NULL, /* Has Property */
+    NULL, /* Get Property */
+    NULL, /* Set Property */
+    NULL, /* Delete Property */
+    NULL, /* Get Property Names */
+    NULL, /* Call As Function */
+    NULL, /* Call As Constructor */
+    NULL, /* Has Instance */
+    NULL  /* Convert To Type */
+};
+
+SeedObject
+gjs_compat_define_gi_stuff(SeedEngine* eng)
+{
+    SeedContext context = eng->context;
+    SeedObject module;
+    gboolean ret;
+
+    module = seed_make_object(context, seed_create_class(&system_def), NULL);
+
+    SeedValue seed = seed_object_get_property(context, eng->global, "Seed");
+    SeedValue argv = seed_object_get_property(context, seed, "argv");
+
+    ret = seed_object_set_property(
+      context, module, "version",
+      (SeedValue) seed_value_from_int(context, GJS_COMPAT_VERSION, NULL));
+
+    return module;
+}
+
+SeedObject
+seed_module_init(SeedEngine* eng)
+{
+    return gjs_compat_define_gi_stuff(eng);
+}
diff --git a/modules/gjs/cairo.js b/modules/gjs/cairo.js
new file mode 100644
index 0000000..7555c3c
--- /dev/null
+++ b/modules/gjs/cairo.js
@@ -0,0 +1,147 @@
+// Copyright 2010 litl, LLC.
+//
+// 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.
+
+const Lang = imports.lang;
+
+const Antialias = {
+    DEFAULT: 0,
+    NONE: 1,
+    GRAY: 2,
+    SUBPIXEL: 3
+};
+
+const Content = {
+    COLOR : 0x1000,
+    ALPHA : 0x2000,
+    COLOR_ALPHA : 0x3000
+};
+
+const Extend = {
+    NONE : 0,
+    REPEAT : 1,
+    REFLECT : 2,
+    PAD : 3
+};
+
+const FillRule = {
+    WINDING: 0,
+    EVEN_ODD: 1
+};
+
+const Filter = {
+    FAST : 0,
+    GOOD : 1,
+    BEST : 2,
+    NEAREST : 3,
+    BILINEAR : 4,
+    GAUSSIAN : 5
+};
+
+const FontSlant = {
+    NORMAL: 0,
+    ITALIC: 1,
+    OBLIQUE: 2
+};
+
+const FontWeight = {
+    NORMAL : 0,
+    BOLD : 1
+};
+
+const Format = {
+    ARGB32 : 0,
+    RGB24 : 1,
+    A8 : 2,
+    A1 : 3,
+    // The value of 4 is reserved by a deprecated enum value
+    RGB16_565: 5
+};
+
+const LineCap = {
+    BUTT: 0,
+    ROUND: 1,
+    SQUASH: 2
+};
+
+const LineJoin = {
+    MITER: 0,
+    ROUND: 1,
+    BEVEL: 2
+};
+
+const Operator = {
+    CLEAR: 0,
+    SOURCE: 1,
+    OVER: 2,
+    IN : 3,
+    OUT : 4,
+    ATOP : 5,
+    DEST : 6,
+    DEST_OVER : 7,
+    DEST_IN : 8,
+    DEST_OUT : 9,
+    DEST_ATOP : 10,
+    XOR : 11,
+    ADD : 12,
+    SATURATE : 13,
+    MULTIPLY : 14,
+    SCREEN : 15,
+    OVERLAY : 16,
+    DARKEN : 17,
+    LIGHTEN : 18,
+    COLOR_DODGE : 19,
+    COLOR_BURN : 20,
+    HARD_LIGHT : 21,
+    SOFT_LIGHT : 22,
+    DIFFERENCE : 23,
+    EXCLUSION : 24,
+    HSL_HUE : 25,
+    HSL_SATURATION : 26,
+    HSL_COLOR : 27,
+    HSL_LUMINOSITY : 28
+};
+
+const PatternType = {
+    SOLID : 0,
+    SURFACE : 1,
+    LINEAR : 2,
+    RADIAL : 3
+};
+
+const SurfaceType = {
+    IMAGE : 0,
+    PDF : 1,
+    PS : 2,
+    XLIB : 3,
+    XCB : 4,
+    GLITZ : 5,
+    QUARTZ : 6,
+    WIN32 : 7,
+    BEOS : 8,
+    DIRECTFB : 9,
+    SVG : 10,
+    OS2 : 11,
+    WIN32_PRINTING : 12,
+    QUARTZ_IMAGE : 13
+};
+
+// Merge stuff defined in native code
+Lang.copyProperties(imports.cairoNative, this);
+
diff --git a/modules/gjs/coverage.js b/modules/gjs/coverage.js
new file mode 100644
index 0000000..1b4f2cc
--- /dev/null
+++ b/modules/gjs/coverage.js
@@ -0,0 +1,978 @@
+/*
+ * Copyright (c) 2014 Endless Mobile, Inc.
+ *
+ * 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.
+ *
+ * Authored By: Sam Spilsbury <sam@endlessm.com>
+ */
+
+function getSubNodesForNode(node) {
+    let subNodes = [];
+    switch (node.type) {
+    /* These statements have a single body */
+    case 'LabelledStatement':
+    case 'WithStatement':
+    case 'FunctionDeclaration':
+    case 'FunctionExpression':
+    case 'CatchClause':
+        subNodes.push(node.body);
+        break;
+    case 'LetStatement':
+        Array.prototype.push.apply(subNodes, node.head);
+        subNodes.push(node.body);
+        break;
+    case 'WhileStatement':
+    case 'DoWhileStatement':
+        subNodes.push(node.body);
+        subNodes.push(node.test);
+        break;
+    case 'ForStatement':
+        if (node.init !== null)
+            subNodes.push(node.init);
+        if (node.test !== null)
+            subNodes.push(node.test);
+        if (node.update !== null)
+            subNodes.push(node.update);
+
+        subNodes.push(node.body);
+        break;
+    case 'ForInStatement':
+        if (node.each)
+            subNodes.push(node.left);
+
+        subNodes.push(node.right, node.body);
+        break;
+    case 'ForOfStatement':
+        subNodes.push(node.left, node.right, node.body);
+        break;
+    case 'BlockStatement':
+        Array.prototype.push.apply(subNodes, node.body);
+        break;
+    case 'ThrowStatement':
+    case 'ReturnStatement':
+    case 'YieldExpression':
+        if (node.argument !== null)
+            subNodes.push(node.argument);
+        break;
+    case 'ExpressionStatement':
+        subNodes.push(node.expression);
+        break;
+    case 'AssignmentExpression':
+    case 'BinaryExpression':
+    case 'LogicalExpression':
+        subNodes.push(node.left, node.right);
+        break;
+    case 'ConditionalExpression':
+        subNodes.push(node.test, node.consequent, node.alternate);
+        break;
+    case 'ObjectExpression':
+        node.properties.forEach(function(prop) {
+            subNodes.push(prop.value);
+        });
+        break;
+    case 'ArrayExpression':
+        node.elements.forEach(function(elem) {
+            if (elem !== null)
+                subNodes.push(elem);
+        });
+        break;
+    case 'ArrowExpression':
+        Array.prototype.push.apply(subNodes, node.defaults);
+        subNodes.push(node.body);
+        break;
+    case 'SequenceExpression':
+        Array.prototype.push.apply(subNodes, node.expressions);
+        break;
+    case 'UnaryExpression':
+    case 'UpdateExpression':
+        subNodes.push(node.argument);
+        break;
+    case 'ComprehensionExpression':
+    case 'GeneratorExpression':
+        subNodes.push(node.body);
+        Array.prototype.push.apply(subNodes, node.blocks);
+        if (node.filter !== null)
+            subNodes.push(node.filter);
+        break;
+    case 'ComprehensionBlock':
+        subNodes.push(node.right);
+        break;
+    /* It is very possible that there might be something
+     * interesting in the function arguments, so we need to
+     * walk them too */
+    case 'NewExpression':
+    case 'CallExpression':
+        Array.prototype.push.apply(subNodes, node.arguments);
+        subNodes.push(node.callee);
+        break;
+    /* These statements might have multiple different bodies
+     * depending on whether or not they were entered */
+    case 'IfStatement':
+        subNodes = [node.test, node.consequent];
+        if (node.alternate !== null)
+            subNodes.push(node.alternate);
+        break;
+    case 'TryStatement':
+        subNodes = [node.block];
+        if (node.handler !== null)
+            subNodes.push(node.handler);
+        if (node.finalizer !== null)
+            subNodes.push(node.finalizer);
+        break;
+    case 'SwitchStatement':
+        for (let caseClause of node.cases) {
+            caseClause.consequent.forEach(function(expression) {
+                subNodes.push(expression);
+            });
+        }
+        break;
+    case 'VariableDeclaration':
+        Array.prototype.push.apply(subNodes, node.declarations);
+        break;
+    case 'VariableDeclarator':
+        if (node.init !== null)
+            subNodes.push(node.init);
+        break;
+    case 'MemberExpression':
+        subNodes.push(node.object);
+        if (node.computed)
+            subNodes.push(node.property);
+
+        break;
+    }
+
+    return subNodes;
+}
+
+function collectForSubNodes(subNodes, collector) {
+    let result = [];
+    if (subNodes !== undefined &&
+        subNodes.length > 0) {
+
+        subNodes.forEach(function(node) {
+            let nodeResult = collector(node);
+            if (nodeResult !== undefined)
+                Array.prototype.push.apply(result, nodeResult);
+
+            let subNodeResults = collectForSubNodes(getSubNodesForNode(node),
+                                                    collector);
+
+            Array.prototype.push.apply(result, subNodeResults);
+        });
+    }
+
+    return result;
+}
+
+function _getFunctionKeyFromReflectedFunction(node) {
+    let name = node.id !== null ? node.id.name : '(anonymous)';
+    let line = node.loc.start.line;
+    let n_params = node.params.length;
+
+    return [name, line, n_params].join(':');
+}
+
+/* Unfortunately, the Reflect API doesn't give us enough information to
+ * uniquely identify a function. A function might be anonymous, in which
+ * case the JS engine uses some heurisitics to get a unique string identifier
+ * but that isn't available to us here.
+ *
+ * There's also the edge-case where functions with the same name might be
+ * defined within the same scope, or multiple anonymous functions might
+ * be defined on the same line. In that case, it will look like we entered
+ * the same function multiple times since we can't get column information
+ * from the engine-side.
+ *
+ * For instance:
+ *
+ * 1. function f() {
+ *       function f() {
+ *       }
+ *    }
+ *
+ * 2. let a = function() { function(a, b) {} };
+ *
+ * 3. let a = function() { function () {} }
+ *
+ * We can work-around case 1 by using the line numbers to get a unique identifier.
+ * We can work-around case 2 by using the arguments length to get a unique identifier
+ * We can't work-around case 3. The best thing we can do is warn that coverage
+ * reports might be inaccurate as a result */
+function functionsForNode(node) {
+    let functionNames = [];
+    switch (node.type) {
+    case 'FunctionDeclaration':
+    case 'FunctionExpression':
+    case 'ArrowExpression':
+        functionNames.push({ key: _getFunctionKeyFromReflectedFunction(node),
+                             line: node.loc.start.line,
+                             n_params: node.params.length });
+    }
+
+    return functionNames;
+}
+
+function functionsForAST(ast) {
+    return collectForSubNodes(ast.body, functionsForNode);
+}
+
+/* If a branch' consequent is a block statement, there's
+ * a chance that it could start on the same line, although
+ * that's not where execution really starts. If it is
+ * a block statement then handle the case and go
+ * to the first line where execution starts */
+function getBranchExitStartLine(branchBodyNode) {
+    switch (branchBodyNode.type) {
+    case 'BlockStatement':
+        /* Hit a block statement, but nothing inside, can never
+         * be executed, tell the upper level to move on to the next
+         * statement */
+        if (branchBodyNode.body.length === 0)
+            return -1;
+
+        /* Handle the case where we have nested block statements
+         * that never actually get to executable code by handling
+         * all statements within a block */
+        for (let statement of branchBodyNode.body) {
+            let startLine = getBranchExitStartLine(statement);
+            if (startLine !== -1)
+                return startLine;
+        }
+
+        /* Couldn't find an executable line inside this block */
+        return -1;
+
+    case 'SwitchCase':
+        /* Hit a switch, but nothing inside, can never
+         * be executed, tell the upper level to move on to the next
+         * statement */
+        if (branchBodyNode.consequent.length === 0)
+            return -1;
+
+        /* Handle the case where we have nested block statements
+         * that never actually get to executable code by handling
+         * all statements within a block */
+        for (let statement of branchBodyNode.consequent) {
+            let startLine = getBranchExitStartLine(statement);
+            if (startLine !== -1) {
+                return startLine;
+            }
+        }
+
+        /* Couldn't find an executable line inside this block */
+        return -1;
+    /* These types of statements are never executable */
+    case 'EmptyStatement':
+    case 'LabelledStatement':
+        return -1;
+    default:
+        break;
+    }
+
+    return branchBodyNode.loc.start.line;
+}
+
+function branchesForNode(node) {
+    let branches = [];
+
+    let branchExitNodes = [];
+    switch (node.type) {
+    case 'IfStatement':
+        branchExitNodes.push(node.consequent);
+        if (node.alternate !== null)
+            branchExitNodes.push(node.alternate);
+        break;
+    case 'WhileStatement':
+    case 'DoWhileStatement':
+        branchExitNodes.push(node.body);
+        break;
+    case 'SwitchStatement':
+
+        /* The case clauses by themselves are never executable
+         * so find the actual exits */
+        Array.prototype.push.apply(branchExitNodes, node.cases);
+        break;
+    default:
+        break;
+    }
+
+    let branchExitStartLines = branchExitNodes.map(getBranchExitStartLine);
+    branchExitStartLines = branchExitStartLines.filter(function(line) {
+        return line !== -1;
+    });
+
+    /* Branch must have at least one exit */
+    if (branchExitStartLines.length) {
+        branches.push({ point: node.loc.start.line,
+                        exits: branchExitStartLines });
+    }
+
+    return branches;
+}
+
+function branchesForAST(ast) {
+    return collectForSubNodes(ast.body, branchesForNode);
+}
+
+function expressionLinesForNode(statement) {
+    let expressionLines = [];
+
+    let expressionNodeTypes = ['Expression',
+                               'Declaration',
+                               'Statement',
+                               'Clause',
+                               'Literal',
+                               'Identifier'];
+
+    if (expressionNodeTypes.some(function(type) {
+            return statement.type.indexOf(type) !== -1;
+        })) {
+
+        /* These expressions aren't executable on their own */
+        switch (statement.type) {
+        case 'FunctionDeclaration':
+        case 'LiteralExpression':
+            break;
+        /* Perplexingly, an empty block statement is actually executable,
+         * push it if it is */
+        case 'BlockStatement':
+            if (statement.body.length !== 0)
+                break;
+            expressionLines.push(statement.loc.start.line);
+            break;
+        default:
+            expressionLines.push(statement.loc.start.line);
+            break;
+        }
+    }
+
+    return expressionLines;
+}
+
+function deduplicate(list) {
+    return list.filter(function(elem, pos, self) {
+        return self.indexOf(elem) === pos;
+    });
+}
+
+function expressionLinesForAST(ast) {
+    let allExpressions = collectForSubNodes(ast.body, expressionLinesForNode);
+    allExpressions = deduplicate(allExpressions);
+
+    return allExpressions;
+}
+
+function _getNumberOfLinesForScript(scriptContents) {
+    let scriptLines = scriptContents.split("\n");
+    let scriptLineCount = scriptLines.length;
+
+    return scriptLineCount;
+}
+
+/*
+ * The created array is a 1-1 representation of the hitcount in the filename. Each
+ * element refers to an individual line. In order to avoid confusion, our array
+ * is zero indexed, but the zero'th line is always ignored and the first element
+ * refers to the first line of the file.
+ *
+ * A value of undefined for an element means that the line is non-executable and never actually
+ * reached. A value of 0 means that it was executable but never reached. A positive value
+ * indicates the hit count.
+ *
+ * We care about non-executable lines because we don't want to report coverage misses for
+ * lines that could have never been executed anyways.
+ *
+ * The reason for using a 1-1 mapping as opposed to an array of key-value pairs for executable
+ * lines is:
+ *   1. Lookup speed is O(1) instead of O(log(n))
+ *   2. There's a possibility we might hit a line which we thought was non-executable, in which
+ *      case we can neatly handle the error by marking that line executable. A hit on a line
+ *      we thought was non-executable is not as much of a problem as noise generated by
+ *      ostensible "misses" which could in fact never be executed.
+ *
+ */
+function _expressionLinesToCounters(expressionLines, nLines) {
+    expressionLines.sort(function(left, right) { return left - right; });
+
+    let expressionLinesIndex = 0;
+    let counters = new Array(nLines + 1);
+
+    if (expressionLines.length === 0)
+        return counters;
+
+    for (let i = 1; i < counters.length; i++) {
+        if (expressionLines[expressionLinesIndex] == i) {
+            counters[i] = 0;
+            expressionLinesIndex++;
+        }
+    }
+
+    return counters;
+}
+
+/* As above, we are creating a 1-1 representation of script lines to potential branches
+ * where each element refers to a 1-index line (with the zero'th ignored).
+ *
+ * Each element is a GjsCoverageBranchData which, if the line at the element
+ * position describes a branch, will be populated with a GjsReflectedScriptBranchInfo
+ * and an array of unsigned each specifying the hit-count for each potential branch
+ * in the branch info */
+function _branchesToBranchCounters(branches, nLines) {
+    branches.sort(function(left, right) {
+        return left.point - right.point;
+    });
+
+    let branchIndex = 0;
+    let counters = new Array(nLines + 1);
+
+    if (branches.length === 0)
+        return counters;
+
+    for (let i = 1; i < counters.length; i++) {
+        let branch = branches[branchIndex];
+        let branchPoint = branch.point;
+
+        if (branchPoint == i) {
+            counters[i] = {
+                point: branchPoint,
+                exits: branch.exits.map(function(exit) {
+                    return {
+                        line: exit,
+                        hitCount: 0
+                    };
+                }),
+                lastExit: (function() {
+                    let lastExitLine = 0;
+                    for (let exit of branch.exits) {
+                        if (lastExitLine < exit)
+                            lastExitLine = exit;
+                    }
+
+                    return lastExitLine;
+                })(),
+                hit: false
+            };
+
+            if (++branchIndex >= branches.length)
+                break;
+        }
+    }
+
+    return counters;
+}
+
+function _functionsToFunctionCounters(script, functions) {
+    let functionCounters = {};
+
+    functions.forEach(function(func) {
+        let [name, line, args] = func.key.split(':');
+
+        if (functionCounters[name] === undefined) {
+            functionCounters[name] = {};
+        }
+
+        if (functionCounters[name][line] === undefined) {
+            functionCounters[name][line] = {};
+        }
+
+        if (functionCounters[name][line][args] === undefined) {
+            functionCounters[name][line][args] = { hitCount: 0 };
+        } else {
+            log(script + ':' + line + ' Function identified as ' +
+                func.key + ' already seen in this file. Function coverage ' +
+                'will be incomplete.');
+        }
+    });
+
+    return functionCounters;
+}
+
+function _populateKnownFunctions(functions, nLines) {
+    let knownFunctions = new Array(nLines + 1);
+
+    functions.forEach(function(func) {
+        knownFunctions[func.line] = true;
+    });
+
+    return knownFunctions;
+}
+
+function _identifyFunctionCounterInLinePartForDescription(linePart,
+                                                          nArgs) {
+    /* There is only one potential option for this line. We might have been
+     * called with the wrong number of arguments, but it doesn't matter. */
+    if (Object.getOwnPropertyNames(linePart).length === 1)
+        return linePart[Object.getOwnPropertyNames(linePart)[0]];
+
+    /* Have to disambiguate using nArgs and we have an exact match. */
+    if (linePart[nArgs] !== undefined)
+        return linePart[nArgs];
+
+    /* There are multiple options on this line. Pick the one where
+     * we satisfy the number of arguments exactly, or failing that,
+     * go through each and pick the closest. */
+    let allNArgsOptions = Object.keys(linePart).map(function(key) {
+        return parseInt(key);
+    });
+
+    let closest = allNArgsOptions.reduce(function(prev, current, index, array) {
+        let nArgsOption = array[index];
+        if (Math.abs(nArgsOption - nArgs) < Math.abs(current - nArgs)) {
+            return nArgsOption;
+        }
+
+        return current;
+    });
+
+    return linePart[String(closest)];
+}
+
+function _identifyFunctionCounterForDescription(functionCounters,
+                                                name,
+                                                line,
+                                                nArgs) {
+    let candidateCounter = functionCounters[name];
+
+    if (candidateCounter === undefined)
+        return null;
+
+    if (Object.getOwnPropertyNames(candidateCounter).length === 1) {
+        let linePart = candidateCounter[Object.getOwnPropertyNames(candidateCounter)[0]];
+        return _identifyFunctionCounterInLinePartForDescription(linePart, nArgs);
+    }
+
+    let linePart = functionCounters[name][line];
+
+    if (linePart === undefined) {
+        return null;
+    }
+
+    return _identifyFunctionCounterInLinePartForDescription(linePart, nArgs);
+}
+
+/**
+ * _incrementFunctionCounters
+ *
+ * functionCounters: An object which is a key-value pair with the following schema:
+ * {
+ *      "key" : { line, hitCount }
+ * }
+ * linesWithKnownFunctions: An array of either "true" or undefined, with true set to
+ * each element corresponding to a line that we know has a function on it.
+ * name: The name of the function or "(anonymous)" if it has no name
+ * line: The line at which execution first started on this function.
+ * nArgs: The number of arguments this function has.
+ */
+function _incrementFunctionCounters(functionCounters,
+                                    linesWithKnownFunctions,
+                                    name,
+                                    line,
+                                    nArgs) {
+    let functionCountersForKey = _identifyFunctionCounterForDescription(functionCounters,
+                                                                        name,
+                                                                        line,
+                                                                        nArgs);
+
+    /* Its possible that the JS Engine might enter a funciton
+     * at an executable line which is a little bit past the
+     * actual definition. Roll backwards until we reach the
+     * last known function definition line which we kept
+     * track of earlier to see if we can find this function first */
+    if (functionCountersForKey === null) {
+        do {
+            --line;
+            functionCountersForKey = _identifyFunctionCounterForDescription(functionCounters,
+                                                                            name,
+                                                                            line,
+                                                                            nArgs);
+        } while (linesWithKnownFunctions[line] !== true && line > 0);
+    }
+
+    if (functionCountersForKey !== null) {
+        functionCountersForKey.hitCount++;
+    } else {
+        let functionKey = [name, line, nArgs].join(':');
+        throw new Error("expected Reflect to find function " + functionKey);
+    }
+}
+
+/**
+ * _incrementExpressionCounters
+ *
+ * expressonCounters: An array of either a hit count for a found
+ * executable line or undefined for a known non-executable line.
+ * line: an executed line
+ */
+function _incrementExpressionCounters(expressionCounters,
+                                      script,
+                                      offsetLine) {
+    let expressionCountersLen = expressionCounters.length;
+
+    if (offsetLine >= expressionCountersLen)
+        throw new Error("Executed line " + offsetLine + " which was past the highest-found line " + expressionCountersLen);
+
+    /* If this happens it is not a huge problem - though it does
+     * mean that the reflection machinery is not doing its job, so we should
+     * print a debug message about it in case someone is interested.
+     *
+     * The reason why we don't have a proper log is because it
+     * is difficult to determine what the SpiderMonkey program counter
+     * will actually pass over, especially function declarations for some
+     * reason:
+     *
+     *     function f(a,b) {
+     *         a = 1;
+     *     }
+     *
+     * In some cases, the declaration itself will be executed
+     * but in other cases it won't be. Reflect.parse tells us that
+     * the only two expressions on that line are a FunctionDeclaration
+     * and BlockStatement, neither of which would ordinarily be
+     * executed */
+    if (expressionCounters[offsetLine] === undefined) {
+        log(script + ':' + offsetLine + ' Executed line previously marked ' +
+            'non-executable by Reflect');
+        expressionCounters[offsetLine] = 0;
+    }
+
+    expressionCounters[offsetLine]++;
+}
+
+function _BranchTracker(branchCounters) {
+    this._branchCounters = branchCounters;
+    this._activeBranch = undefined;
+
+    this.incrementBranchCounters = function(offsetLine) {
+        /* Set branch exits or find a new active branch */
+        let activeBranch = this._activeBranch;
+        if (activeBranch !== undefined) {
+            activeBranch.exits.forEach(function(exit) {
+                if (exit.line === offsetLine) {
+                    exit.hitCount++;
+                }
+            });
+
+            /* Only set the active branch to undefined once we're
+             * completely outside of it, since we might be in a case statement where
+             * we need to check every possible option before jumping to an
+             * exit */
+            if (offsetLine >= activeBranch.lastExit)
+                this._activeBranch = undefined;
+        }
+
+        let nextActiveBranch = branchCounters[offsetLine];
+        if (nextActiveBranch !== undefined) {
+            this._activeBranch = nextActiveBranch;
+            this._activeBranch.hit = true;
+        }
+    };
+}
+
+function _convertFunctionCountersToArray(functionCounters) {
+    let arrayReturn = [];
+    /* functionCounters is an object so explore it to create a
+     * set of function keys and then convert it to
+     * an array-of-object using the key as a property
+     * of that object */
+    for (let name of Object.getOwnPropertyNames(functionCounters)) {
+        let namePart = functionCounters[name];
+
+        for (let line of Object.getOwnPropertyNames(namePart)) {
+            let linePart = functionCounters[name][line];
+
+            for (let nArgs of Object.getOwnPropertyNames(linePart)) {
+                let functionKey = [name, line, nArgs].join(':');
+                arrayReturn.push({ name: functionKey,
+                                   line: Number(line),
+                                   nArgs: nArgs,
+                                   hitCount: linePart[nArgs].hitCount });
+            }
+        }
+    }
+
+    arrayReturn.sort(function(left, right) {
+        if (left.name < right.name)
+            return -1;
+        else if (left.name > right.name)
+            return 1;
+        else
+            return 0;
+    });
+    return arrayReturn;
+}
+
+/* Looks up filename in cache and fetches statistics
+ * directly from the cache */
+function _fetchCountersFromCache(filename, cache, nLines) {
+    if (!cache)
+        return null;
+
+    if (Object.keys(cache).indexOf(filename) !== -1) {
+        let cache_for_file = cache[filename];
+
+        if (cache_for_file.mtime) {
+             let mtime = getFileModificationTime(filename);
+             if (mtime[0] != cache[filename].mtime[0] ||
+                 mtime[1] != cache[filename].mtime[1])
+                 return null;
+        } else {
+            let checksum = getFileChecksum(filename);
+            if (checksum != cache[filename].checksum)
+                return null;
+        }
+
+        let functions = cache_for_file.functions;
+
+        return {
+            expressionCounters: _expressionLinesToCounters(cache_for_file.lines, nLines),
+            branchCounters: _branchesToBranchCounters(cache_for_file.branches, nLines),
+            functionCounters: _functionsToFunctionCounters(filename, functions),
+            linesWithKnownFunctions: _populateKnownFunctions(functions, nLines),
+            nLines: nLines
+        };
+    }
+
+    return null;
+}
+
+function _fetchCountersFromReflection(filename, contents, nLines) {
+    let reflection = Reflect.parse(contents);
+    let functions = functionsForAST(reflection);
+
+    return {
+        expressionCounters: _expressionLinesToCounters(expressionLinesForAST(reflection), nLines),
+        branchCounters: _branchesToBranchCounters(branchesForAST(reflection), nLines),
+        functionCounters: _functionsToFunctionCounters(filename, functions),
+        linesWithKnownFunctions: _populateKnownFunctions(functions, nLines),
+        nLines: nLines
+    };
+}
+
+function CoverageStatisticsContainer(prefixes, cache) {
+    /* Copy the files array, so that it can be re-used in the tests */
+    let cachedASTs = cache !== undefined ? JSON.parse(cache) : null;
+    let coveredFiles = {};
+    let cacheMisses = 0;
+
+    function wantsStatisticsFor(filename) {
+        return prefixes.some(function(prefix) {
+            return filename.startsWith(prefix);
+        });
+    }
+
+    function createStatisticsFor(filename) {
+        let contents = getFileContents(filename);
+        let nLines = _getNumberOfLinesForScript(contents);
+
+        let counters = _fetchCountersFromCache(filename, cachedASTs, nLines);
+        if (counters === null) {
+            cacheMisses++;
+            counters = _fetchCountersFromReflection(filename, contents, nLines);
+        }
+
+        if (counters === null)
+            throw new Error('Failed to parse and reflect file ' + filename);
+
+        /* Set contents here as we don't pass it to _fetchCountersFromCache. */
+        counters.contents = contents;
+
+        return counters;
+    }
+
+    function ensureStatisticsFor(filename) {
+        let wantStatistics = wantsStatisticsFor(filename);
+        let haveStatistics = !!coveredFiles[filename];
+
+        if (wantStatistics && !haveStatistics)
+            coveredFiles[filename] = createStatisticsFor(filename);
+        return coveredFiles[filename];
+    }
+
+    this.stringify = function() {
+        let cache_data = {};
+        Object.keys(coveredFiles).forEach(function(filename) {
+            let statisticsForFilename = coveredFiles[filename];
+            let mtime = getFileModificationTime(filename);
+            let cacheDataForFilename = {
+                mtime: mtime,
+                checksum: mtime === null ? getFileChecksum(filename) : null,
+                lines: [],
+                branches: [],
+                functions: _convertFunctionCountersToArray(statisticsForFilename.functionCounters).map(function(func) {
+                    return {
+                        key: func.name,
+                        line: func.line
+                    };
+                })
+            };
+
+            /* We're using a index based loop here since we need access to the
+             * index, since it actually represents the current line number
+             * on the file (see _expressionLinesToCounters). */
+            for (let line_index = 0;
+                 line_index < statisticsForFilename.expressionCounters.length;
+                 ++line_index) {
+                 if (statisticsForFilename.expressionCounters[line_index] !== undefined)
+                     cacheDataForFilename.lines.push(line_index);
+
+                 if (statisticsForFilename.branchCounters[line_index] !== undefined) {
+                     let branchCounters = statisticsForFilename.branchCounters[line_index];
+                     cacheDataForFilename.branches.push({
+                         point: statisticsForFilename.branchCounters[line_index].point,
+                         exits: statisticsForFilename.branchCounters[line_index].exits.map(function(exit) {
+                             return exit.line;
+                         })
+                     });
+                 }
+            }
+            cache_data[filename] = cacheDataForFilename;
+        });
+        return JSON.stringify(cache_data);
+    };
+
+    this.getCoveredFiles = function() {
+        return Object.keys(coveredFiles);
+    };
+
+    this.fetchStatistics = function(filename) {
+        return ensureStatisticsFor(filename);
+    };
+
+    this.staleCache = function() {
+        return cacheMisses > 0;
+    };
+
+    this.deleteStatistics = function(filename) {
+        coveredFiles[filename] = undefined;
+    };
+}
+
+/**
+ * Main class tying together the Debugger object and CoverageStatisticsContainer.
+ *
+ * It isn't poissible to unit test this class because it depends on running
+ * Debugger which in turn depends on objects injected in from another compartment */
+function CoverageStatistics(prefixes, cache) {
+    this.container = new CoverageStatisticsContainer(prefixes, cache);
+    let fetchStatistics = this.container.fetchStatistics.bind(this.container);
+    let deleteStatistics = this.container.deleteStatistics.bind(this.container);
+
+    /* 'debuggee' comes from the invocation from
+     * a separate compartment inside of coverage.cpp */
+    this.dbg = new Debugger(debuggee);
+
+    this.getCoveredFiles = function() {
+        return this.container.getCoveredFiles();
+    };
+
+    this.getNumberOfLinesFor = function(filename) {
+        return fetchStatistics(filename).nLines;
+    };
+
+    this.getExecutedLinesFor = function(filename) {
+        return fetchStatistics(filename).expressionCounters;
+    };
+
+    this.getBranchesFor = function(filename) {
+        return fetchStatistics(filename).branchCounters;
+    };
+
+    this.getFunctionsFor = function(filename) {
+        let functionCounters = fetchStatistics(filename).functionCounters;
+        return _convertFunctionCountersToArray(functionCounters);
+    };
+
+    this.dbg.onEnterFrame = function(frame) {
+        let statistics;
+
+        try {
+            statistics = fetchStatistics(frame.script.url);
+            if (!statistics) {
+                return undefined;
+            }
+        } catch (e) {
+            /* We don't care about this frame, return */
+            log(e.message + " " + e.stack);
+            return undefined;
+        }
+
+        function _logExceptionAndReset(exception, callee, line) {
+            log(exception.fileName + ":" + exception.lineNumber +
+                " (processing " + frame.script.url + ":" + callee + ":" +
+                line + ") - " + exception.message);
+            log("Will not log statistics for this file");
+            frame.onStep = undefined;
+            frame._branchTracker = undefined;
+            deleteStatistics(frame.script.url);
+        }
+
+        /* Log function calls */
+        if (frame.callee !== null && frame.callee.callable) {
+            let name = frame.callee.name ? frame.callee.name : "(anonymous)";
+            let line = frame.script.getOffsetLine(frame.offset);
+            let nArgs = frame.callee.parameterNames.length;
+
+            try {
+                _incrementFunctionCounters(statistics.functionCounters,
+                                           statistics.linesWithKnownFunctions,
+                                           name,
+                                           line,
+                                           nArgs);
+            } catch (e) {
+                /* Something bad happened. Log the exception and delete
+                 * statistics for this file */
+                _logExceptionAndReset(e, name, line);
+                return undefined;
+            }
+        }
+
+        /* Upon entering the frame, the active branch is always inactive */
+        frame._branchTracker = new _BranchTracker(statistics.branchCounters);
+
+        /* Set single-step hook */
+        frame.onStep = function() {
+            /* Line counts */
+            let offset = this.offset;
+            let offsetLine = this.script.getOffsetLine(offset);
+
+            try {
+                _incrementExpressionCounters(statistics.expressionCounters,
+                                             frame.script.url,
+                                             offsetLine);
+                this._branchTracker.incrementBranchCounters(offsetLine);
+            } catch (e) {
+                /* Something bad happened. Log the exception and delete
+                 * statistics for this file */
+                _logExceptionAndReset(e, frame.callee, offsetLine);
+            }
+        };
+
+        return undefined;
+    };
+
+    this.deactivate = function() {
+        /* This property is designed to be a one-stop-shop to
+         * disable the debugger for this debugee, without having
+         * to traverse all its scripts or frames */
+        this.dbg.enabled = false;
+    };
+
+    this.staleCache = this.container.staleCache.bind(this.container);
+    this.stringify = this.container.stringify.bind(this.container);
+}
diff --git a/modules/gjs/format.js b/modules/gjs/format.js
new file mode 100644
index 0000000..430b5d7
--- /dev/null
+++ b/modules/gjs/format.js
@@ -0,0 +1,86 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const GjsPrivate = imports.gi.GjsPrivate;
+
+function vprintf(str, args) {
+    let i = 0;
+    let usePos = false;
+    return str.replace(/%(?:([1-9][0-9]*)\$)?(I+)?([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, posGroup, flagsGroup, widthGroup, precisionGroup, genericGroup) {
+        if (precisionGroup != '' && genericGroup != 'f')
+            throw new Error("Precision can only be specified for 'f'");
+
+        let hasAlternativeIntFlag = (flagsGroup.indexOf('I') != -1);
+        if (hasAlternativeIntFlag && genericGroup != 'd')
+            throw new Error("Alternative output digits can only be specfied for 'd'");
+
+        let pos = parseInt(posGroup, 10) || 0;
+        if (usePos == false && i == 0)
+            usePos = pos > 0;
+        if (usePos && pos == 0 || !usePos && pos > 0)
+            throw new Error("Numbered and unnumbered conversion specifications cannot be mixed");
+
+        let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
+        let width = parseInt(widthGroup, 10) || 0;
+
+        function fillWidth(s, c, w) {
+            let fill = '';
+            for (let i = 0; i < w; i++)
+                fill += c;
+            return fill.substr(s.length) + s;
+        }
+
+        function getArg() {
+            return usePos ? args[pos - 1] : args[i++];
+        }
+
+        let s = '';
+        switch (genericGroup) {
+        case '%':
+            return '%';
+            break;
+        case 's':
+            s = String(getArg());
+            break;
+        case 'd':
+            let intV = parseInt(getArg());
+            if (hasAlternativeIntFlag)
+                s = GjsPrivate.format_int_alternative_output(intV);
+            else
+                s = intV.toString();
+            break;
+        case 'x':
+            s = parseInt(getArg()).toString(16);
+            break;
+        case 'f':
+            if (precisionGroup == '')
+                s = parseFloat(getArg()).toString();
+            else
+                s = parseFloat(getArg()).toFixed(parseInt(precisionGroup));
+            break;
+        default:
+            throw new Error('Unsupported conversion character %' + genericGroup);
+        }
+        return fillWidth(s, fillChar, width);
+    });
+}
+
+function printf() {
+    let args = Array.prototype.slice.call(arguments);
+    let fmt = args.shift();
+    print(vprintf(fmt, args));
+}
+
+/*
+ * This function is intended to extend the String object and provide
+ * an String.format API for string formatting.
+ * It has to be set up using String.prototype.format = Format.format;
+ * Usage:
+ * "somestring %s %d".format('hello', 5);
+ * It supports %s, %d, %x and %f, for %f it also support precisions like
+ * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
+ * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
+ * with '0', the formatted string will be padded with spaces.
+ */
+function format() {
+    return vprintf(this, arguments);
+}
diff --git a/modules/gjs/gettext.js b/modules/gjs/gettext.js
new file mode 100644
index 0000000..67c4504
--- /dev/null
+++ b/modules/gjs/gettext.js
@@ -0,0 +1,99 @@
+// Copyright 2009 Red Hat, Inc.
+//
+// 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.
+
+/**
+ * This module provides a convenience layer for the "gettext" family of functions,
+ * relying on GLib for the actual implementation.
+ *
+ * Usage:
+ *
+ * const Gettext = imports.gettext;
+ *
+ * Gettext.textdomain("myapp");
+ * Gettext.bindtextdomain("myapp", "/usr/share/locale");
+ *
+ * let translated = Gettext.gettext("Hello world!");
+ */
+
+const GLib = imports.gi.GLib;
+const GjsPrivate = imports.gi.GjsPrivate;
+
+const LocaleCategory = GjsPrivate.LocaleCategory;
+
+function setlocale(category, locale) {
+    return GjsPrivate.setlocale(category, locale);
+}
+
+function textdomain(domain) {
+    return GjsPrivate.textdomain(domain);
+}
+function bindtextdomain(domain, location) {
+    return GjsPrivate.bindtextdomain(domain, location);
+}
+
+function gettext(msgid) {
+    return GLib.dgettext(null, msgid);
+}
+function dgettext(domain, msgid) {
+    return GLib.dgettext(domain, msgid);
+}
+function dcgettext(domain, msgid, category) {
+    return GLib.dcgettext(domain, msgid, category);
+}
+
+function ngettext(msgid1, msgid2, n) {
+    return GLib.dngettext(null, msgid1, msgid2, n);
+}
+function dngettext(domain, msgid1, msgid2, n) {
+    return GLib.dngettext(domain, msgid1, msgid2, n);
+}
+// FIXME: missing dcngettext ?
+
+function pgettext(context, msgid) {
+    return GLib.dpgettext2(null, context, msgid);
+}
+function dpgettext(domain, context, msgid) {
+    return GLib.dpgettext2(domain, context, msgid);
+}
+
+/**
+ * Create an object with bindings for gettext, ngettext,
+ * and pgettext bound to a particular translation domain.
+ *
+ * @param domainName Translation domain string
+ * @returns: an object with gettext bindings
+ * @type: function
+ */
+var domain = function(domainName) {
+    return {
+        gettext: function(msgid) {
+            return GLib.dgettext(domainName, msgid);
+        },
+
+        ngettext: function(msgid1, msgid2, n) {
+            return GLib.dngettext(domainName, msgid1, msgid2, n);
+        },
+
+        pgettext: function(context, msgid) {
+            return GLib.dpgettext2(domainName, context, msgid);
+        }
+    };
+};
+
diff --git a/modules/gjs/jsUnit.js b/modules/gjs/jsUnit.js
new file mode 100644
index 0000000..93f5eef
--- /dev/null
+++ b/modules/gjs/jsUnit.js
@@ -0,0 +1,473 @@
+/* @author Edward Hieatt, edward@jsunit.net */
+
+/*
+ - JsUnit
+ - Copyright (C) 2001-4 Edward Hieatt, edward@jsunit.net
+ - Copyright (C) 2008 litl, LLC
+ -
+ - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ -
+ - The contents of this file are subject to the Mozilla Public License Version
+ - 1.1 (the "License"); you may not use this file except in compliance with
+ - the License. You may obtain a copy of the License at
+ - http://www.mozilla.org/MPL/
+ -
+ - Software distributed under the License is distributed on an "AS IS" basis,
+ - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ - for the specific language governing rights and limitations under the
+ - License.
+ -
+ - The Original Code is Edward Hieatt code.
+ -
+ - The Initial Developer of the Original Code is
+ - Edward Hieatt, edward@jsunit.net.
+ - Portions created by the Initial Developer are Copyright (C) 2003
+ - the Initial Developer. All Rights Reserved.
+ -
+ - Author Edward Hieatt, edward@jsunit.net
+ -
+ - Alternatively, the contents of this file may be used under the terms of
+ - either the GNU General Public License Version 2 or later (the "GPL"), or
+ - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ - in which case the provisions of the GPL or the LGPL are applicable instead
+ - of those above. If you wish to allow use of your version of this file only
+ - under the terms of either the GPL or the LGPL, and not to allow others to
+ - use your version of this file under the terms of the MPL, indicate your
+ - decision by deleting the provisions above and replace them with the notice
+ - and other provisions required by the LGPL or the GPL. If you do not delete
+ - the provisions above, a recipient may use your version of this file under
+ - the terms of any one of the MPL, the GPL or the LGPL.
+*/
+
+var JSUNIT_UNDEFINED_VALUE;
+var JSUNIT_VERSION="2.1";
+var isTestPageLoaded = false;
+
+// GJS: introduce implicit variable to avoid exceptions
+var top = null;
+
+//hack for NS62 bug
+function jsUnitFixTop() {
+  var tempTop = top;
+  if (!tempTop) {
+    tempTop = window;
+    while (tempTop.parent) {
+      tempTop = tempTop.parent;
+      if (tempTop.top && tempTop.top.jsUnitTestSuite) {
+        tempTop = tempTop.top;
+        break;
+      }
+    }
+  }
+  top = tempTop;
+}
+
+jsUnitFixTop();
+
+function _displayStringForValue(aVar) {
+  if (aVar === null)
+    return 'null';
+
+  if (aVar === top.JSUNIT_UNDEFINED_VALUE)
+    return 'undefined';
+
+  return aVar;
+}
+
+function fail(failureMessage) {
+    throw new JsUnitException(null, failureMessage);
+}
+
+function error(errorMessage) {
+    throw new Error(errorMessage);
+}
+
+function argumentsIncludeComments(expectedNumberOfNonCommentArgs, args) {
+  return args.length == expectedNumberOfNonCommentArgs + 1;
+}
+
+function commentArg(expectedNumberOfNonCommentArgs, args) {
+  if (argumentsIncludeComments(expectedNumberOfNonCommentArgs, args))
+    return args[0];
+
+  return null;
+}
+
+function nonCommentArg(desiredNonCommentArgIndex, expectedNumberOfNonCommentArgs, args) {
+  return argumentsIncludeComments(expectedNumberOfNonCommentArgs, args) ?
+    args[desiredNonCommentArgIndex] :
+    args[desiredNonCommentArgIndex - 1];
+}
+
+function _validateArguments(expectedNumberOfNonCommentArgs, args) {
+  if (!( args.length == expectedNumberOfNonCommentArgs ||
+        (args.length == expectedNumberOfNonCommentArgs + 1 && typeof(args[0]) == 'string') ))
+    error('Incorrect arguments passed to assert function');
+}
+
+function _assert(comment, booleanValue, failureMessage) {
+  if (!booleanValue)
+    throw new JsUnitException(comment, failureMessage);
+}
+
+function assert() {
+  _validateArguments(1, arguments);
+  var booleanValue=nonCommentArg(1, 1, arguments);
+
+  if (typeof(booleanValue) != 'boolean')
+    error('Bad argument to assert(boolean)');
+
+  _assert(commentArg(1, arguments), booleanValue === true, 'Call to assert(boolean) with false');
+}
+
+function assertTrue() {
+  _validateArguments(1, arguments);
+  var booleanValue=nonCommentArg(1, 1, arguments);
+
+  if (typeof(booleanValue) != 'boolean')
+    error('Bad argument to assertTrue(boolean)');
+
+  _assert(commentArg(1, arguments), booleanValue === true, 'Call to assertTrue(boolean) with false');
+}
+
+function assertFalse() {
+  _validateArguments(1, arguments);
+  var booleanValue=nonCommentArg(1, 1, arguments);
+
+  if (typeof(booleanValue) != 'boolean')
+    error('Bad argument to assertFalse(boolean)');
+
+  _assert(commentArg(1, arguments), booleanValue === false, 'Call to assertFalse(boolean) with true');
+}
+
+function assertEquals() {
+  _validateArguments(2, arguments);
+  var var1=nonCommentArg(1, 2, arguments);
+  var var2=nonCommentArg(2, 2, arguments);
+  _assert(commentArg(2, arguments), var1 === var2, 'Expected ' + var1 + ' (' + typeof(var1) + ') but was ' + _displayStringForValue(var2) + ' (' + typeof(var2) + ')');
+}
+
+function assertNotEquals() {
+  _validateArguments(2, arguments);
+  var var1=nonCommentArg(1, 2, arguments);
+  var var2=nonCommentArg(2, 2, arguments);
+  _assert(commentArg(2, arguments), var1 !== var2, 'Expected not to be ' + _displayStringForValue(var2));
+}
+
+function assertNull() {
+  _validateArguments(1, arguments);
+  var aVar=nonCommentArg(1, 1, arguments);
+  _assert(commentArg(1, arguments), aVar === null, 'Expected null but was ' + _displayStringForValue(aVar));
+}
+
+function assertNotNull() {
+  _validateArguments(1, arguments);
+  var aVar=nonCommentArg(1, 1, arguments);
+  _assert(commentArg(1, arguments), aVar !== null, 'Expected not to be null');
+}
+
+function assertUndefined() {
+  _validateArguments(1, arguments);
+  var aVar=nonCommentArg(1, 1, arguments);
+  _assert(commentArg(1, arguments), aVar === top.JSUNIT_UNDEFINED_VALUE, 'Expected undefined but was ' + _displayStringForValue(aVar));
+}
+
+function assertNotUndefined() {
+  _validateArguments(1, arguments);
+  var aVar=nonCommentArg(1, 1, arguments);
+  _assert(commentArg(1, arguments), aVar !== top.JSUNIT_UNDEFINED_VALUE, 'Expected not to be undefined');
+}
+
+function assertNaN() {
+  _validateArguments(1, arguments);
+  var aVar=nonCommentArg(1, 1, arguments);
+  _assert(commentArg(1, arguments), isNaN(aVar), 'Expected NaN');
+}
+
+function assertNotNaN() {
+  _validateArguments(1, arguments);
+  var aVar=nonCommentArg(1, 1, arguments);
+  _assert(commentArg(1, arguments), !isNaN(aVar), 'Expected not NaN');
+}
+
+// GJS: assertRaises(function)
+function assertRaises() {
+    _validateArguments(1, arguments);
+    var fun=nonCommentArg(1, 1, arguments);
+    var exception;
+
+    if (typeof(fun) != 'function')
+        error("Bad argument to assertRaises(function)");
+
+    var retval;
+    try {
+        retval = fun();
+    } catch (e) {
+        exception = e;
+    }
+
+    _assert(commentArg(1, arguments), exception !== top.JSUNIT_UNDEFINED_VALUE, "Call to assertRaises(function) did not raise an exception. Return value was " + _displayStringForValue(retval) + ' (' + typeof(retval) + ')');
+}
+
+function isLoaded() {
+  return isTestPageLoaded;
+}
+
+function setUp() {
+}
+
+function tearDown() {
+}
+
+function getFunctionName(aFunction) {
+  var name = aFunction.toString().match(/function (\w*)/)[1];
+
+  if ((name == null) || (name.length == 0))
+    name = 'anonymous';
+
+  return name;
+}
+
+function parseErrorStack(excp)
+{
+  var stack = [];
+  var name;
+
+  if (!excp || !excp.stack)
+  {
+    return stack;
+  }
+
+  var stacklist = excp.stack.split('\n');
+
+  for (var i = 0; i < stacklist.length - 1; i++)
+  {
+    var framedata = stacklist[i];
+
+    name = framedata.match(/^(\w*)/)[1];
+    if (!name) {
+      name = 'anonymous';
+    }
+
+    var line = framedata.match(/(:\d+)$/)[1];
+    if (line) {
+        name += line;
+    }
+
+    stack[stack.length] = name;
+  }
+  // remove top level anonymous functions to match IE
+
+  while (stack.length && stack[stack.length - 1] == 'anonymous')
+  {
+    stack.length = stack.length - 1;
+  }
+  return stack;
+}
+
+function JsUnitException(comment, message) {
+  this.isJsUnitException = true;
+  this.comment           = comment;
+  this.message           = message;
+  this.stack             = (new Error()).stack;
+}
+
+JsUnitException.prototype = Object.create(Error.prototype, {});
+
+function warn() {
+  if (top.tracer != null)
+    top.tracer.warn(arguments[0], arguments[1]);
+}
+
+function inform() {
+  if (top.tracer != null)
+    top.tracer.inform(arguments[0], arguments[1]);
+}
+
+function info() {
+  inform(arguments[0], arguments[1]);
+}
+
+function debug() {
+  if (top.tracer != null)
+    top.tracer.debug(arguments[0], arguments[1]);
+}
+
+function setjsUnitTracer(ajsUnitTracer) {
+  top.tracer=ajsUnitTracer;
+}
+
+function trim(str) {
+  if (str == null)
+    return null;
+
+  var startingIndex = 0;
+  var endingIndex   = str.length-1;
+
+  while (str.substring(startingIndex, startingIndex+1) == ' ')
+    startingIndex++;
+
+  while (str.substring(endingIndex, endingIndex+1) == ' ')
+    endingIndex--;
+
+  if (endingIndex < startingIndex)
+    return '';
+
+  return str.substring(startingIndex, endingIndex+1);
+}
+
+function isBlank(str) {
+  return trim(str) == '';
+}
+
+// the functions push(anArray, anObject) and pop(anArray)
+// exist because the JavaScript Array.push(anObject) and Array.pop()
+// functions are not available in IE 5.0
+
+function push(anArray, anObject) {
+  anArray[anArray.length]=anObject;
+}
+function pop(anArray) {
+  if (anArray.length>=1) {
+    delete anArray[anArray.length - 1];
+    anArray.length--;
+  }
+}
+
+// safe, strict access to jsUnitParmHash
+function jsUnitGetParm(name)
+{
+  if (typeof(top.jsUnitParmHash[name]) != 'undefined')
+  {
+    return top.jsUnitParmHash[name];
+  }
+  return null;
+}
+
+if (top && typeof(top.xbDEBUG) != 'undefined' && top.xbDEBUG.on && top.testManager)
+{
+  top.xbDebugTraceObject('top.testManager.containerTestFrame', 'JSUnitException');
+  // asserts
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', '_displayStringForValue');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'error');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'argumentsIncludeComments');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'commentArg');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'nonCommentArg');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', '_validateArguments');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', '_assert');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assert');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertTrue');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertEquals');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotEquals');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNull');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotNull');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertUndefined');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotUndefined');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNaN');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotNaN');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'isLoaded');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'setUp');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'tearDown');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'getFunctionName');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'warn');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'inform');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'debug');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'setjsUnitTracer');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'trim');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'isBlank');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'newOnLoadEvent');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'push');
+  top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'pop');
+}
+
+function newOnLoadEvent() {
+  isTestPageLoaded = true;
+}
+
+function jsUnitSetOnLoad(windowRef, onloadHandler)
+{
+  var isKonqueror = navigator.userAgent.indexOf('Konqueror/') != -1 ||
+                    navigator.userAgent.indexOf('Safari/')    != -1;
+
+  if (typeof(windowRef.attachEvent) != 'undefined') {
+    // Internet Explorer, Opera
+    windowRef.attachEvent("onload", onloadHandler);
+  } else if (typeof(windowRef.addEventListener) != 'undefined' && !isKonqueror){
+    // Mozilla, Konqueror
+    // exclude Konqueror due to load issues
+    windowRef.addEventListener("load", onloadHandler, false);
+  } else if (typeof(windowRef.document.addEventListener) != 'undefined' && !isKonqueror) {
+    // DOM 2 Events
+    // exclude Mozilla, Konqueror due to load issues
+    windowRef.document.addEventListener("load", onloadHandler, false);
+  } else if (typeof(windowRef.onload) != 'undefined' && windowRef.onload) {
+    windowRef.jsunit_original_onload = windowRef.onload;
+    windowRef.onload = function() { windowRef.jsunit_original_onload(); onloadHandler(); };
+  } else {
+    // browsers that do not support windowRef.attachEvent or
+    // windowRef.addEventListener will override a page's own onload event
+    windowRef.onload=onloadHandler;
+  }
+}
+
+// GJS: comment out as isLoaded() isn't terribly useful for us
+//jsUnitSetOnLoad(window, newOnLoadEvent);
+
+// GJS: entry point to run all functions named as test*, surrounded by
+// calls to setUp() and tearDown()
+function gjstestRun(window_, setUp, tearDown) {
+  var propName;
+  var rv = 0;
+  var failures = [];
+  if (!window_) window_ = window;
+  if (!setUp) setUp = window_.setUp;
+  if (!tearDown) tearDown = window_.tearDown;
+
+  for (propName in window_) {
+    if (!propName.match(/^test\w+/))
+      continue;
+
+    var testFunction = window_[propName];
+    if (typeof(testFunction) != 'function')
+      continue;
+
+    log("running test " + propName);
+
+    setUp();
+    try {
+      testFunction();
+    } catch (e) {
+      var result = null;
+      if (typeof(e.isJsUnitException) != 'undefined' && e.isJsUnitException) {
+        result = '';
+        if (e.comment != null)
+          result += ('"' + e.comment + '"\n');
+
+        result += e.message;
+
+        if (e.stack)
+          result += '\n\nStack trace follows:\n' + e.stack;
+
+        // assertion failure, kind of expected so just log it and flag the
+        // whole test as failed
+        log(result);
+        rv = 1;
+        failures.push(propName);
+      }
+      else {
+        // unexpected error, let the shell handle it
+        throw e;
+      }
+    }
+    tearDown();
+  }
+
+  if (failures.length > 0) {
+    log(failures.length + " tests failed in this file");
+    log("Failures were: " + failures.join(", "));
+  }
+
+  // if gjstestRun() is the last call in a file, this becomes the
+  // exit code of the test program, so 0 = success, 1 = failed
+  return rv;
+}
diff --git a/modules/gjs/lang.js b/modules/gjs/lang.js
new file mode 100644
index 0000000..1852dbe
--- /dev/null
+++ b/modules/gjs/lang.js
@@ -0,0 +1,488 @@
+/* -*- mode: js; indent-tabs-mode: nil; -*- */
+// Copyright (c) 2008  litl, LLC
+//
+// 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.
+
+// Utilities that are "meta-language" things like manipulating object props
+
+const Gi = imports._gi;
+
+function countProperties(obj) {
+    let count = 0;
+    for (let property in obj) {
+        count += 1;
+    }
+    return count;
+}
+
+function getPropertyDescriptor(obj, property) {
+    if (obj.hasOwnProperty(property))
+        return Object.getOwnPropertyDescriptor(obj, property);
+    return getPropertyDescriptor(Object.getPrototypeOf(obj), property);
+}
+
+function _copyProperty(source, dest, property) {
+    let descriptor = getPropertyDescriptor(source, property);
+    Object.defineProperty(dest, property, descriptor);
+}
+
+function copyProperties(source, dest) {
+    for (let property in source) {
+        _copyProperty(source, dest, property);
+    }
+}
+
+function copyPublicProperties(source, dest) {
+    for (let property in source) {
+        if (typeof(property) == 'string' &&
+            property.substring(0, 1) == '_') {
+            continue;
+        } else {
+            _copyProperty(source, dest, property);
+        }
+    }
+}
+
+/**
+ * Binds obj to callback. Makes it possible to refer to "obj"
+ * using this within the callback.
+ * @param {object} obj the object to bind
+ * @param {function} callback callback to bind obj in
+ * @param arguments additional arguments to the callback
+ * @returns: a new callback
+ * @type: function
+ */
+function bind(obj, callback) {
+    if (typeof(obj) != 'object') {
+        throw new Error(
+            "first argument to Lang.bind() must be an object, not " +
+                typeof(obj));
+    }
+
+    if (typeof(callback) != 'function') {
+        throw new Error(
+            "second argument to Lang.bind() must be a function, not " +
+                typeof(callback));
+    }
+
+    // Use ES5 Function.prototype.bind, but only if not passing any bindArguments,
+    // because ES5 has them at the beginning, not at the end
+    if (arguments.length == 2)
+	return callback.bind(obj);
+
+    let me = obj;
+    let bindArguments = Array.prototype.slice.call(arguments, 2);
+
+    return function() {
+        let args = Array.prototype.slice.call(arguments);
+        args = args.concat(bindArguments);
+        return callback.apply(me, args);
+    };
+}
+
+// Class magic
+// Adapted from MooTools, MIT license
+// https://github.com/mootools/mootools-core
+
+function _Base() {
+    throw new TypeError('Cannot instantiate abstract class _Base');
+}
+
+_Base.__super__ = null;
+_Base.prototype._init = function() { };
+_Base.prototype._construct = function() {
+    this._init.apply(this, arguments);
+    return this;
+};
+_Base.prototype.__name__ = '_Base';
+_Base.prototype.toString = function() {
+    return '[object ' + this.__name__ + ']';
+};
+
+function _parent() {
+    if (!this.__caller__)
+        throw new TypeError("The method 'parent' cannot be called");
+
+    let caller = this.__caller__;
+    let name = caller._name;
+    let parent = caller._owner.__super__;
+
+    let previous = parent ? parent.prototype[name] : undefined;
+
+    if (!previous)
+        throw new TypeError("The method '" + name + "' is not on the superclass");
+
+    return previous.apply(this, arguments);
+}
+
+function _interfacePresent(required, proto) {
+    if (!proto.__interfaces__)
+        return false;
+    if (proto.__interfaces__.indexOf(required) !== -1)
+        return true;  // implemented here
+    // Might be implemented on a parent class
+    return _interfacePresent(required, proto.constructor.__super__.prototype);
+}
+
+function getMetaClass(params) {
+    if (params.MetaClass)
+        return params.MetaClass;
+
+    if (params.Extends && params.Extends.prototype.__metaclass__)
+        return params.Extends.prototype.__metaclass__;
+
+    return null;
+}
+
+function Class(params) {
+    let metaClass = getMetaClass(params);
+
+    if (metaClass && metaClass != this.constructor) {
+        // Trick to apply variadic arguments to constructors --
+        // bind the arguments into the constructor function.
+        let args = Array.prototype.slice.call(arguments);
+        let curried = Function.prototype.bind.apply(metaClass, [,].concat(args));
+        return new curried();
+    } else {
+        return this._construct.apply(this, arguments);
+    }
+}
+
+Class.__super__ = _Base;
+Class.prototype = Object.create(_Base.prototype);
+Class.prototype.constructor = Class;
+Class.prototype.__name__ = 'Class';
+
+Class.prototype.wrapFunction = function(name, meth) {
+    if (meth._origin) meth = meth._origin;
+
+    function wrapper() {
+        let prevCaller = this.__caller__;
+        this.__caller__ = wrapper;
+        let result = meth.apply(this, arguments);
+        this.__caller__ = prevCaller;
+        return result;
+    }
+
+    wrapper._origin = meth;
+    wrapper._name = name;
+    wrapper._owner = this;
+
+    return wrapper;
+}
+
+Class.prototype.toString = function() {
+    return '[object ' + this.__name__ + ' for ' + this.prototype.__name__ + ']';
+};
+
+Class.prototype._construct = function(params) {
+    if (!params.Name) {
+        throw new TypeError("Classes require an explicit 'Name' parameter.");
+    }
+    let name = params.Name;
+
+    let parent = params.Extends;
+    if (!parent)
+        parent = _Base;
+
+    let newClass;
+    if (params.Abstract) {
+        newClass = function() {
+            throw new TypeError('Cannot instantiate abstract class ' + name);
+        };
+    } else {
+        newClass = function() {
+            this.__caller__ = null;
+
+            return this._construct.apply(this, arguments);
+        };
+    }
+
+    // Since it's not possible to create a constructor with
+    // a custom [[Prototype]], we have to do this to make
+    // "newClass instanceof Class" work, and so we can inherit
+    // methods/properties of Class.prototype, like wrapFunction.
+    newClass.__proto__ = this.constructor.prototype;
+
+    newClass.__super__ = parent;
+    newClass.prototype = Object.create(parent.prototype);
+    newClass.prototype.constructor = newClass;
+
+    newClass._init.apply(newClass, arguments);
+
+    let interfaces = params.Implements || [];
+    // If the parent already implements an interface, then we do too
+    if (parent instanceof Class)
+        interfaces = interfaces.filter((iface) => !parent.implements(iface));
+
+    Object.defineProperties(newClass.prototype, {
+        '__metaclass__': { writable: false,
+                           configurable: false,
+                           enumerable: false,
+                           value: this.constructor },
+        '__interfaces__': { writable: false,
+                            configurable: false,
+                            enumerable: false,
+                            value: interfaces }
+    });
+
+    interfaces.forEach((iface) => {
+        iface._check(newClass.prototype);
+    });
+
+    return newClass;
+};
+
+/**
+ * Check whether this class conforms to the interface "iface".
+ * @param {object} iface a Lang.Interface
+ * @returns: whether this class implements iface
+ * @type: boolean
+ */
+Class.prototype.implements = function (iface) {
+    if (_interfacePresent(iface, this.prototype))
+        return true;
+    if (this.__super__ instanceof Class)
+        return this.__super__.implements(iface);
+    return false;
+};
+
+Class.prototype._init = function(params) {
+    let name = params.Name;
+
+    let propertyObj = { };
+
+    let interfaces = params.Implements || [];
+    interfaces.forEach((iface) => {
+        Object.getOwnPropertyNames(iface.prototype)
+        .filter((name) => !name.startsWith('__') && name !== 'constructor')
+        .forEach((name) => {
+            let descriptor = Object.getOwnPropertyDescriptor(iface.prototype,
+                name);
+            // writable and enumerable are inherited, see note below
+            descriptor.configurable = false;
+            propertyObj[name] = descriptor;
+        });
+    });
+
+    Object.getOwnPropertyNames(params).forEach(function(name) {
+        if (['Name', 'Extends', 'Abstract', 'Implements'].indexOf(name) !== -1)
+            return;
+
+        let descriptor = Object.getOwnPropertyDescriptor(params, name);
+
+        if (typeof descriptor.value === 'function')
+            descriptor.value = this.wrapFunction(name, descriptor.value);
+
+        // we inherit writable and enumerable from the property
+        // descriptor of params (they're both true if created from an
+        // object literal)
+        descriptor.configurable = false;
+
+        propertyObj[name] = descriptor;
+    }.bind(this));
+
+    Object.defineProperties(this.prototype, propertyObj);
+    Object.defineProperties(this.prototype, {
+        '__name__': { writable: false,
+                      configurable: false,
+                      enumerable: false,
+                      value: name },
+        'parent': { writable: false,
+                    configurable: false,
+                    enumerable: false,
+                    value: _parent }});
+};
+
+// This introduces the concept of a "meta-interface" which is given by the
+// MetaInterface property on an object's metaclass. For objects whose metaclass
+// is Lang.Class, the meta-interface is Lang.Interface. Subclasses of Lang.Class
+// such as GObject.Class supply their own meta-interface.
+// This is in order to enable creating GObject interfaces with Lang.Interface,
+// much as you can create GObject classes with Lang.Class.
+function _getMetaInterface(params) {
+    if (!params.Requires || params.Requires.length === 0)
+        return null;
+
+    let metaInterface = params.Requires.map((req) => {
+        if (req instanceof Interface)
+            return req.__super__;
+        for (let metaclass = req.prototype.__metaclass__; metaclass;
+            metaclass = metaclass.__super__) {
+            if (metaclass.hasOwnProperty('MetaInterface'))
+                return metaclass.MetaInterface;
+        }
+        return null;
+    })
+    .reduce((best, candidate) => {
+        // This function reduces to the "most derived" meta interface in the list.
+        if (best === null)
+            return candidate;
+        if (candidate === null)
+            return best;
+        for (let sup = candidate; sup; sup = sup.__super__) {
+            if (sup === best)
+                return candidate;
+        }
+        return best;
+    }, null);
+
+    // If we reach this point and we don't know the meta-interface, then it's
+    // most likely because there were only pure-C interfaces listed in Requires
+    // (and those don't have our magic properties.) However, all pure-C
+    // interfaces should require GObject.Object anyway.
+    if (metaInterface === null)
+        throw new Error('Did you forget to include GObject.Object in Requires?');
+
+    return metaInterface;
+}
+
+function Interface(params) {
+    let metaInterface = _getMetaInterface(params);
+    if (metaInterface && metaInterface !== this.constructor) {
+        // Trick to apply variadic arguments to constructors --
+        // bind the arguments into the constructor function.
+        let args = Array.prototype.slice.call(arguments);
+        let curried = Function.prototype.bind.apply(metaInterface, [,].concat(args));
+        return new curried();
+    }
+    return this._construct.apply(this, arguments);
+}
+
+Class.MetaInterface = Interface;
+
+/**
+ * Use this to signify a function that must be overridden in an implementation
+ * of the interface. Creating a class that doesn't override the function will
+ * throw an error.
+ */
+Interface.UNIMPLEMENTED = function () {
+    throw new Error('Not implemented');
+};
+
+Interface.__super__ = _Base;
+Interface.prototype = Object.create(_Base.prototype);
+Interface.prototype.constructor = Interface;
+Interface.prototype.__name__ = 'Interface';
+
+Interface.prototype._construct = function (params) {
+    if (!params.Name)
+        throw new TypeError("Interfaces require an explicit 'Name' parameter.");
+    let name = params.Name;
+
+    let newInterface = function () {
+        throw new TypeError('Cannot instantiate interface ' + name);
+    };
+
+    // See note in Class._construct(); this makes "newInterface instanceof
+    // Interface" work, and allows inheritance.
+    newInterface.__proto__ = this.constructor.prototype;
+
+    newInterface.__super__ = Interface;
+    newInterface.prototype = Object.create(Interface.prototype);
+    newInterface.prototype.constructor = newInterface;
+
+    newInterface._init.apply(newInterface, arguments);
+
+    Object.defineProperty(newInterface.prototype, '__metaclass__',
+                          { writable: false,
+                            configurable: false,
+                            enumerable: false,
+                            value: this.constructor });
+
+    return newInterface;
+};
+
+Interface.prototype._check = function (proto) {
+    // Check that proto implements all of this interface's required interfaces.
+    // "proto" refers to the object's prototype (which implements the interface)
+    // whereas "this.prototype" is the interface's prototype (which may still
+    // contain unimplemented methods.)
+
+    let unfulfilledReqs = this.prototype.__requires__.filter((required) => {
+        // Either the interface is not present or it is not listed before the
+        // interface that requires it or the class does not inherit it. This is
+        // so that required interfaces don't copy over properties from other
+        // interfaces that require them.
+        let interfaces = proto.__interfaces__;
+        return ((!_interfacePresent(required, proto) ||
+            interfaces.indexOf(required) > interfaces.indexOf(this)) &&
+            !(proto instanceof required));
+    }).map((required) =>
+        // __name__ is only present on GJS-created classes and will be the most
+        // accurate name. required.name will be present on introspected GObjects
+        // but is not preferred because it will be the C name. The last option
+        // is just so that we print something if there is garbage in Requires.
+        required.prototype.__name__ || required.name || required);
+    if (unfulfilledReqs.length > 0) {
+        throw new Error('The following interfaces must be implemented before ' +
+            this.prototype.__name__ + ': ' + unfulfilledReqs.join(', '));
+    }
+
+    // Check that this interface's required methods are implemented
+    let unimplementedFns = Object.getOwnPropertyNames(this.prototype)
+    .filter((p) => this.prototype[p] === Interface.UNIMPLEMENTED)
+    .filter((p) => !(p in proto) || proto[p] === Interface.UNIMPLEMENTED);
+    if (unimplementedFns.length > 0)
+        throw new Error('The following members of ' + this.prototype.__name__ +
+            ' are not implemented yet: ' + unimplementedFns.join(', '));
+};
+
+Interface.prototype.toString = function () {
+    return '[interface ' + this.__name__ + ' for ' + this.prototype.__name__ + ']';
+};
+
+Interface.prototype._init = function (params) {
+    let name = params.Name;
+
+    let propertyObj = {};
+    Object.getOwnPropertyNames(params)
+    .filter((name) => ['Name', 'Requires'].indexOf(name) === -1)
+    .forEach((name) => {
+        let descriptor = Object.getOwnPropertyDescriptor(params, name);
+
+        // Create wrappers on the interface object so that generics work (e.g.
+        // SomeInterface.some_function(this, blah) instead of
+        // SomeInterface.prototype.some_function.call(this, blah)
+        if (typeof descriptor.value === 'function') {
+            let interfaceProto = this.prototype;  // capture in closure
+            this[name] = function () {
+                return interfaceProto[name].call.apply(interfaceProto[name],
+                    arguments);
+            };
+        }
+
+        // writable and enumerable are inherited, see note in Class._init()
+        descriptor.configurable = false;
+
+        propertyObj[name] = descriptor;
+    });
+
+    Object.defineProperties(this.prototype, propertyObj);
+    Object.defineProperties(this.prototype, {
+        '__name__': { writable: false,
+                      configurable: false,
+                      enumerable: false,
+                      value: name },
+        '__requires__': { writable: false,
+                          configurable: false,
+                          enumerable: false,
+                          value: params.Requires || [] }
+    });
+};
diff --git a/modules/gjs/mainloop.js b/modules/gjs/mainloop.js
new file mode 100644
index 0000000..89c37fe
--- /dev/null
+++ b/modules/gjs/mainloop.js
@@ -0,0 +1,87 @@
+/* -*- mode: js; indent-tabs-mode: nil; -*- */
+// Copyright (c) 2012 Giovanni Campagna <scampa.giovanni@gmail.com>
+//
+// 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.
+
+// A layer of convenience and backwards-compatibility over GLib MainLoop facilities
+
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+
+var _mainLoops = {};
+
+function run(name) {
+    if (!_mainLoops[name])
+        _mainLoops[name] = GLib.MainLoop.new(null, false);
+
+    _mainLoops[name].run();
+}
+
+function quit(name) {
+    if (!_mainLoops[name])
+	throw new Error("No main loop with this id");
+
+    let loop = _mainLoops[name];
+    delete _mainLoops[name];
+
+    if (!loop.is_running())
+	throw new Error("Main loop was stopped already");
+
+    loop.quit();
+}
+
+function idle_source(handler, priority) {
+    let s = GLib.idle_source_new();
+    GObject.source_set_closure(s, handler);
+    if (priority !== undefined)
+        s.set_priority(priority);
+    return s;
+}
+
+function idle_add(handler, priority) {
+    return idle_source(handler, priority).attach(null);
+}
+
+function timeout_source(timeout, handler, priority) {
+    let s = GLib.timeout_source_new(timeout);
+    GObject.source_set_closure(s, handler);
+    if (priority !== undefined)
+        s.set_priority(priority);
+    return s;
+}
+
+function timeout_seconds_source(timeout, handler, priority) {
+    let s = GLib.timeout_source_new_seconds(timeout);
+    GObject.source_set_closure(s, handler);
+    if (priority !== undefined)
+        s.set_priority(priority);
+    return s;
+}
+
+function timeout_add(timeout, handler, priority) {
+    return timeout_source(timeout, handler, priority).attach(null);
+}
+
+function timeout_add_seconds(timeout, handler, priority) {
+    return timeout_seconds_source(timeout, handler, priority).attach(null);
+}
+
+function source_remove(id) {
+    return GLib.source_remove(id);
+}
diff --git a/modules/gjs/package.js b/modules/gjs/package.js
new file mode 100644
index 0000000..fa1d5a8
--- /dev/null
+++ b/modules/gjs/package.js
@@ -0,0 +1,247 @@
+// Copyright 2012 Giovanni Campagna
+//
+// 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.
+
+/**
+ * This module provides a set of convenience APIs for building packaged
+ * applications.
+ */
+
+const GLib = imports.gi.GLib;
+const GIRepository = imports.gi.GIRepository;
+const Gio = imports.gi.Gio;
+const System = imports.system;
+
+const Gettext = imports.gettext;
+
+/*< public >*/
+var name;
+var version;
+var prefix;
+var datadir;
+var libdir;
+var pkgdatadir;
+var pkglibdir;
+var moduledir;
+var localedir;
+
+/*< private >*/
+let _pkgname;
+let _base;
+
+function _findEffectiveEntryPointName() {
+    let entryPoint = System.programInvocationName;
+    while (GLib.file_test(entryPoint, GLib.FileTest.IS_SYMLINK))
+        entryPoint = GLib.file_read_link(entryPoint);
+
+    return GLib.path_get_basename(entryPoint);
+}
+
+function _runningFromSource() {
+    let binary = Gio.File.new_for_path(System.programInvocationName);
+    let sourceBinary = Gio.File.new_for_path('./src/' + name);
+    return binary.equal(sourceBinary);
+}
+
+function _makeNamePath(name) {
+    return '/' + name.replace('.', '/', 'g');
+}
+
+/**
+ * init:
+ * @params: package parameters
+ *
+ * Initialize directories and global variables. Must be called
+ * before any of other API in Package is used.
+ * @params must be an object with at least the following keys:
+ *  - name: the package name ($(PACKAGE_NAME) in autotools,
+ *          eg. org.foo.Bar)
+ *  - version: the package version
+ *  - prefix: the installation prefix
+ *
+ * init() will take care to check if the program is running from
+ * the source directory or not, by looking for a 'src' directory.
+ *
+ * At the end, the global variable 'pkg' will contain the
+ * Package module (imports.package). Additionally, the following
+ * module variables will be available:
+ *  - name: the base name of the entry point (eg. org.foo.Bar.App)
+ *  - version: same as in @params
+ *  - prefix: the installation prefix (as passed in @params)
+ *  - datadir, libdir: the final datadir and libdir when installed;
+ *                     usually, these would be prefix + '/share' and
+ *                     and prefix + '/lib' (or '/lib64')
+ *  - pkgdatadir: the directory to look for private data files, such as
+ *                images, stylesheets and UI definitions;
+ *                this will be datadir + name when installed and
+ *                './data' when running from the source tree
+ *  - pkglibdir: the directory to look for private typelibs and C
+ *               libraries;
+ *               this will be libdir + name when installed and
+ *               './lib' when running from the source tree
+ *  - moduledir: the directory to look for JS modules;
+ *               this will be pkglibdir when installed and
+ *               './src' when running from the source tree
+ *  - localedir: the directory containing gettext translation files;
+ *               this will be datadir + '/locale' when installed
+ *               and './po' in the source tree
+ *
+ * All paths are absolute and will not end with '/'.
+ *
+ * As a side effect, init() calls GLib.set_prgname().
+ */
+function init(params) {
+    window.pkg = imports.package;
+    _pkgname = params.name;
+    name = _findEffectiveEntryPointName();
+    version = params.version;
+
+    // Must call it first, because it can only be called
+    // once, and other library calls might have it as a
+    // side effect
+    GLib.set_prgname(name);
+
+    prefix = params.prefix;
+    libdir = params.libdir;
+    datadir = GLib.build_filenamev([prefix, 'share']);
+    let libpath, girpath;
+
+    if (_runningFromSource()) {
+        log('Running from source tree, using local files');
+        // Running from source directory
+        _base = GLib.get_current_dir();
+        pkglibdir = GLib.build_filenamev([_base, 'lib']);
+        libpath = GLib.build_filenamev([pkglibdir, '.libs']);
+        girpath = pkglibdir;
+        pkgdatadir = GLib.build_filenamev([_base, 'data']);
+        localedir = GLib.build_filenamev([_base, 'po']);
+        moduledir = GLib.build_filenamev([_base, 'src']);
+    } else {
+        _base = prefix;
+        pkglibdir = GLib.build_filenamev([libdir, _pkgname]);
+        libpath = pkglibdir;
+        girpath = GLib.build_filenamev([pkglibdir, 'girepository-1.0']);
+        pkgdatadir = GLib.build_filenamev([datadir, _pkgname]);
+        localedir = GLib.build_filenamev([datadir, 'locale']);
+
+        try {
+            let resource = Gio.Resource.load(GLib.build_filenamev([pkgdatadir,
+                                                                   name + '.src.gresource']));
+            resource._register();
+
+            moduledir = 'resource://' + _makeNamePath(name) + '/js';
+        } catch(e) {
+            moduledir = pkgdatadir;
+        }
+    }
+
+    imports.searchPath.unshift(moduledir);
+    GIRepository.Repository.prepend_search_path(girpath);
+    GIRepository.Repository.prepend_library_path(libpath);
+
+    try {
+        let resource = Gio.Resource.load(GLib.build_filenamev([pkgdatadir,
+                                                               name + '.data.gresource']));
+        resource._register();
+    } catch(e) { }
+}
+
+/**
+ * start:
+ * @params: see init()
+ *
+ * This is a convenience function if your package has a
+ * single entry point.
+ * You must define a main(ARGV) function inside a main.js
+ * module in moduledir.
+ */
+function start(params) {
+    init(params);
+    run(imports.main);
+}
+
+/**
+ * run:
+ * @module: the module to run
+ *
+ * This is the function to use if you want to have multiple
+ * entry points in one package.
+ * You must define a main(ARGV) function inside the passed
+ * in module, and then the launcher would be
+ *
+ * imports.package.init(...);
+ * imports.package.run(imports.entrypoint);
+ */
+function run(module) {
+    return module.main([System.programInvocationName].concat(ARGV));
+}
+
+/**
+ * require:
+ * @libs: the external dependencies to import
+ *
+ * Mark a dependency on a specific version of one or more
+ * external GI typelibs.
+ * @libs must be an object whose keys are a typelib name,
+ * and values are the respective version. The empty string
+ * indicates any version.
+ */
+function require(libs) {
+    for (let l in libs) {
+        let version = libs[l];
+
+        if (version != '')
+            imports.gi.versions[l] = version;
+
+        try {
+            imports.gi[l];
+        } catch(e) {
+            printerr('Unsatisfied dependency: ' + e.message);
+            System.exit(1);
+        }
+    }
+}
+
+function initGettext() {
+    Gettext.bindtextdomain(_pkgname, localedir);
+    Gettext.textdomain(_pkgname);
+
+    let gettext = imports.gettext;
+    window._ = gettext.gettext;
+    window.C_ = gettext.pgettext;
+    window.N_ = function(x) { return x; }
+}
+
+function initFormat() {
+    let format = imports.format;
+    String.prototype.format = format.format;
+}
+
+function initSubmodule(name) {
+    if (moduledir != pkgdatadir) {
+        // Running from source tree, add './name' to search paths
+
+        let submoduledir = GLib.build_filenamev([_base, name]);
+        let libpath = GLib.build_filenamev([submoduledir, '.libs']);
+        GIRepository.Repository.prepend_search_path(submoduledir);
+        GIRepository.Repository.prepend_library_path(libpath);
+    } else {
+        // Running installed, submodule is in $(pkglibdir), nothing to do
+    }
+}
diff --git a/modules/gjs/signals.js b/modules/gjs/signals.js
new file mode 100644
index 0000000..0905e53
--- /dev/null
+++ b/modules/gjs/signals.js
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2008  litl, LLC
+ *
+ * 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.
+ */
+
+// A couple principals of this simple signal system:
+// 1) should look just like our GObject signal binding
+// 2) memory and safety matter more than speed of connect/disconnect/emit
+// 3) the expectation is that a given object will have a very small number of
+//    connections, but they may be to different signal names
+
+function _connect(name, callback) {
+    // be paranoid about callback arg since we'd start to throw from emit()
+    // if it was messed up
+    if (typeof(callback) != 'function')
+        throw new Error("When connecting signal must give a callback that is a function");
+
+    // we instantiate the "signal machinery" only on-demand if anything
+    // gets connected.
+    if (!('_signalConnections' in this)) {
+        this._signalConnections = [];
+        this._nextConnectionId = 1;
+    }
+
+    let id = this._nextConnectionId;
+    this._nextConnectionId += 1;
+
+    // this makes it O(n) in total connections to emit, but I think
+    // it's right to optimize for low memory and reentrancy-safety
+    // rather than speed
+    this._signalConnections.push({ 'id' : id,
+                                   'name' : name,
+                                   'callback' : callback,
+                                   'disconnected' : false
+                                 });
+    return id;
+}
+
+function _disconnect(id) {
+    if ('_signalConnections' in this) {
+        let i;
+        let length = this._signalConnections.length;
+        for (i = 0; i < length; ++i) {
+            let connection = this._signalConnections[i];
+            if (connection.id == id) {
+                if (connection.disconnected)
+                    throw new Error("Signal handler id " + id + " already disconnected");
+
+                // set a flag to deal with removal during emission
+                connection.disconnected = true;
+                this._signalConnections.splice(i, 1);
+
+                return;
+            }
+        }
+    }
+    throw new Error("No signal connection " + id + " found");
+}
+
+function _disconnectAll() {
+    if ('_signalConnections' in this) {
+        while (this._signalConnections.length > 0) {
+            _disconnect.call(this, this._signalConnections[0].id);
+        }
+    }
+}
+
+function _emit(name /* , arg1, arg2 */) {
+    // may not be any signal handlers at all, if not then return
+    if (!('_signalConnections' in this))
+        return;
+
+    // To deal with re-entrancy (removal/addition while
+    // emitting), we copy out a list of what was connected
+    // at emission start; and just before invoking each
+    // handler we check its disconnected flag.
+    let handlers = [];
+    let i;
+    let length = this._signalConnections.length;
+    for (i = 0; i < length; ++i) {
+        let connection = this._signalConnections[i];
+        if (connection.name == name) {
+            handlers.push(connection);
+        }
+    }
+
+    // create arg array which is emitter + everything passed in except
+    // signal name. Would be more convenient not to pass emitter to
+    // the callback, but trying to be 100% consistent with GObject
+    // which does pass it in. Also if we pass in the emitter here,
+    // people don't create closures with the emitter in them,
+    // which would be a cycle.
+
+    let arg_array = [ this ];
+    // arguments[0] should be signal name so skip it
+    length = arguments.length;
+    for (i = 1; i < length; ++i) {
+        arg_array.push(arguments[i]);
+    }
+
+    length = handlers.length;
+    for (i = 0; i < length; ++i) {
+        let connection = handlers[i];
+        if (!connection.disconnected) {
+            try {
+                // since we pass "null" for this, the global object will be used.
+                let ret = connection.callback.apply(null, arg_array);
+
+                // if the callback returns true, we don't call the next
+                // signal handlers
+                if (ret === true) {
+                    break;
+                }
+            } catch(e) {
+                // just log any exceptions so that callbacks can't disrupt
+                // signal emission
+                logError(e, "Exception in callback for signal: "+name);
+            }
+        }
+    }
+}
+
+function addSignalMethods(proto) {
+    proto.connect = _connect;
+    proto.disconnect = _disconnect;
+    proto.emit = _emit;
+    // this one is not in GObject, but useful
+    proto.disconnectAll = _disconnectAll;
+}
diff --git a/modules/gjs/system/Makefile.am b/modules/gjs/system/Makefile.am
new file mode 100644
index 0000000..20167d7
--- /dev/null
+++ b/modules/gjs/system/Makefile.am
@@ -0,0 +1,22 @@
+seedlibdir = ${libdir}/seed@SEED_GTK_VERSION@/gjs
+
+seedlib_LTLIBRARIES = \
+	libseed_system.la
+
+libseed_system_la_SOURCES = \
+	seed-system.c
+
+AM_CPPFLAGS = \
+	-I@top_srcdir@/libseed/ \
+	$(GOBJECT_INTROSPECTION_CFLAGS) \
+	$(SEED_DEBUG_CFLAGS) \
+	$(SEED_PROFILE_CFLAGS)
+
+libseed_system_la_LDFLAGS = \
+	-module -avoid-version \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_system_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(SEED_PROFILE_LIBS)
+
diff --git a/modules/gjs/system/Makefile.in b/modules/gjs/system/Makefile.in
new file mode 100644
index 0000000..db2e7dd
--- /dev/null
+++ b/modules/gjs/system/Makefile.in
@@ -0,0 +1,777 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = modules/gjs/system
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+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__installdirs = "$(DESTDIR)$(seedlibdir)"
+LTLIBRARIES = $(seedlib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libseed_system_la_DEPENDENCIES =  \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(am__DEPENDENCIES_1)
+am_libseed_system_la_OBJECTS = seed-system.lo
+libseed_system_la_OBJECTS = $(am_libseed_system_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libseed_system_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libseed_system_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libseed_system_la_SOURCES)
+DIST_SOURCES = $(libseed_system_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CAIRO_MODULE = @BUILD_CAIRO_MODULE@
+BUILD_CANVAS_MODULE = @BUILD_CANVAS_MODULE@
+BUILD_DBUS_MODULE = @BUILD_DBUS_MODULE@
+BUILD_DYNAMICOBJECT_MODULE = @BUILD_DYNAMICOBJECT_MODULE@
+BUILD_EXAMPLE_MODULE = @BUILD_EXAMPLE_MODULE@
+BUILD_FFI_MODULE = @BUILD_FFI_MODULE@
+BUILD_GETTEXT_MODULE = @BUILD_GETTEXT_MODULE@
+BUILD_GTKBUILDER_MODULE = @BUILD_GTKBUILDER_MODULE@
+BUILD_LIBXML_MODULE = @BUILD_LIBXML_MODULE@
+BUILD_MPFR_MODULE = @BUILD_MPFR_MODULE@
+BUILD_MULTIPROCESSING_MODULE = @BUILD_MULTIPROCESSING_MODULE@
+BUILD_OS_MODULE = @BUILD_OS_MODULE@
+BUILD_READLINE_MODULE = @BUILD_READLINE_MODULE@
+BUILD_SQLITE_MODULE = @BUILD_SQLITE_MODULE@
+BUILD_XORG_MODULE = @BUILD_XORG_MODULE@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
+CAIRO_LIBS = @CAIRO_LIBS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
+DBUSGLIB_LDFLAGS = @DBUSGLIB_LDFLAGS@
+DBUSGLIB_LIBS = @DBUSGLIB_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LDFLAGS = @DBUS_LDFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+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_LDFLAGS = @FFI_LDFLAGS@
+FFI_LIBS = @FFI_LIBS@
+FGREP = @FGREP@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LDFLAGS = @GDK_LDFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
+GNOME_JS_DIR = @GNOME_JS_DIR@
+GNOME_JS_LIBS = @GNOME_JS_LIBS@
+GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
+GOBJECT_INTROSPECTION_LDFLAGS = @GOBJECT_INTROSPECTION_LDFLAGS@
+GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
+GOBJECT_INTROSPECTION_VERSION = @GOBJECT_INTROSPECTION_VERSION@
+GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LDFLAGS = @GTK_LDFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LDFLAGS = @LIBXML_LDFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXSS_CFLAGS = @LIBXSS_CFLAGS@
+LIBXSS_LIBS = @LIBXSS_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SEED_DEBUG_CFLAGS = @SEED_DEBUG_CFLAGS@
+SEED_GTK_VERSION = @SEED_GTK_VERSION@
+SEED_PROFILE_CFLAGS = @SEED_PROFILE_CFLAGS@
+SEED_PROFILE_LIBS = @SEED_PROFILE_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
+WEBKIT_LDFLAGS = @WEBKIT_LDFLAGS@
+WEBKIT_LIBS = @WEBKIT_LIBS@
+WEBKIT_PC = @WEBKIT_PC@
+XGETTEXT = @XGETTEXT@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+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@
+seedlibdir = ${libdir}/seed@SEED_GTK_VERSION@/gjs
+seedlib_LTLIBRARIES = \
+	libseed_system.la
+
+libseed_system_la_SOURCES = \
+	seed-system.c
+
+AM_CPPFLAGS = \
+	-I@top_srcdir@/libseed/ \
+	$(GOBJECT_INTROSPECTION_CFLAGS) \
+	$(SEED_DEBUG_CFLAGS) \
+	$(SEED_PROFILE_CFLAGS)
+
+libseed_system_la_LDFLAGS = \
+	-module -avoid-version \
+	$(GOBJECT_INTROSPECTION_LDFLAGS)
+
+libseed_system_la_LIBADD = \
+	$(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
+	$(SEED_PROFILE_LIBS)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/gjs/system/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu modules/gjs/system/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(seedlibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(seedlibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(seedlibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(seedlibdir)"; \
+	}
+
+uninstall-seedlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(seedlibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(seedlibdir)/$$f"; \
+	done
+
+clean-seedlibLTLIBRARIES:
+	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libseed_system.la: $(libseed_system_la_OBJECTS) $(libseed_system_la_DEPENDENCIES) $(EXTRA_libseed_system_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libseed_system_la_LINK) -rpath $(seedlibdir) $(libseed_system_la_OBJECTS) $(libseed_system_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seed-system.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  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 $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(seedlibdir)"; 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 clean-seedlibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-seedlibLTLIBRARIES
+
+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 -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-seedlibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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/modules/gjs/system/seed-system.c b/modules/gjs/system/seed-system.c
new file mode 100644
index 0000000..eefc1e6
--- /dev/null
+++ b/modules/gjs/system/seed-system.c
@@ -0,0 +1,225 @@
+/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (c) 2008  litl, LLC
+ * Copyright (c) 2012  Red Hat, Inc.
+ *
+ * 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 <config.h>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include <glib.h>
+#include <seed-module.h>
+#include <config.h>
+
+#define GJS_COMPAT_VERSION (1 * 100 + 40) * 100 + 0
+
+#define NUMARG_EXPECTED_EXCEPTION(name, argc)                                  \
+    seed_make_exception(ctx, exception, "ArgumentError",                       \
+                        name " expected " argc " but got %zd", argumentCount); \
+    return seed_make_undefined(ctx);
+
+static SeedValue
+gjs_address_of(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argumentCount,
+               const SeedValue arguments[],
+               SeedException* exception)
+{
+    if (argumentCount != 1) {
+        NUMARG_EXPECTED_EXCEPTION("addressOf", "1 argument")
+    }
+
+    SeedValue targetValue = arguments[0];
+    if (!seed_value_is_object(ctx, targetValue)) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "addressOf expects an object");
+        return seed_make_undefined(ctx);
+    }
+
+    char* pointer_string = g_strdup_printf("%p", targetValue);
+    SeedValue ret = seed_value_from_string(ctx, pointer_string, exception);
+    g_free(pointer_string);
+
+    return ret;
+}
+
+static SeedValue
+gjs_refcount(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             size_t argumentCount,
+             const SeedValue arguments[],
+             SeedException* exception)
+{
+    if (argumentCount != 1) {
+        NUMARG_EXPECTED_EXCEPTION("refcount", "1 argument");
+    }
+
+    SeedValue targetValue = arguments[0];
+    GObject* object = seed_value_to_object(ctx, targetValue, exception);
+    if (!object)
+        return seed_make_undefined(ctx);
+
+    SeedValue ret = seed_value_from_uint64(ctx, object->ref_count, exception);
+    return ret;
+}
+
+static SeedValue
+gjs_breakpoint(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argumentCount,
+               const SeedValue arguments[],
+               SeedException* exception)
+{
+    if (argumentCount != 0) {
+        NUMARG_EXPECTED_EXCEPTION("breakpoint", "0 arguments");
+    }
+
+    G_BREAKPOINT();
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+gjs_gc(SeedContext ctx,
+       SeedObject function,
+       SeedObject this_object,
+       size_t argumentCount,
+       const SeedValue arguments[],
+       SeedException* exception)
+{
+    if (argumentCount != 0) {
+        NUMARG_EXPECTED_EXCEPTION("gc", "0 arguments");
+    }
+
+    seed_context_collect(ctx);
+    return seed_make_undefined(ctx);
+}
+
+static SeedValue
+gjs_exit(SeedContext ctx,
+         SeedObject function,
+         SeedObject this_object,
+         size_t argumentCount,
+         const SeedValue arguments[],
+         SeedException* exception)
+{
+    gint32 ret = EXIT_SUCCESS;
+    if (argumentCount > 1) {
+        NUMARG_EXPECTED_EXCEPTION("exit", "none or 1 argument");
+    }
+
+    if (argumentCount == 1) {
+        SeedValue target = arguments[0];
+        if (seed_value_is_number(ctx, target)) {
+            ret = seed_value_to_int(ctx, target, exception);
+        } else {
+            seed_make_exception(ctx, exception, "ArgumentError",
+                                "exit expects a number argument");
+            ret = EXIT_FAILURE;
+        }
+    }
+
+    exit(ret);
+}
+
+static SeedValue
+gjs_clear_date_caches(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      size_t argumentCount,
+                      const SeedValue arguments[],
+                      SeedException* exception)
+{
+    // This is provided just for compatibility as javascriptcore doesn't provide
+    // the same
+    // feature.
+    // I'm not even sure that this is needed for webkit.
+    seed_make_exception(ctx, exception, "ImplementationError",
+                        "clearDateCache is not implemented.");
+    return seed_make_undefined(ctx);
+}
+
+static seed_static_function module_funcs[]
+  = { { "addressOf", gjs_address_of, 0 },
+      { "refcount", gjs_refcount, 0 },
+      { "breakpoint", gjs_breakpoint, 0 },
+      { "gc", gjs_gc, 0 },
+      { "exit", gjs_exit, 0 },
+      { "clearDateCaches", gjs_clear_date_caches, 0 },
+      { 0, 0, 0 } };
+
+static seed_class_definition system_def = {
+    0,                                        /* Version, always 0 */
+    SEED_CLASS_ATTRIBUTE_NO_SHARED_PROTOTYPE, /* JSClassAttributes */
+    "System",                                 /* Class Name */
+    NULL,                                     /* Parent Class */
+    NULL,                                     /* Static Values */
+    module_funcs,                             /* Static Functions */
+    NULL,
+    NULL, /* Finalize */
+    NULL, /* Has Property */
+    NULL, /* Get Property */
+    NULL, /* Set Property */
+    NULL, /* Delete Property */
+    NULL, /* Get Property Names */
+    NULL, /* Call As Function */
+    NULL, /* Call As Constructor */
+    NULL, /* Has Instance */
+    NULL  /* Convert To Type */
+};
+
+SeedObject
+gjs_compat_define_system_stuff(SeedEngine* eng)
+{
+    SeedContext context = eng->context;
+    SeedObject module;
+    gboolean ret;
+
+    module = seed_make_object(context, seed_create_class(&system_def), NULL);
+
+    SeedValue seed = seed_object_get_property(context, eng->global, "Seed");
+    SeedValue argv = seed_object_get_property(context, seed, "argv");
+
+    /* The name is modeled after program_invocation_name,
+       part of the glibc */
+    ret = seed_object_set_property(
+      context, module, "programInvocationName",
+      (SeedValue) seed_value_from_string(context, eng->program_name, NULL));
+    g_print("Module: %d\n", ret);
+
+    ret = seed_object_set_property(
+      context, module, "version",
+      (SeedValue) seed_value_from_int(context, GJS_COMPAT_VERSION, NULL));
+
+    return module;
+}
+
+SeedObject
+seed_module_init(SeedEngine* eng)
+{
+    return gjs_compat_define_system_stuff(eng);
+}
diff --git a/modules/gtkbuilder/Makefile.in b/modules/gtkbuilder/Makefile.in
index 9486432..e0c14e4 100644
--- a/modules/gtkbuilder/Makefile.in
+++ b/modules/gtkbuilder/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/gtkbuilder
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -101,12 +142,25 @@ libseed_gtkbuilder_la_OBJECTS = $(am_libseed_gtkbuilder_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_gtkbuilder_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_gtkbuilder_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_GTKBUILDER_MODULE_TRUE@am_libseed_gtkbuilder_la_rpath = -rpath \
 @BUILD_GTKBUILDER_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -119,20 +173,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_gtkbuilder_la_SOURCES)
 DIST_SOURCES = $(am__libseed_gtkbuilder_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -140,8 +190,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -205,6 +273,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -218,6 +288,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -241,8 +312,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -254,6 +334,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -348,6 +429,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -396,7 +478,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/gtkbuilder/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/gtkbuilder/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -414,6 +495,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -440,12 +522,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_gtkbuilder.la: $(libseed_gtkbuilder_la_OBJECTS) $(libseed_gtkbuilder_la_DEPENDENCIES) $(EXTRA_libseed_gtkbuilder_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_gtkbuilder_la_LINK) $(am_libseed_gtkbuilder_la_rpath) $(libseed_gtkbuilder_la_OBJECTS) $(libseed_gtkbuilder_la_LIBADD) $(LIBS)
 
@@ -462,14 +547,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -484,26 +569,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -515,15 +589,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -532,6 +602,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -676,19 +761,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/gtkbuilder/seed-gtkbuilder.c b/modules/gtkbuilder/seed-gtkbuilder.c
index f08270d..960ded3 100644
--- a/modules/gtkbuilder/seed-gtkbuilder.c
+++ b/modules/gtkbuilder/seed-gtkbuilder.c
@@ -21,85 +21,84 @@
 
 #include <gtk/gtk.h>
 
-typedef struct _builder_ud {
-  SeedContext ctx;
-  SeedObject obj;
-  SeedObject user_data;
+typedef struct _builder_ud
+{
+    SeedContext ctx;
+    SeedObject obj;
+    SeedObject user_data;
 } builder_ud;
 
 static void
-seed_builder_connect_func (GtkBuilder *builder,
-			   GObject *object,
-			   const gchar *signal_name,
-			   const gchar *handler_name,
-			   GObject *connect_object,
-			   GConnectFlags flags,
-			   gpointer user_data)
+seed_builder_connect_func(GtkBuilder* builder,
+                          GObject* object,
+                          const gchar* signal_name,
+                          const gchar* handler_name,
+                          GObject* connect_object,
+                          GConnectFlags flags,
+                          gpointer user_data)
 {
-  SeedContext ctx;
-  SeedObject obj, func;
-  builder_ud *priv = (builder_ud *)user_data;
-  GClosure *closure;
+    SeedContext ctx;
+    SeedObject obj, func;
+    builder_ud* priv = (builder_ud*) user_data;
+    GClosure* closure;
 
-  ctx = priv->ctx;
-  obj = priv->obj;
+    ctx = priv->ctx;
+    obj = priv->obj;
 
-  func = seed_object_get_property (ctx, obj, handler_name);
-  if (!seed_value_is_object (ctx, func) || !seed_value_is_function (ctx, func))
-    return;
+    func = seed_object_get_property(ctx, obj, handler_name);
+    if (!seed_value_is_object(ctx, func) || !seed_value_is_function(ctx, func))
+        return;
 
-  closure = seed_closure_new (ctx, func, priv->user_data,
-                              "signal handler (GtkBuilder)");
-  if (connect_object != NULL)
-    g_object_watch_closure (connect_object, closure);
+    closure = seed_closure_new(ctx, func, priv->user_data,
+                               "signal handler (GtkBuilder)");
+    if (connect_object != NULL)
+        g_object_watch_closure(connect_object, closure);
 
-  g_signal_connect_closure (object, signal_name, closure, FALSE);
+    g_signal_connect_closure(object, signal_name, closure, FALSE);
 }
 
 SeedValue
 seed_gtk_builder_connect_signals(SeedContext ctx,
-				 SeedObject function,
-				 SeedObject this_object,
-				 gsize argument_count,
-				 const SeedValue arguments[],
-				 SeedException *exception)
+                                 SeedObject function,
+                                 SeedObject this_object,
+                                 gsize argument_count,
+                                 const SeedValue arguments[],
+                                 SeedException* exception)
 {
-  builder_ud ud;
-  GtkBuilder *b;
-  
-  CHECK_ARG_COUNT("GtkBuilder.connect_signals", 1);
-
-  if (!seed_value_is_object (ctx, arguments[0]))
-    {
-      seed_make_exception (ctx, exception, "TypeError",
-			   "connect_signals expects one object as the first argument");
-      return seed_make_undefined (ctx);
+    builder_ud ud;
+    GtkBuilder* b;
+
+    CHECK_ARG_COUNT("GtkBuilder.connect_signals", 1);
+
+    if (!seed_value_is_object(ctx, arguments[0])) {
+        seed_make_exception(
+          ctx, exception, "TypeError",
+          "connect_signals expects one object as the first argument");
+        return seed_make_undefined(ctx);
     }
 
-  b = GTK_BUILDER (seed_value_to_object (ctx, this_object, exception));
-  ud.ctx = ctx;
-  ud.obj = arguments[0];
-  if (argument_count == 2)
-    ud.user_data = arguments[1];
-  else
-    ud.user_data = NULL;
-  gtk_builder_connect_signals_full(b, seed_builder_connect_func, &ud);
+    b = GTK_BUILDER(seed_value_to_object(ctx, this_object, exception));
+    ud.ctx = ctx;
+    ud.obj = arguments[0];
+    if (argument_count == 2)
+        ud.user_data = arguments[1];
+    else
+        ud.user_data = NULL;
+    gtk_builder_connect_signals_full(b, seed_builder_connect_func, &ud);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 SeedObject
-seed_module_init(SeedEngine *eng)
+seed_module_init(SeedEngine* eng)
 {
-  SeedObject gtkbuilder_proto;
+    SeedObject gtkbuilder_proto;
 
-  gtkbuilder_proto = seed_simple_evaluate (eng->context,
-					   "imports.gi.Gtk.Builder.prototype",
-					   NULL);
-  seed_create_function (eng->context,
-			"connect_signals",
-			seed_gtk_builder_connect_signals,
-			gtkbuilder_proto);
+    gtkbuilder_proto
+      = seed_simple_evaluate(eng->context, "imports.gi.Gtk.Builder.prototype",
+                             NULL);
+    seed_create_function(eng->context, "connect_signals",
+                         seed_gtk_builder_connect_signals, gtkbuilder_proto);
 
-  return seed_make_object (eng->context, NULL, NULL);
+    return seed_make_object(eng->context, NULL, NULL);
 }
diff --git a/modules/libxml/Makefile.in b/modules/libxml/Makefile.in
index e3b7b89..1846bfe 100644
--- a/modules/libxml/Makefile.in
+++ b/modules/libxml/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 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.
@@ -17,23 +16,61 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,12 +90,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/libxml
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -103,12 +144,25 @@ libseed_libxml_la_OBJECTS = $(am_libseed_libxml_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_libxml_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_libxml_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
 @BUILD_LIBXML_MODULE_TRUE@am_libseed_libxml_la_rpath = -rpath \
 @BUILD_LIBXML_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -121,20 +175,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_libxml_la_SOURCES)
 DIST_SOURCES = $(am__libseed_libxml_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -143,8 +193,26 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(extensions_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -208,6 +276,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -221,6 +291,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -244,8 +315,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -257,6 +337,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -351,6 +432,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -402,7 +484,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/libxml/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/libxml/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -420,6 +501,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -446,12 +528,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_libxml.la: $(libseed_libxml_la_OBJECTS) $(libseed_libxml_la_DEPENDENCIES) $(EXTRA_libseed_libxml_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_libxml_la_LINK) $(am_libseed_libxml_la_rpath) $(libseed_libxml_la_OBJECTS) $(libseed_libxml_la_LIBADD) $(LIBS)
 
@@ -468,14 +553,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -511,26 +596,15 @@ uninstall-extensionsDATA:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(extensionsdir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -542,15 +616,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -559,6 +629,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -703,22 +788,24 @@ uninstall-am: uninstall-extensionsDATA uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am \
-	install-extensionsDATA install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-extensionsDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-seedlibLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-extensionsDATA \
+	tags tags-am uninstall uninstall-am uninstall-extensionsDATA \
 	uninstall-seedlibLTLIBRARIES
 
+.PRECIOUS: Makefile
+
 
 # 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/modules/libxml/seed-libxml.c b/modules/libxml/seed-libxml.c
index 845eb21..10d7ac6 100644
--- a/modules/libxml/seed-libxml.c
+++ b/modules/libxml/seed-libxml.c
@@ -27,7 +27,7 @@
 #include <libxml/xpathInternals.h> // for xmlXPathRegisterNs
 
 SeedObject namespace_ref;
-SeedEngine *eng;
+SeedEngine* eng;
 
 SeedClass xml_doc_class;
 SeedClass xml_node_class;
@@ -36,546 +36,522 @@ SeedClass xml_attr_class;
 SeedClass xml_xpath_class;
 SeedClass xml_xpathobj_class;
 
-#define XML_DOC_PRIV(obj) ((xmlDocPtr)seed_object_get_private(obj))
-#define XML_NODE_PRIV(obj) ((xmlNodePtr)seed_object_get_private(obj))
-#define XML_XPATH_PRIV(obj) ((xmlXPathContextPtr)seed_object_get_private (obj))
-#define XML_XPATHOBJ_PRIV(obj) ((xmlXPathObjectPtr)seed_object_get_private (obj))
+#define XML_DOC_PRIV(obj) ((xmlDocPtr) seed_object_get_private(obj))
+#define XML_NODE_PRIV(obj) ((xmlNodePtr) seed_object_get_private(obj))
+#define XML_XPATH_PRIV(obj) ((xmlXPathContextPtr) seed_object_get_private(obj))
+#define XML_XPATHOBJ_PRIV(obj)                                                 \
+    ((xmlXPathObjectPtr) seed_object_get_private(obj))
 
 static SeedObject
-seed_make_xml_doc (SeedContext ctx,
-		    xmlDocPtr doc)
+seed_make_xml_doc(SeedContext ctx, xmlDocPtr doc)
 {
-  SeedObject ret;
-  if (doc->_private)
-    return (SeedObject) doc->_private;
-  ret = seed_make_object (ctx, xml_doc_class, doc);
-  doc->_private = ret;
-  return ret;
+    SeedObject ret;
+    if (doc->_private)
+        return (SeedObject) doc->_private;
+    ret = seed_make_object(ctx, xml_doc_class, doc);
+    doc->_private = ret;
+    return ret;
 }
 
 static SeedObject
-seed_make_xml_node (SeedContext ctx,
-		xmlNodePtr node)
+seed_make_xml_node(SeedContext ctx, xmlNodePtr node)
 {
-  SeedObject ret;
-  if (node == NULL)
-    return seed_make_null (ctx);
-  if (node->_private)
-    return (SeedObject) node->_private;
-  ret = seed_make_object (ctx, xml_node_class, node);
-  node->_private = ret;
-  return ret;
+    SeedObject ret;
+    if (node == NULL)
+        return seed_make_null(ctx);
+    if (node->_private)
+        return (SeedObject) node->_private;
+    ret = seed_make_object(ctx, xml_node_class, node);
+    node->_private = ret;
+    return ret;
 }
 
 static SeedObject
-seed_make_xml_attr (SeedContext ctx,
-		    xmlAttrPtr attr)
+seed_make_xml_attr(SeedContext ctx, xmlAttrPtr attr)
 {
- SeedObject ret;
-  if (attr == NULL)
-    return seed_make_null (ctx);
-  if (attr->_private)
-    return (SeedObject) attr->_private;
-  ret = seed_make_object (ctx, xml_attr_class, attr);
-  attr->_private = ret;
-  return ret;
+    SeedObject ret;
+    if (attr == NULL)
+        return seed_make_null(ctx);
+    if (attr->_private)
+        return (SeedObject) attr->_private;
+    ret = seed_make_object(ctx, xml_attr_class, attr);
+    attr->_private = ret;
+    return ret;
 }
 
-static gchar *
-seed_xml_element_type_to_string (xmlElementType type)
+static gchar*
+seed_xml_element_type_to_string(xmlElementType type)
 {
-  if (type == XML_ELEMENT_NODE)
-    return "element";
-  else if (type == XML_ATTRIBUTE_NODE)
-    return "attribute";
-  else if (type == XML_TEXT_NODE)
-    return "text";
-  else
-    return "Implement more types! racarr is lazy.";
+    if (type == XML_ELEMENT_NODE)
+        return "element";
+    else if (type == XML_ATTRIBUTE_NODE)
+        return "attribute";
+    else if (type == XML_TEXT_NODE)
+        return "text";
+    else
+        return "Implement more types! racarr is lazy.";
 }
 
 static SeedValue
-seed_xml_parse_file (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     gsize argument_count,
-		     const SeedValue arguments[],
-		     SeedException * exception)
+seed_xml_parse_file(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  SeedObject ret;
-  xmlDocPtr doc;
-  gchar *path;
-  if (argument_count != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "parseFile expected 1 argument, got %zd",
-			   argument_count);
-      return seed_make_null (ctx);
+    SeedObject ret;
+    xmlDocPtr doc;
+    gchar* path;
+    if (argument_count != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "parseFile expected 1 argument, got %zd",
+                            argument_count);
+        return seed_make_null(ctx);
     }
-  path = seed_value_to_string (ctx, arguments[0], exception);
-  doc = xmlParseFile (path);
-  if (!doc)
-    {
-      seed_make_exception (ctx, exception, "XMLError",
-			   "Document not parsed successfully");
-      g_free (path);
-      return seed_make_null (ctx);
+    path = seed_value_to_string(ctx, arguments[0], exception);
+    doc = xmlParseFile(path);
+    if (!doc) {
+        seed_make_exception(ctx, exception, "XMLError",
+                            "Document not parsed successfully");
+        g_free(path);
+        return seed_make_null(ctx);
     }
-  ret = seed_make_xml_doc (ctx, doc);
+    ret = seed_make_xml_doc(ctx, doc);
 
-  g_free (path);
-  return ret;
+    g_free(path);
+    return ret;
 }
 
 static SeedValue
-seed_xml_parse_string (SeedContext ctx,
-		       SeedObject function,
-		       SeedObject this_object,
-		       gsize argument_count,
-		       const SeedValue arguments[],
-		       SeedException * exception)
+seed_xml_parse_string(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue arguments[],
+                      SeedException* exception)
 {
-  SeedObject ret;
-  xmlDocPtr doc;
-  gchar *string;
-  if (argument_count != 1)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "parseString expected 1 argument, got %zd",
-			   argument_count);
-      return seed_make_null (ctx);
+    SeedObject ret;
+    xmlDocPtr doc;
+    gchar* string;
+    if (argument_count != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "parseString expected 1 argument, got %zd",
+                            argument_count);
+        return seed_make_null(ctx);
     }
-  string = seed_value_to_string (ctx, arguments[0], exception);
-  doc = xmlParseMemory (string, strlen (string));
-  if (!doc)
-    {
-      seed_make_exception (ctx, exception, "XMLError",
-			   "Document not parsed successfully");
-      g_free (string);
-      return seed_make_null (ctx);
+    string = seed_value_to_string(ctx, arguments[0], exception);
+    doc = xmlParseMemory(string, strlen(string));
+    if (!doc) {
+        seed_make_exception(ctx, exception, "XMLError",
+                            "Document not parsed successfully");
+        g_free(string);
+        return seed_make_null(ctx);
     }
-  ret = seed_make_xml_doc (ctx, doc);
+    ret = seed_make_xml_doc(ctx, doc);
 
-  g_free (string);
-  return ret;
+    g_free(string);
+    return ret;
 }
 
 static SeedValue
-seed_xml_doc_get_root (SeedContext ctx,
-		       SeedObject object,
-		       SeedString property_name,
-		       SeedException *exception)
+seed_xml_doc_get_root(SeedContext ctx,
+                      SeedObject object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
-  xmlDocPtr doc = XML_DOC_PRIV (object);
-  return seed_make_xml_node (ctx, xmlDocGetRootElement (doc));
+    xmlDocPtr doc = XML_DOC_PRIV(object);
+    return seed_make_xml_node(ctx, xmlDocGetRootElement(doc));
 }
 
 static void
-seed_xml_doc_finalize (SeedObject object)
+seed_xml_doc_finalize(SeedObject object)
 {
-  xmlDocPtr ptr = XML_DOC_PRIV (object);
-  xmlFreeDoc (ptr);
+    xmlDocPtr ptr = XML_DOC_PRIV(object);
+    xmlFreeDoc(ptr);
 }
 
 static SeedValue
-seed_xml_node_get_name (SeedContext ctx,
-			SeedObject object,
-			SeedString property_name,
-			SeedException *exception)
+seed_xml_node_get_name(SeedContext ctx,
+                       SeedObject object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
-  return seed_value_from_string (ctx, (gchar *)node->name, exception);
+    xmlNodePtr node = XML_NODE_PRIV(object);
+    return seed_value_from_string(ctx, (gchar*) node->name, exception);
 }
 
 static SeedValue
-seed_xml_node_get_children (SeedContext ctx,
-			   SeedObject object,
-			   SeedString property_name,
-			   SeedException *exception)
+seed_xml_node_get_children(SeedContext ctx,
+                           SeedObject object,
+                           SeedString property_name,
+                           SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
-
-  return seed_make_xml_node (ctx, node->children);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
+    return seed_make_xml_node(ctx, node->children);
 }
 
 static SeedValue
-seed_xml_node_get_parent (SeedContext ctx,
-			  SeedObject object,
-			  SeedString property_name,
-			  SeedException *exception)
+seed_xml_node_get_parent(SeedContext ctx,
+                         SeedObject object,
+                         SeedString property_name,
+                         SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_make_xml_node (ctx, node->parent);
+    return seed_make_xml_node(ctx, node->parent);
 }
 
 static SeedValue
-seed_xml_node_get_next (SeedContext ctx,
-			SeedObject object,
-			SeedString property_name,
-			SeedException *exception)
+seed_xml_node_get_next(SeedContext ctx,
+                       SeedObject object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_make_xml_node (ctx, node->next);
+    return seed_make_xml_node(ctx, node->next);
 }
 
 static SeedValue
-seed_xml_node_get_prev (SeedContext ctx,
-			SeedObject object,
-			SeedString property_name,
-			SeedException *exception)
+seed_xml_node_get_prev(SeedContext ctx,
+                       SeedObject object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_make_xml_node (ctx, node->prev);
+    return seed_make_xml_node(ctx, node->prev);
 }
 
 static SeedValue
-seed_xml_node_get_last (SeedContext ctx,
-			SeedObject object,
-			SeedString property_name,
-			SeedException *exception)
+seed_xml_node_get_last(SeedContext ctx,
+                       SeedObject object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_make_xml_node (ctx, node->last);
+    return seed_make_xml_node(ctx, node->last);
 }
 
 static SeedValue
-seed_xml_node_get_doc (SeedContext ctx,
-		       SeedObject object,
-		       SeedString property_name,
-		       SeedException *exception)
+seed_xml_node_get_doc(SeedContext ctx,
+                      SeedObject object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_make_xml_doc (ctx, node->doc);
+    return seed_make_xml_doc(ctx, node->doc);
 }
 
 static SeedValue
-seed_xml_node_get_content (SeedContext ctx,
-			SeedObject object,
-			SeedString property_name,
-			SeedException *exception)
+seed_xml_node_get_content(SeedContext ctx,
+                          SeedObject object,
+                          SeedString property_name,
+                          SeedException* exception)
 {
-  SeedValue ret;
-  gchar *content;
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    SeedValue ret;
+    gchar* content;
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  content = (gchar *)xmlNodeGetContent (node);
-  ret = seed_value_from_string (ctx, content, exception);
-  g_free (content);
+    content = (gchar*) xmlNodeGetContent(node);
+    ret = seed_value_from_string(ctx, content, exception);
+    g_free(content);
 
-  return ret;
+    return ret;
 }
 
 static SeedValue
-seed_xml_node_get_type (SeedContext ctx,
-			SeedObject object,
-			SeedString property_name,
-			SeedException *exception)
+seed_xml_node_get_type(SeedContext ctx,
+                       SeedObject object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_value_from_string (ctx,
-				 seed_xml_element_type_to_string
-				 (node->type), exception);
+    return seed_value_from_string(ctx,
+                                  seed_xml_element_type_to_string(node->type),
+                                  exception);
 }
 
 static SeedValue
-seed_xml_node_get_properties (SeedContext ctx,
-			      SeedObject object,
-			      SeedString property_name,
-			      SeedException *exception)
+seed_xml_node_get_properties(SeedContext ctx,
+                             SeedObject object,
+                             SeedString property_name,
+                             SeedException* exception)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
+    xmlNodePtr node = XML_NODE_PRIV(object);
 
-  return seed_make_xml_attr (ctx, node->properties);
+    return seed_make_xml_attr(ctx, node->properties);
 }
 
 static void
-seed_xml_node_init (SeedContext ctx,
-		    SeedObject object)
+seed_xml_node_init(SeedContext ctx, SeedObject object)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
-  if (node && node->doc->_private)
-    seed_value_protect (ctx, node->doc->_private);
+    xmlNodePtr node = XML_NODE_PRIV(object);
+    if (node && node->doc->_private)
+        seed_value_protect(ctx, node->doc->_private);
 }
 
 static void
-seed_xml_node_finalize (SeedObject object)
+seed_xml_node_finalize(SeedObject object)
 {
-  xmlNodePtr node = XML_NODE_PRIV (object);
-  if (!node)
-    return;
-  node->_private = NULL;
-  // This might be invalid.
-  if (node->doc->_private)
-    seed_value_unprotect (eng->context, node->doc->_private);
+    xmlNodePtr node = XML_NODE_PRIV(object);
+    if (!node)
+        return;
+    node->_private = NULL;
+    // This might be invalid.
+    if (node->doc->_private)
+        seed_value_unprotect(eng->context, node->doc->_private);
 }
 
 static SeedValue
-seed_xml_xpath_eval (SeedContext ctx,
-		     SeedObject function,
-		     SeedObject this_object,
-		     gsize argument_count,
-		     const SeedValue arguments[],
-		     SeedException * exception)
+seed_xml_xpath_eval(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  xmlXPathObjectPtr xpath_obj;
-  xmlXPathContextPtr xpath_ctx;
-  guchar *xpath;
-
-  if (argument_count != 1)
-    {
-      seed_make_exception (ctx, exception,
-			   "ArgumentError",
-			   "xpathEval expected 1 argument, got %zd",
-			   argument_count);
-      return seed_make_null (ctx);
+    xmlXPathObjectPtr xpath_obj;
+    xmlXPathContextPtr xpath_ctx;
+    guchar* xpath;
+
+    if (argument_count != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "xpathEval expected 1 argument, got %zd",
+                            argument_count);
+        return seed_make_null(ctx);
     }
-  xpath_ctx = XML_XPATH_PRIV (this_object);
+    xpath_ctx = XML_XPATH_PRIV(this_object);
 
-  xpath = (guchar *)seed_value_to_string (ctx, arguments[0], exception);
-  xpath_obj = xmlXPathEval (xpath, xpath_ctx);
-  g_free (xpath);
+    xpath = (guchar*) seed_value_to_string(ctx, arguments[0], exception);
+    xpath_obj = xmlXPathEval(xpath, xpath_ctx);
+    g_free(xpath);
 
-  return seed_make_object (ctx, xml_xpathobj_class, xpath_obj);
+    return seed_make_object(ctx, xml_xpathobj_class, xpath_obj);
 }
 
 static SeedValue
-seed_xml_xpath_register_ns (SeedContext ctx,
-			    SeedObject function,
-			    SeedObject this_object,
-			    gsize argument_count,
-			    const SeedValue arguments[],
-			    SeedException * exception)
+seed_xml_xpath_register_ns(SeedContext ctx,
+                           SeedObject function,
+                           SeedObject this_object,
+                           gsize argument_count,
+                           const SeedValue arguments[],
+                           SeedException* exception)
 {
-  xmlXPathContextPtr xpath;
-  guchar *prefix;
-  guchar *ns_uri;
-  if (argument_count != 2)
-    {
-      seed_make_exception (ctx, exception, "ArgumentError",
-			   "xpathRegisterNs expects 2 arguments, got %zd",
-			   argument_count);
-      return seed_make_undefined (ctx);
+    xmlXPathContextPtr xpath;
+    guchar* prefix;
+    guchar* ns_uri;
+    if (argument_count != 2) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "xpathRegisterNs expects 2 arguments, got %zd",
+                            argument_count);
+        return seed_make_undefined(ctx);
     }
-  xpath = XML_XPATH_PRIV (this_object);
-  prefix = (guchar *)seed_value_to_string (ctx, arguments[0], exception);
-  ns_uri = (guchar *)seed_value_to_string (ctx, arguments[1], exception);
+    xpath = XML_XPATH_PRIV(this_object);
+    prefix = (guchar*) seed_value_to_string(ctx, arguments[0], exception);
+    ns_uri = (guchar*) seed_value_to_string(ctx, arguments[1], exception);
 
-  xmlXPathRegisterNs (xpath, prefix, ns_uri);
-  g_free (prefix);
-  g_free (ns_uri);
+    xmlXPathRegisterNs(xpath, prefix, ns_uri);
+    g_free(prefix);
+    g_free(ns_uri);
 
-  return seed_make_undefined (ctx);
+    return seed_make_undefined(ctx);
 }
 
 static SeedValue
-seed_xml_construct_xpath_context (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  gsize argument_count,
-				  const SeedValue arguments[],
-				  SeedException * exception)
+seed_xml_construct_xpath_context(SeedContext ctx,
+                                 SeedObject function,
+                                 SeedObject this_object,
+                                 gsize argument_count,
+                                 const SeedValue arguments[],
+                                 SeedException* exception)
 {
-  xmlXPathContextPtr xpath;
-  xmlDocPtr doc;
+    xmlXPathContextPtr xpath;
+    xmlDocPtr doc;
 
-  doc = XML_DOC_PRIV (this_object);
-  xpath = xmlXPathNewContext (doc);
+    doc = XML_DOC_PRIV(this_object);
+    xpath = xmlXPathNewContext(doc);
 
-  seed_value_protect (ctx, this_object);
+    seed_value_protect(ctx, this_object);
 
-  return seed_make_object (ctx, xml_xpath_class, xpath);
+    return seed_make_object(ctx, xml_xpath_class, xpath);
 }
 
 static void
-seed_xml_xpath_finalize (SeedObject object)
+seed_xml_xpath_finalize(SeedObject object)
 {
-  xmlXPathContextPtr xpath = XML_XPATH_PRIV (object);
-  // Maybe unsafe. Seems to work.
-  seed_value_unprotect (eng->context, xpath->doc->_private);
-  xmlXPathFreeContext (xpath);
+    xmlXPathContextPtr xpath = XML_XPATH_PRIV(object);
+    // Maybe unsafe. Seems to work.
+    seed_value_unprotect(eng->context, xpath->doc->_private);
+    xmlXPathFreeContext(xpath);
 }
 
 static void
-seed_xml_xpathobj_finalize (SeedObject object)
+seed_xml_xpathobj_finalize(SeedObject object)
 {
-  xmlXPathObjectPtr xpath = XML_XPATHOBJ_PRIV (object);
-  xmlXPathFreeObject (xpath);
+    xmlXPathObjectPtr xpath = XML_XPATHOBJ_PRIV(object);
+    xmlXPathFreeObject(xpath);
 }
 
 static SeedValue
-seed_xml_array_from_nodeset (SeedContext ctx,
-			     xmlNodeSetPtr nodeset,
-			     SeedException *exception)
+seed_xml_array_from_nodeset(SeedContext ctx,
+                            xmlNodeSetPtr nodeset,
+                            SeedException* exception)
 {
-  SeedValue *ary = g_alloca (nodeset->nodeNr * sizeof (SeedValue));
-  int i;
+    SeedValue* ary = g_alloca(nodeset->nodeNr * sizeof(SeedValue));
+    int i;
 
-  for (i = 0; i < nodeset->nodeNr; i++)
-    {
-      ary[i] = seed_make_xml_node (ctx, nodeset->nodeTab[i]);
+    for (i = 0; i < nodeset->nodeNr; i++) {
+        ary[i] = seed_make_xml_node(ctx, nodeset->nodeTab[i]);
     }
-  return seed_make_array (ctx, ary, nodeset->nodeNr, exception);
+    return seed_make_array(ctx, ary, nodeset->nodeNr, exception);
 }
 
 static SeedValue
-seed_xml_xpathobj_get_value (SeedContext ctx,
-			     SeedObject object,
-			     SeedString property_name,
-			     SeedException *exception)
+seed_xml_xpathobj_get_value(SeedContext ctx,
+                            SeedObject object,
+                            SeedString property_name,
+                            SeedException* exception)
 {
-  xmlXPathObjectPtr xpath = XML_XPATHOBJ_PRIV (object);
-
-  switch (xpath->type)
-    {
-/*    case XPATH_BOOLEAN:
-      return seed_value_from_boolean (ctx, xpath->boolval, exception);
-    case XPATH_NUMBER:
-      return seed_value_from_double (ctx, xpath->floatval, exception);
-    case XPATH_STRING:
-    return seed_value_from_string (ctx, xpath->stringval, exception);*/
-    case XPATH_NODESET:
-      return seed_xml_array_from_nodeset (ctx, xpath->nodesetval, exception);
-    default:
-      return seed_make_null (ctx);
+    xmlXPathObjectPtr xpath = XML_XPATHOBJ_PRIV(object);
+
+    switch (xpath->type) {
+        /*    case XPATH_BOOLEAN:
+              return seed_value_from_boolean (ctx, xpath->boolval, exception);
+            case XPATH_NUMBER:
+              return seed_value_from_double (ctx, xpath->floatval, exception);
+            case XPATH_STRING:
+            return seed_value_from_string (ctx, xpath->stringval, exception);*/
+        case XPATH_NODESET:
+            return seed_xml_array_from_nodeset(ctx, xpath->nodesetval,
+                                               exception);
+        default:
+            return seed_make_null(ctx);
     }
 }
 
-
-seed_static_function doc_funcs[] = {
-  {"xpathNewContext", seed_xml_construct_xpath_context, 0},
-  {NULL, NULL, 0}
-};
-
-seed_static_value doc_values[] = {
-  {"root", seed_xml_doc_get_root, NULL, 0},
-  {"name", seed_xml_node_get_name, NULL, 0},
-  {"children", seed_xml_node_get_children, NULL, 0},
-  {"parent", seed_xml_node_get_parent, NULL, 0},
-  {"next", seed_xml_node_get_next, NULL, 0},
-  {"prev", seed_xml_node_get_prev, NULL, 0},
-  {"last", seed_xml_node_get_last, NULL, 0},
-  {"doc", seed_xml_node_get_doc, NULL, 0},
-  {"type", seed_xml_node_get_type, NULL, 0},
-  {NULL, NULL, NULL, 0}
-};
-
-seed_static_function node_funcs[] = {
-  {NULL, NULL, 0}
-};
-
-seed_static_value node_values[] = {
-  {"name", seed_xml_node_get_name, NULL, 0},
-  {"children", seed_xml_node_get_children, NULL, 0},
-  {"parent", seed_xml_node_get_parent, NULL, 0},
-  {"next", seed_xml_node_get_next, NULL, 0},
-  {"prev", seed_xml_node_get_prev, NULL, 0},
-  {"content", seed_xml_node_get_content, NULL, 0},
-  {"last", seed_xml_node_get_last, NULL, 0},
-  {"doc", seed_xml_node_get_doc, NULL, 0},
-  {"type", seed_xml_node_get_type, NULL, 0},
-  {"properties", seed_xml_node_get_properties, NULL, 0},
-  {NULL, NULL, NULL, 0}
-};
-
-seed_static_function attr_funcs[] = {
-  {NULL, NULL, 0}
-};
-
-seed_static_value attr_values[] = {
-  {"name", seed_xml_node_get_name, NULL, 0},
-  {"children", seed_xml_node_get_children, NULL, 0},
-  {"parent", seed_xml_node_get_parent, NULL, 0},
-  {"next", seed_xml_node_get_next, NULL, 0},
-  {"prev", seed_xml_node_get_prev, NULL, 0},
-  {"last", seed_xml_node_get_last, NULL, 0},
-  {"doc", seed_xml_node_get_doc, NULL, 0},
-  {"type", seed_xml_node_get_type, NULL, 0},
-  {NULL, NULL, NULL, 0}
-};
-
-seed_static_function xpath_funcs[] = {
-  {"xpathEval", seed_xml_xpath_eval, 0},
-  {"xpathRegisterNs", seed_xml_xpath_register_ns, 0},
-  {NULL, NULL, 0}
-};
-
-seed_static_value xpathobj_values[] = {
-  {"value", seed_xml_xpathobj_get_value, NULL, 0},
-  {NULL, NULL, NULL, 0}
-};
+seed_static_function doc_funcs[]
+  = { { "xpathNewContext", seed_xml_construct_xpath_context, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_value doc_values[]
+  = { { "root", seed_xml_doc_get_root, NULL, 0 },
+      { "name", seed_xml_node_get_name, NULL, 0 },
+      { "children", seed_xml_node_get_children, NULL, 0 },
+      { "parent", seed_xml_node_get_parent, NULL, 0 },
+      { "next", seed_xml_node_get_next, NULL, 0 },
+      { "prev", seed_xml_node_get_prev, NULL, 0 },
+      { "last", seed_xml_node_get_last, NULL, 0 },
+      { "doc", seed_xml_node_get_doc, NULL, 0 },
+      { "type", seed_xml_node_get_type, NULL, 0 },
+      { NULL, NULL, NULL, 0 } };
+
+seed_static_function node_funcs[] = { { NULL, NULL, 0 } };
+
+seed_static_value node_values[]
+  = { { "name", seed_xml_node_get_name, NULL, 0 },
+      { "children", seed_xml_node_get_children, NULL, 0 },
+      { "parent", seed_xml_node_get_parent, NULL, 0 },
+      { "next", seed_xml_node_get_next, NULL, 0 },
+      { "prev", seed_xml_node_get_prev, NULL, 0 },
+      { "content", seed_xml_node_get_content, NULL, 0 },
+      { "last", seed_xml_node_get_last, NULL, 0 },
+      { "doc", seed_xml_node_get_doc, NULL, 0 },
+      { "type", seed_xml_node_get_type, NULL, 0 },
+      { "properties", seed_xml_node_get_properties, NULL, 0 },
+      { NULL, NULL, NULL, 0 } };
+
+seed_static_function attr_funcs[] = { { NULL, NULL, 0 } };
+
+seed_static_value attr_values[]
+  = { { "name", seed_xml_node_get_name, NULL, 0 },
+      { "children", seed_xml_node_get_children, NULL, 0 },
+      { "parent", seed_xml_node_get_parent, NULL, 0 },
+      { "next", seed_xml_node_get_next, NULL, 0 },
+      { "prev", seed_xml_node_get_prev, NULL, 0 },
+      { "last", seed_xml_node_get_last, NULL, 0 },
+      { "doc", seed_xml_node_get_doc, NULL, 0 },
+      { "type", seed_xml_node_get_type, NULL, 0 },
+      { NULL, NULL, NULL, 0 } };
+
+seed_static_function xpath_funcs[]
+  = { { "xpathEval", seed_xml_xpath_eval, 0 },
+      { "xpathRegisterNs", seed_xml_xpath_register_ns, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_value xpathobj_values[]
+  = { { "value", seed_xml_xpathobj_get_value, NULL, 0 },
+      { NULL, NULL, NULL, 0 } };
 
 static void
-seed_libxml_define_stuff ()
+seed_libxml_define_stuff()
 {
-  SeedObject node_proto;
-
-  seed_class_definition xml_doc_class_def = seed_empty_class;
-  seed_class_definition xml_node_class_def = seed_empty_class;
-  seed_class_definition xml_attr_class_def = seed_empty_class;
-  seed_class_definition xml_xpath_class_def = seed_empty_class;
-  seed_class_definition xml_xpathobj_class_def = seed_empty_class;
-
-  xml_doc_class_def.class_name="XMLDocument";
-  xml_doc_class_def.static_functions = doc_funcs;
-  xml_doc_class_def.static_values = doc_values;
-  xml_doc_class_def.finalize = seed_xml_doc_finalize;
-  xml_doc_class = seed_create_class (&xml_doc_class_def);
-
-  xml_node_class_def.class_name="XMLNode";
-  xml_node_class_def.static_functions = node_funcs;
-  xml_node_class_def.static_values = node_values;
-  xml_node_class_def.finalize = seed_xml_node_finalize;
-  xml_node_class_def.initialize = seed_xml_node_init;
-  xml_node_class = seed_create_class (&xml_node_class_def);
-
-  xml_attr_class_def.class_name="XMLAttribute";
-  xml_attr_class_def.static_functions = attr_funcs;
-  xml_attr_class_def.static_values = attr_values;
-  xml_attr_class_def.finalize = seed_xml_node_finalize;
-  xml_attr_class_def.initialize = seed_xml_node_init;
-  xml_attr_class = seed_create_class (&xml_attr_class_def);
-
-  xml_xpath_class_def.class_name = "XMLXPathContext";
-  xml_xpath_class_def.finalize = seed_xml_xpath_finalize;
-  xml_xpath_class_def.static_functions = xpath_funcs;
-  xml_xpath_class = seed_create_class (&xml_xpath_class_def);
-
-  xml_xpathobj_class_def.class_name = "XMLXPathObj";
-  xml_xpathobj_class_def.finalize = seed_xml_xpathobj_finalize;
-  xml_xpathobj_class_def.static_values = xpathobj_values;
-  xml_xpathobj_class = seed_create_class (&xml_xpathobj_class_def);
-
-  seed_create_function (eng->context, "parseFile",
-			(SeedFunctionCallback) seed_xml_parse_file,
-			namespace_ref);
-  seed_create_function (eng->context, "parseString",
-			(SeedFunctionCallback) seed_xml_parse_string,
-			namespace_ref);
-
-  node_proto = seed_object_get_prototype (eng->context,
-					  seed_make_object (eng->context,
-							    xml_node_class,
-							    NULL));
-  seed_make_object (eng->context, xml_node_class, NULL);
-  seed_object_set_property (eng->context, namespace_ref, "_nodeProto", node_proto);
-  seed_simple_evaluate (eng->context, "imports.extensions.xml", NULL);
+    SeedObject node_proto;
+
+    seed_class_definition xml_doc_class_def = seed_empty_class;
+    seed_class_definition xml_node_class_def = seed_empty_class;
+    seed_class_definition xml_attr_class_def = seed_empty_class;
+    seed_class_definition xml_xpath_class_def = seed_empty_class;
+    seed_class_definition xml_xpathobj_class_def = seed_empty_class;
+
+    xml_doc_class_def.class_name = "XMLDocument";
+    xml_doc_class_def.static_functions = doc_funcs;
+    xml_doc_class_def.static_values = doc_values;
+    xml_doc_class_def.finalize = seed_xml_doc_finalize;
+    xml_doc_class = seed_create_class(&xml_doc_class_def);
+
+    xml_node_class_def.class_name = "XMLNode";
+    xml_node_class_def.static_functions = node_funcs;
+    xml_node_class_def.static_values = node_values;
+    xml_node_class_def.finalize = seed_xml_node_finalize;
+    xml_node_class_def.initialize = seed_xml_node_init;
+    xml_node_class = seed_create_class(&xml_node_class_def);
+
+    xml_attr_class_def.class_name = "XMLAttribute";
+    xml_attr_class_def.static_functions = attr_funcs;
+    xml_attr_class_def.static_values = attr_values;
+    xml_attr_class_def.finalize = seed_xml_node_finalize;
+    xml_attr_class_def.initialize = seed_xml_node_init;
+    xml_attr_class = seed_create_class(&xml_attr_class_def);
+
+    xml_xpath_class_def.class_name = "XMLXPathContext";
+    xml_xpath_class_def.finalize = seed_xml_xpath_finalize;
+    xml_xpath_class_def.static_functions = xpath_funcs;
+    xml_xpath_class = seed_create_class(&xml_xpath_class_def);
+
+    xml_xpathobj_class_def.class_name = "XMLXPathObj";
+    xml_xpathobj_class_def.finalize = seed_xml_xpathobj_finalize;
+    xml_xpathobj_class_def.static_values = xpathobj_values;
+    xml_xpathobj_class = seed_create_class(&xml_xpathobj_class_def);
+
+    seed_create_function(eng->context, "parseFile",
+                         (SeedFunctionCallback) seed_xml_parse_file,
+                         namespace_ref);
+    seed_create_function(eng->context, "parseString",
+                         (SeedFunctionCallback) seed_xml_parse_string,
+                         namespace_ref);
+
+    node_proto = seed_object_get_prototype(
+      eng->context, seed_make_object(eng->context, xml_node_class, NULL));
+    seed_make_object(eng->context, xml_node_class, NULL);
+    seed_object_set_property(eng->context, namespace_ref, "_nodeProto",
+                             node_proto);
+    seed_simple_evaluate(eng->context, "imports.extensions.xml", NULL);
 }
 
 SeedObject
-seed_module_init(SeedEngine *local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-  eng = local_eng;
-  namespace_ref = seed_make_object (eng->context, NULL, NULL);
-  seed_value_protect (eng->context, namespace_ref);
+    eng = local_eng;
+    namespace_ref = seed_make_object(eng->context, NULL, NULL);
+    seed_value_protect(eng->context, namespace_ref);
 
-  seed_libxml_define_stuff();
+    seed_libxml_define_stuff();
 
-  return namespace_ref;
+    return namespace_ref;
 }
diff --git a/modules/mpfr/Makefile.in b/modules/mpfr/Makefile.in
index 36ac87c..f28ec9a 100644
--- a/modules/mpfr/Makefile.in
+++ b/modules/mpfr/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/mpfr
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -103,12 +144,25 @@ libseed_mpfr_la_OBJECTS = $(am_libseed_mpfr_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_mpfr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_mpfr_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
 @BUILD_MPFR_MODULE_TRUE@am_libseed_mpfr_la_rpath = -rpath \
 @BUILD_MPFR_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -121,20 +175,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_mpfr_la_SOURCES)
 DIST_SOURCES = $(am__libseed_mpfr_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -142,8 +192,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -207,6 +275,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -220,6 +290,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -243,8 +314,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +336,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -350,6 +431,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -399,7 +481,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/mpfr/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/mpfr/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -417,6 +498,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -443,12 +525,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_mpfr.la: $(libseed_mpfr_la_OBJECTS) $(libseed_mpfr_la_DEPENDENCIES) $(EXTRA_libseed_mpfr_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_mpfr_la_LINK) $(am_libseed_mpfr_la_rpath) $(libseed_mpfr_la_OBJECTS) $(libseed_mpfr_la_LIBADD) $(LIBS)
 
@@ -468,14 +553,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -490,26 +575,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -521,15 +595,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -538,6 +608,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -682,19 +767,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/mpfr/seed-mpfr-arithmetic.c b/modules/mpfr/seed-mpfr-arithmetic.c
index cb6714a..fd22f7c 100644
--- a/modules/mpfr/seed-mpfr-arithmetic.c
+++ b/modules/mpfr/seed-mpfr-arithmetic.c
@@ -21,12 +21,13 @@
 #include "seed-mpfr.h"
 
 /* This is a bit disgusting. Oh well. */
-SeedValue seed_mpfr_add (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_add(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -44,50 +45,41 @@ SeedValue seed_mpfr_add (SeedContext ctx,
     argt1 = seed_mpfr_arg_type(ctx, args[0], exception);
     argt2 = seed_mpfr_arg_type(ctx, args[1], exception);
 
-    if ( (argt1 & argt2) == SEED_MPFR_MPFR )
-    {
+    if ((argt1 & argt2) == SEED_MPFR_MPFR) {
         /* both mpfr_t */
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         ret = mpfr_add(rop, op1, op2, rnd);
-    }
-    else if ( (argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE) )
-    {
+    } else if ((argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE)) {
         /* a double and an mpfr_t. Figure out the order */
-        if ( argt1 == SEED_MPFR_MPFR )
-        {
+        if (argt1 == SEED_MPFR_MPFR) {
             op1 = seed_object_get_private(args[0]);
             dop2 = seed_value_to_double(ctx, args[1], exception);
-            mpfr_add_d(rop, op1, dop2, rnd);
-        }
-        else
-        {
+            ret = mpfr_add_d(rop, op1, dop2, rnd);
+        } else {
             dop2 = seed_value_to_double(ctx, args[0], exception);
             op1 = seed_object_get_private(args[1]);
-            mpfr_add_d(rop, op1, dop2, rnd);
+            ret = mpfr_add_d(rop, op1, dop2, rnd);
         }
-    }
-    else if ( (argt1 & argt2) == SEED_MPFR_DOUBLE )
-    {
+    } else if ((argt1 & argt2) == SEED_MPFR_DOUBLE) {
         /* 2 doubles. hopefully doesn't happen */
         dop1 = seed_value_to_double(ctx, args[0], exception);
         dop2 = seed_value_to_double(ctx, args[1], exception);
         ret = mpfr_set_d(rop, dop1 + dop2, rnd);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.add", "double or mpfr_t");
     }
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_sub (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_sub(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -105,50 +97,41 @@ SeedValue seed_mpfr_sub (SeedContext ctx,
     argt1 = seed_mpfr_arg_type(ctx, args[0], exception);
     argt2 = seed_mpfr_arg_type(ctx, args[1], exception);
 
-    if ( (argt1 & argt2) == SEED_MPFR_MPFR )
-    {
+    if ((argt1 & argt2) == SEED_MPFR_MPFR) {
         /* both mpfr_t */
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         ret = mpfr_sub(rop, op1, op2, rnd);
-    }
-    else if ( (argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE) )
-    {
+    } else if ((argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE)) {
         /* a double and an mpfr_t. Figure out the order */
-        if ( argt1 == SEED_MPFR_MPFR )
-        {
+        if (argt1 == SEED_MPFR_MPFR) {
             op1 = seed_object_get_private(args[0]);
             dop2 = seed_value_to_double(ctx, args[1], exception);
-            mpfr_sub_d(rop, op1, dop2, rnd);
-        }
-        else
-        {
+            ret = mpfr_sub_d(rop, op1, dop2, rnd);
+        } else {
             dop1 = seed_value_to_double(ctx, args[0], exception);
             op2 = seed_object_get_private(args[1]);
-            mpfr_d_sub(rop, dop1, op2, rnd);
+            ret = mpfr_d_sub(rop, dop1, op2, rnd);
         }
-    }
-    else if ( (argt1 & argt2) == SEED_MPFR_DOUBLE )
-    {
+    } else if ((argt1 & argt2) == SEED_MPFR_DOUBLE) {
         /* 2 doubles. hopefully doesn't happen */
         dop1 = seed_value_to_double(ctx, args[0], exception);
         dop2 = seed_value_to_double(ctx, args[1], exception);
         ret = mpfr_set_d(rop, dop1 - dop2, rnd);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sub", "double or mpfr_t");
     }
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_mul (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_mul(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -166,50 +149,41 @@ SeedValue seed_mpfr_mul (SeedContext ctx,
     argt1 = seed_mpfr_arg_type(ctx, args[0], exception);
     argt2 = seed_mpfr_arg_type(ctx, args[1], exception);
 
-    if ( (argt1 & argt2) == SEED_MPFR_MPFR )
-    {
+    if ((argt1 & argt2) == SEED_MPFR_MPFR) {
         /* both mpfr_t */
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         ret = mpfr_mul(rop, op1, op2, rnd);
-    }
-    else if ( (argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE) )
-    {
+    } else if ((argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE)) {
         /* a double and an mpfr_t. Figure out the order */
-        if ( argt1 == SEED_MPFR_MPFR )
-        {
+        if (argt1 == SEED_MPFR_MPFR) {
             op1 = seed_object_get_private(args[0]);
             dop2 = seed_value_to_double(ctx, args[1], exception);
-            mpfr_mul_d(rop, op1, dop2, rnd);
-        }
-        else
-        {
+            ret = mpfr_mul_d(rop, op1, dop2, rnd);
+        } else {
             dop2 = seed_value_to_double(ctx, args[0], exception);
             op1 = seed_object_get_private(args[1]);
-            mpfr_mul_d(rop, op1, dop2, rnd);
+            ret = mpfr_mul_d(rop, op1, dop2, rnd);
         }
-    }
-    else if ( (argt1 & argt2) == SEED_MPFR_DOUBLE )
-    {
+    } else if ((argt1 & argt2) == SEED_MPFR_DOUBLE) {
         /* 2 doubles. hopefully doesn't happen */
         dop1 = seed_value_to_double(ctx, args[0], exception);
         dop2 = seed_value_to_double(ctx, args[1], exception);
         ret = mpfr_set_d(rop, dop1 * dop2, rnd);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.mul", "double or mpfr_t");
     }
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_div (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException * exception)
+SeedValue
+seed_mpfr_div(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -227,51 +201,41 @@ SeedValue seed_mpfr_div (SeedContext ctx,
     argt1 = seed_mpfr_arg_type(ctx, args[0], exception);
     argt2 = seed_mpfr_arg_type(ctx, args[1], exception);
 
-    if ( (argt1 & argt2) == SEED_MPFR_MPFR )
-    {
+    if ((argt1 & argt2) == SEED_MPFR_MPFR) {
         /* both mpfr_t */
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         ret = mpfr_div(rop, op1, op2, rnd);
-    }
-    else if ( (argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE) )
-    {
+    } else if ((argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE)) {
         /* a double and an mpfr_t. Figure out the order */
-        if ( argt1 == SEED_MPFR_MPFR )
-        {
+        if (argt1 == SEED_MPFR_MPFR) {
             op1 = seed_object_get_private(args[0]);
             dop2 = seed_value_to_double(ctx, args[1], exception);
-            mpfr_div_d(rop, op1, dop2, rnd);
-        }
-        else
-        {
+            ret = mpfr_div_d(rop, op1, dop2, rnd);
+        } else {
             dop1 = seed_value_to_double(ctx, args[0], exception);
             op2 = seed_object_get_private(args[1]);
-            mpfr_d_div(rop, dop1, op2, rnd);
+            ret = mpfr_d_div(rop, dop1, op2, rnd);
         }
-    }
-    else if ( (argt1 & argt2) == SEED_MPFR_DOUBLE )
-    {
+    } else if ((argt1 & argt2) == SEED_MPFR_DOUBLE) {
         /* 2 doubles. hopefully doesn't happen */
         dop1 = seed_value_to_double(ctx, args[0], exception);
         dop2 = seed_value_to_double(ctx, args[1], exception);
         ret = mpfr_set_d(rop, dop1 / dop2, rnd);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.div", "double or mpfr_t");
     }
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-
-SeedValue seed_mpfr_pow (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException * exception)
+SeedValue
+seed_mpfr_pow(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -290,52 +254,43 @@ SeedValue seed_mpfr_pow (SeedContext ctx,
     argt1 = seed_mpfr_arg_type(ctx, args[0], exception);
     argt2 = seed_mpfr_arg_type(ctx, args[1], exception);
 
-    if ( (argt1 & argt2) == SEED_MPFR_MPFR )
-    {
+    if ((argt1 & argt2) == SEED_MPFR_MPFR) {
         /* both mpfr_t */
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         ret = mpfr_pow(rop, op1, op2, rnd);
-    }
-    else if ( (argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE) )
-    {
+    } else if ((argt1 | argt2) == (SEED_MPFR_MPFR | SEED_MPFR_DOUBLE)) {
         /* a double and an mpfr_t. Figure out the order */
         /* FIXME: is this switching ui and si bad? si_pow doesn't exist,
            and it's all from double anyway */
-        if ( argt1 == SEED_MPFR_MPFR )
-        {
+        if (argt1 == SEED_MPFR_MPFR) {
             op1 = seed_object_get_private(args[0]);
             iop = seed_value_to_long(ctx, args[1], exception);
             ret = mpfr_pow_si(rop, op1, iop, rnd);
-        }
-        else
-        {
+        } else {
             uiop1 = seed_value_to_ulong(ctx, args[0], exception);
             op2 = seed_object_get_private(args[1]);
             ret = mpfr_ui_pow(rop, uiop1, op2, rnd);
         }
-    }
-    else if ( (argt1 & argt2) == SEED_MPFR_DOUBLE )
-    {
+    } else if ((argt1 & argt2) == SEED_MPFR_DOUBLE) {
         /* pretend both ui */
         uiop1 = seed_value_to_ulong(ctx, args[0], exception);
         uiop2 = seed_value_to_ulong(ctx, args[1], exception);
         ret = mpfr_ui_pow_ui(rop, uiop1, uiop2, rnd);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.pow", "int or unsigned int and mpfr_t");
     }
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_sqrt (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_sqrt(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -346,12 +301,9 @@ SeedValue seed_mpfr_sqrt (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sqrt", "mpfr_t");
     }
 
@@ -360,12 +312,13 @@ SeedValue seed_mpfr_sqrt (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_rec_sqrt (SeedContext ctx,
-                              SeedObject function,
-                              SeedObject this_object,
-                              gsize argument_count,
-                              const SeedValue args[],
-                              SeedException *exception)
+SeedValue
+seed_mpfr_rec_sqrt(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue args[],
+                   SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -376,12 +329,9 @@ SeedValue seed_mpfr_rec_sqrt (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.rec_sqrt", "mpfr_t");
     }
 
@@ -390,12 +340,13 @@ SeedValue seed_mpfr_rec_sqrt (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_sqr (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_sqr(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -406,12 +357,9 @@ SeedValue seed_mpfr_sqr (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sqr", "mpfr_t");
     }
 
@@ -420,12 +368,13 @@ SeedValue seed_mpfr_sqr (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_root (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_root(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -437,36 +386,30 @@ SeedValue seed_mpfr_root (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.root", "mpfr_t");
     }
 
-    if ( seed_value_is_number(ctx, args[1]) )
-    {
+    if (seed_value_is_number(ctx, args[1])) {
         k = seed_value_to_ulong(ctx, args[1], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.root", "unsigned long int");
     }
 
-
     ret = mpfr_root(rop, op, k, rnd);
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_cbrt (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_cbrt(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -477,12 +420,9 @@ SeedValue seed_mpfr_cbrt (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cbrt", "mpfr_t");
     }
 
@@ -491,12 +431,13 @@ SeedValue seed_mpfr_cbrt (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_neg (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_neg(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -507,12 +448,9 @@ SeedValue seed_mpfr_neg (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.neg", "mpfr_t");
     }
 
@@ -521,12 +459,13 @@ SeedValue seed_mpfr_neg (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_abs (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_abs(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -537,12 +476,9 @@ SeedValue seed_mpfr_abs (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.abs", "mpfr_t");
     }
 
@@ -551,12 +487,13 @@ SeedValue seed_mpfr_abs (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_dim (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_dim(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -567,14 +504,11 @@ SeedValue seed_mpfr_dim (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.dim", "mpfr_t");
     }
 
@@ -583,15 +517,15 @@ SeedValue seed_mpfr_dim (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-
 /* Rounding functions */
 
-SeedValue seed_mpfr_rint (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_rint(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -602,12 +536,9 @@ SeedValue seed_mpfr_rint (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.rint", "mpfr_t");
     }
 
@@ -616,12 +547,13 @@ SeedValue seed_mpfr_rint (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_ceil (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_ceil(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_ptr rop, op;
     gint ret;
@@ -630,12 +562,9 @@ SeedValue seed_mpfr_ceil (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.ceil", "mpfr_t");
     }
 
@@ -644,12 +573,13 @@ SeedValue seed_mpfr_ceil (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_floor (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException * exception)
+SeedValue
+seed_mpfr_floor(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_ptr rop, op;
     gint ret;
@@ -658,12 +588,9 @@ SeedValue seed_mpfr_floor (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.floor", "mpfr_t");
     }
 
@@ -672,12 +599,13 @@ SeedValue seed_mpfr_floor (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_round (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_round(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_ptr rop, op;
     gint ret;
@@ -686,12 +614,9 @@ SeedValue seed_mpfr_round (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.round", "mpfr_t");
     }
 
@@ -700,12 +625,13 @@ SeedValue seed_mpfr_round (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_trunc (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException * exception)
+SeedValue
+seed_mpfr_trunc(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_ptr rop, op;
     gint ret;
@@ -714,12 +640,9 @@ SeedValue seed_mpfr_trunc (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.trunc", "mpfr_t");
     }
 
@@ -728,12 +651,13 @@ SeedValue seed_mpfr_trunc (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_rint_ceil (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_rint_ceil(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -744,12 +668,9 @@ SeedValue seed_mpfr_rint_ceil (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.rint_ceil", "mpfr_t");
     }
 
@@ -758,12 +679,13 @@ SeedValue seed_mpfr_rint_ceil (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_rint_floor (SeedContext ctx,
-                                SeedObject function,
-                                SeedObject this_object,
-                                gsize argument_count,
-                                const SeedValue args[],
-                                SeedException *exception)
+SeedValue
+seed_mpfr_rint_floor(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue args[],
+                     SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -774,12 +696,9 @@ SeedValue seed_mpfr_rint_floor (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.rint_floor", "mpfr_t");
     }
 
@@ -788,12 +707,13 @@ SeedValue seed_mpfr_rint_floor (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_rint_round (SeedContext ctx,
-                                SeedObject function,
-                                SeedObject this_object,
-                                gsize argument_count,
-                                const SeedValue args[],
-                                SeedException *exception)
+SeedValue
+seed_mpfr_rint_round(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue args[],
+                     SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -804,12 +724,9 @@ SeedValue seed_mpfr_rint_round (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.rint_round", "mpfr_t");
     }
 
@@ -818,12 +735,13 @@ SeedValue seed_mpfr_rint_round (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_rint_trunc (SeedContext ctx,
-                                SeedObject function,
-                                SeedObject this_object,
-                                gsize argument_count,
-                                const SeedValue args[],
-                                SeedException *exception)
+SeedValue
+seed_mpfr_rint_trunc(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue args[],
+                     SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -834,12 +752,9 @@ SeedValue seed_mpfr_rint_trunc (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.rint_trunc", "mpfr_t");
     }
 
@@ -848,12 +763,13 @@ SeedValue seed_mpfr_rint_trunc (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_frac (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_frac(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -864,12 +780,9 @@ SeedValue seed_mpfr_frac (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.frac", "mpfr_t");
     }
 
@@ -878,12 +791,13 @@ SeedValue seed_mpfr_frac (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_integer_p (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_integer_p(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_ptr rop;
     gboolean ret;
@@ -895,12 +809,13 @@ SeedValue seed_mpfr_integer_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_fmod (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_fmod(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -911,14 +826,11 @@ SeedValue seed_mpfr_fmod (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.fmod", "mpfr_t");
     }
 
@@ -927,12 +839,13 @@ SeedValue seed_mpfr_fmod (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_remainder (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_remainder(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -943,14 +856,11 @@ SeedValue seed_mpfr_remainder (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.remainder", "mpfr_t");
     }
 
@@ -959,12 +869,13 @@ SeedValue seed_mpfr_remainder (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_nexttoward (SeedContext ctx,
-                                SeedObject function,
-                                SeedObject this_object,
-                                gsize argument_count,
-                                const SeedValue args[],
-                                SeedException *exception)
+SeedValue
+seed_mpfr_nexttoward(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue args[],
+                     SeedException* exception)
 {
     mpfr_ptr rop, op;
 
@@ -972,12 +883,9 @@ SeedValue seed_mpfr_nexttoward (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.nexttoward", "mpfr_t");
     }
 
@@ -986,12 +894,13 @@ SeedValue seed_mpfr_nexttoward (SeedContext ctx,
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_nextabove (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_nextabove(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_ptr rop;
 
@@ -1003,12 +912,13 @@ SeedValue seed_mpfr_nextabove (SeedContext ctx,
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_nextbelow (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_nextbelow(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_ptr rop;
 
@@ -1020,12 +930,13 @@ SeedValue seed_mpfr_nextbelow (SeedContext ctx,
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_min (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_min(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -1036,14 +947,11 @@ SeedValue seed_mpfr_min (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.min", "mpfr_t");
     }
 
@@ -1052,12 +960,13 @@ SeedValue seed_mpfr_min (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_max (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_max(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -1068,14 +977,11 @@ SeedValue seed_mpfr_max (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.max", "mpfr_t");
     }
 
@@ -1084,12 +990,13 @@ SeedValue seed_mpfr_max (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_prec_round (SeedContext ctx,
-                                SeedObject function,
-                                SeedObject this_object,
-                                gsize argument_count,
-                                const SeedValue args[],
-                                SeedException *exception)
+SeedValue
+seed_mpfr_prec_round(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue args[],
+                     SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mp_prec_t prec;
@@ -1107,12 +1014,13 @@ SeedValue seed_mpfr_prec_round (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_signbit (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_signbit(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_ptr rop;
     gboolean ret;
@@ -1124,12 +1032,13 @@ SeedValue seed_mpfr_signbit (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_setsign (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_setsign(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_ptr rop, op;
     gint ret;
@@ -1142,12 +1051,9 @@ SeedValue seed_mpfr_setsign (SeedContext ctx,
     s = seed_value_to_int(ctx, args[1], exception);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.setsign", "mpfr_t");
     }
 
@@ -1156,12 +1062,13 @@ SeedValue seed_mpfr_setsign (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_copysign (SeedContext ctx,
-                              SeedObject function,
-                              SeedObject this_object,
-                              gsize argument_count,
-                              const SeedValue args[],
-                              SeedException *exception)
+SeedValue
+seed_mpfr_copysign(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue args[],
+                   SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -1172,14 +1079,11 @@ SeedValue seed_mpfr_copysign (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.copysign", "mpfr_t");
     }
 
@@ -1188,12 +1092,13 @@ SeedValue seed_mpfr_copysign (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_mul_2si (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_mul_2si(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -1205,21 +1110,15 @@ SeedValue seed_mpfr_mul_2si (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.mul_2si", "mpfr_t");
     }
 
-    if ( seed_value_is_number(ctx, args[1]) )
-    {
+    if (seed_value_is_number(ctx, args[1])) {
         k = seed_value_to_ulong(ctx, args[1], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.mul_2si", "long int");
     }
 
@@ -1228,12 +1127,13 @@ SeedValue seed_mpfr_mul_2si (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_div_2si (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_div_2si(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -1245,21 +1145,15 @@ SeedValue seed_mpfr_div_2si (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.div_2si", "mpfr_t");
     }
 
-    if ( seed_value_is_number(ctx, args[1]) )
-    {
+    if (seed_value_is_number(ctx, args[1])) {
         k = seed_value_to_ulong(ctx, args[1], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.div_2si", "long int");
     }
 
@@ -1267,4 +1161,3 @@ SeedValue seed_mpfr_div_2si (SeedContext ctx,
 
     return seed_value_from_int(ctx, ret, exception);
 }
-
diff --git a/modules/mpfr/seed-mpfr-cmp.c b/modules/mpfr/seed-mpfr-cmp.c
index 5446cf5..6b10ffc 100644
--- a/modules/mpfr/seed-mpfr-cmp.c
+++ b/modules/mpfr/seed-mpfr-cmp.c
@@ -20,12 +20,13 @@
 #include <mpfr.h>
 #include "seed-mpfr.h"
 
-SeedValue seed_mpfr_cmp (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_cmp(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_ptr rop, op;
     gdouble dop;
@@ -35,31 +36,26 @@ SeedValue seed_mpfr_cmp (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
         ret = mpfr_cmp(rop, op);
-    }
-    else if ( seed_value_is_number(ctx, args[0]))
-    {
+    } else if (seed_value_is_number(ctx, args[0])) {
         dop = seed_value_to_double(ctx, args[0], exception);
         ret = mpfr_cmp_d(rop, dop);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cmp", "mpfr_t or double");
     }
 
-
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_cmpabs (SeedContext ctx,
-                            SeedObject function,
-                            SeedObject this_object,
-                            gsize argument_count,
-                            const SeedValue args[],
-                            SeedException *exception)
+SeedValue
+seed_mpfr_cmpabs(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 gsize argument_count,
+                 const SeedValue args[],
+                 SeedException* exception)
 {
     mpfr_ptr rop, op;
     gint ret;
@@ -68,12 +64,9 @@ SeedValue seed_mpfr_cmpabs (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cmpabs", "mpfr_t");
     }
 
@@ -83,12 +76,12 @@ SeedValue seed_mpfr_cmpabs (SeedContext ctx,
 }
 
 SeedValue
-seed_mpfr_nan_p (SeedContext ctx,
-                 SeedObject function,
-                 SeedObject this_object,
-                 gsize argument_count,
-                 const SeedValue args[],
-                 SeedException *exception)
+seed_mpfr_nan_p(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_ptr rop;
     gboolean ret;
@@ -103,12 +96,12 @@ seed_mpfr_nan_p (SeedContext ctx,
 }
 
 SeedValue
-seed_mpfr_inf_p (SeedContext ctx,
-                 SeedObject function,
-                 SeedObject this_object,
-                 gsize argument_count,
-                 const SeedValue args[],
-                 SeedException *exception)
+seed_mpfr_inf_p(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_ptr rop;
     gboolean ret;
@@ -123,12 +116,12 @@ seed_mpfr_inf_p (SeedContext ctx,
 }
 
 SeedValue
-seed_mpfr_number_p (SeedContext ctx,
-                    SeedObject function,
-                    SeedObject this_object,
-                    gsize argument_count,
-                    const SeedValue args[],
-                    SeedException *exception)
+seed_mpfr_number_p(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue args[],
+                   SeedException* exception)
 {
     mpfr_ptr rop;
     gboolean ret;
@@ -143,12 +136,12 @@ seed_mpfr_number_p (SeedContext ctx,
 }
 
 SeedValue
-seed_mpfr_zero_p (SeedContext ctx,
-                  SeedObject function,
-                  SeedObject this_object,
-                  gsize argument_count,
-                  const SeedValue args[],
-                  SeedException *exception)
+seed_mpfr_zero_p(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 gsize argument_count,
+                 const SeedValue args[],
+                 SeedException* exception)
 {
     mpfr_ptr rop;
     gboolean ret;
@@ -163,12 +156,12 @@ seed_mpfr_zero_p (SeedContext ctx,
 }
 
 SeedValue
-seed_mpfr_sgn (SeedContext ctx,
-               SeedObject function,
-               SeedObject this_object,
-               gsize argument_count,
-               const SeedValue args[],
-               SeedException *exception)
+seed_mpfr_sgn(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_ptr rop;
     gint ret;
@@ -182,12 +175,13 @@ seed_mpfr_sgn (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_greater_p (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_greater_p(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -196,12 +190,9 @@ SeedValue seed_mpfr_greater_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.greater_p", "mpfr_t");
     }
 
@@ -210,12 +201,13 @@ SeedValue seed_mpfr_greater_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_greaterequal_p (SeedContext ctx,
-                                    SeedObject function,
-                                    SeedObject this_object,
-                                    gsize argument_count,
-                                    const SeedValue args[],
-                                    SeedException *exception)
+SeedValue
+seed_mpfr_greaterequal_p(SeedContext ctx,
+                         SeedObject function,
+                         SeedObject this_object,
+                         gsize argument_count,
+                         const SeedValue args[],
+                         SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -224,12 +216,9 @@ SeedValue seed_mpfr_greaterequal_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.greaterequal_p", "mpfr_t");
     }
 
@@ -238,12 +227,13 @@ SeedValue seed_mpfr_greaterequal_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_less_p (SeedContext ctx,
-                            SeedObject function,
-                            SeedObject this_object,
-                            gsize argument_count,
-                            const SeedValue args[],
-                            SeedException *exception)
+SeedValue
+seed_mpfr_less_p(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 gsize argument_count,
+                 const SeedValue args[],
+                 SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -252,12 +242,9 @@ SeedValue seed_mpfr_less_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.less_p", "mpfr_t");
     }
 
@@ -266,12 +253,13 @@ SeedValue seed_mpfr_less_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_lessequal_p (SeedContext ctx,
-                                 SeedObject function,
-                                 SeedObject this_object,
-                                 gsize argument_count,
-                                 const SeedValue args[],
-                                 SeedException *exception)
+SeedValue
+seed_mpfr_lessequal_p(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -280,12 +268,9 @@ SeedValue seed_mpfr_lessequal_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.less_equal_p", "mpfr_t");
     }
 
@@ -294,12 +279,13 @@ SeedValue seed_mpfr_lessequal_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_lessgreater_p (SeedContext ctx,
-                                   SeedObject function,
-                                   SeedObject this_object,
-                                   gsize argument_count,
-                                   const SeedValue args[],
-                                   SeedException *exception)
+SeedValue
+seed_mpfr_lessgreater_p(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue args[],
+                        SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -308,12 +294,9 @@ SeedValue seed_mpfr_lessgreater_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.lessgreater_p", "mpfr_t");
     }
 
@@ -322,12 +305,13 @@ SeedValue seed_mpfr_lessgreater_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_equal_p (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_equal_p(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -336,12 +320,9 @@ SeedValue seed_mpfr_equal_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.equal_p", "mpfr_t");
     }
 
@@ -350,12 +331,13 @@ SeedValue seed_mpfr_equal_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_unordered_p (SeedContext ctx,
-                                 SeedObject function,
-                                 SeedObject this_object,
-                                 gsize argument_count,
-                                 const SeedValue args[],
-                                 SeedException *exception)
+SeedValue
+seed_mpfr_unordered_p(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_ptr rop, op;
     gboolean ret;
@@ -364,12 +346,9 @@ SeedValue seed_mpfr_unordered_p (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.unordered_p", "mpfr_t");
     }
 
@@ -378,13 +357,13 @@ SeedValue seed_mpfr_unordered_p (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-
-SeedValue seed_mpfr_cmp_si_2exp (SeedContext ctx,
-                                 SeedObject function,
-                                 SeedObject this_object,
-                                 gsize argument_count,
-                                 const SeedValue args[],
-                                 SeedException *exception)
+SeedValue
+seed_mpfr_cmp_si_2exp(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_ptr op1;
     gulong op2;
@@ -395,21 +374,15 @@ SeedValue seed_mpfr_cmp_si_2exp (SeedContext ctx,
 
     op1 = seed_object_get_private(this_object);
 
-    if ( seed_value_is_number(ctx, args[0]) )
-    {
+    if (seed_value_is_number(ctx, args[0])) {
         op2 = seed_value_to_ulong(ctx, args[0], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cmp_si_2exp", "long int");
     }
 
-    if ( seed_value_is_number(ctx, args[1]) )
-    {
+    if (seed_value_is_number(ctx, args[1])) {
         exp = seed_value_to_mp_exp_t(ctx, args[1], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cmp_si_2exp", "mp_exp_t");
     }
 
@@ -417,4 +390,3 @@ SeedValue seed_mpfr_cmp_si_2exp (SeedContext ctx,
 
     return seed_value_from_int(ctx, ret, exception);
 }
-
diff --git a/modules/mpfr/seed-mpfr-trig.c b/modules/mpfr/seed-mpfr-trig.c
index 3d28dbc..213377b 100644
--- a/modules/mpfr/seed-mpfr-trig.c
+++ b/modules/mpfr/seed-mpfr-trig.c
@@ -21,12 +21,13 @@
 
 #include "seed-mpfr.h"
 
-SeedValue seed_mpfr_sin (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_sin(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -37,12 +38,9 @@ SeedValue seed_mpfr_sin (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sin", "mpfr_t");
     }
 
@@ -51,12 +49,13 @@ SeedValue seed_mpfr_sin (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_cos (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_cos(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -67,12 +66,9 @@ SeedValue seed_mpfr_cos (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cos", "mpfr_t");
     }
 
@@ -81,12 +77,13 @@ SeedValue seed_mpfr_cos (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_tan (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_tan(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -97,12 +94,9 @@ SeedValue seed_mpfr_tan (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.tan", "mpfr_t");
     }
 
@@ -111,12 +105,13 @@ SeedValue seed_mpfr_tan (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_csc (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_csc(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -127,12 +122,9 @@ SeedValue seed_mpfr_csc (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.csc", "mpfr_t");
     }
 
@@ -141,12 +133,13 @@ SeedValue seed_mpfr_csc (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_sec (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_sec(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -157,12 +150,9 @@ SeedValue seed_mpfr_sec (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sec", "mpfr_t");
     }
 
@@ -171,12 +161,13 @@ SeedValue seed_mpfr_sec (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_cot (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_cot(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -187,12 +178,9 @@ SeedValue seed_mpfr_cot (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cot", "mpfr_t");
     }
 
@@ -201,12 +189,13 @@ SeedValue seed_mpfr_cot (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_asin (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_asin(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -217,12 +206,9 @@ SeedValue seed_mpfr_asin (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.asin", "mpfr_t");
     }
 
@@ -231,13 +217,13 @@ SeedValue seed_mpfr_asin (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-
-SeedValue seed_mpfr_acos (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_acos(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -248,12 +234,9 @@ SeedValue seed_mpfr_acos (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.acos", "mpfr_t");
     }
 
@@ -262,12 +245,13 @@ SeedValue seed_mpfr_acos (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_atan (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_atan(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -278,12 +262,9 @@ SeedValue seed_mpfr_atan (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.atan", "mpfr_t");
     }
 
@@ -292,15 +273,15 @@ SeedValue seed_mpfr_atan (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-
 /* log functions */
 
-SeedValue seed_mpfr_log (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_log(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -311,12 +292,9 @@ SeedValue seed_mpfr_log (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.log", "mpfr_t");
     }
 
@@ -325,12 +303,13 @@ SeedValue seed_mpfr_log (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_log2 (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_log2(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -341,12 +320,9 @@ SeedValue seed_mpfr_log2 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.log2", "mpfr_t");
     }
 
@@ -355,12 +331,13 @@ SeedValue seed_mpfr_log2 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_log10 (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_log10(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -371,12 +348,9 @@ SeedValue seed_mpfr_log10 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.log10", "mpfr_t");
     }
 
@@ -387,12 +361,13 @@ SeedValue seed_mpfr_log10 (SeedContext ctx,
 
 /* hyperbolic trig functions */
 
-SeedValue seed_mpfr_sinh (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_sinh(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -403,12 +378,9 @@ SeedValue seed_mpfr_sinh (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sinh", "mpfr_t");
     }
 
@@ -417,12 +389,13 @@ SeedValue seed_mpfr_sinh (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_cosh (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_cosh(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -433,12 +406,9 @@ SeedValue seed_mpfr_cosh (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.cosh", "mpfr_t");
     }
 
@@ -447,12 +417,13 @@ SeedValue seed_mpfr_cosh (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_tanh (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_tanh(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -463,12 +434,9 @@ SeedValue seed_mpfr_tanh (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.tanh", "mpfr_t");
     }
 
@@ -477,13 +445,13 @@ SeedValue seed_mpfr_tanh (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-
-SeedValue seed_mpfr_sech (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_sech(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -494,12 +462,9 @@ SeedValue seed_mpfr_sech (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.sech", "mpfr_t");
     }
 
@@ -508,12 +473,13 @@ SeedValue seed_mpfr_sech (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_csch (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_csch(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -524,12 +490,9 @@ SeedValue seed_mpfr_csch (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.csch", "mpfr_t");
     }
 
@@ -538,12 +501,13 @@ SeedValue seed_mpfr_csch (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_coth (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_coth(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -554,12 +518,9 @@ SeedValue seed_mpfr_coth (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.coth", "mpfr_t");
     }
 
@@ -570,12 +531,13 @@ SeedValue seed_mpfr_coth (SeedContext ctx,
 
 /* inverse hyperbolic trig */
 
-SeedValue seed_mpfr_asinh (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_asinh(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -586,12 +548,9 @@ SeedValue seed_mpfr_asinh (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.asinh", "mpfr_t");
     }
 
@@ -600,12 +559,13 @@ SeedValue seed_mpfr_asinh (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_acosh (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_acosh(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -616,12 +576,9 @@ SeedValue seed_mpfr_acosh (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.acosh", "mpfr_t");
     }
 
@@ -630,12 +587,13 @@ SeedValue seed_mpfr_acosh (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_atanh (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_atanh(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -646,12 +604,9 @@ SeedValue seed_mpfr_atanh (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.atanh", "mpfr_t");
     }
 
@@ -660,12 +615,13 @@ SeedValue seed_mpfr_atanh (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_log1p (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_log1p(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -676,12 +632,9 @@ SeedValue seed_mpfr_log1p (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.log1p", "mpfr_t");
     }
 
@@ -690,12 +643,13 @@ SeedValue seed_mpfr_log1p (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_expm1 (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_expm1(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -706,12 +660,9 @@ SeedValue seed_mpfr_expm1 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.expm1", "mpfr_t");
     }
 
@@ -720,12 +671,13 @@ SeedValue seed_mpfr_expm1 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_li2 (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_li2(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -736,12 +688,9 @@ SeedValue seed_mpfr_li2 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.li2", "mpfr_t");
     }
 
@@ -750,12 +699,13 @@ SeedValue seed_mpfr_li2 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_gamma (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_gamma(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -766,12 +716,9 @@ SeedValue seed_mpfr_gamma (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.gamma", "mpfr_t");
     }
 
@@ -780,12 +727,13 @@ SeedValue seed_mpfr_gamma (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_lngamma (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_lngamma(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -796,12 +744,9 @@ SeedValue seed_mpfr_lngamma (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.lngamma", "mpfr_t");
     }
 
@@ -810,12 +755,13 @@ SeedValue seed_mpfr_lngamma (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_zeta (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_zeta(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -827,30 +773,26 @@ SeedValue seed_mpfr_zeta (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
         ret = mpfr_zeta(rop, op, rnd);
-    }
-    else if ( seed_value_is_number(ctx, args[0]) )
-    {
+    } else if (seed_value_is_number(ctx, args[0])) {
         uiop = seed_value_to_ulong(ctx, args[0], exception);
         ret = mpfr_zeta_ui(rop, uiop, rnd);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.zeta", "mpfr_t or unsigned int");
     }
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_erf (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_erf(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -861,12 +803,9 @@ SeedValue seed_mpfr_erf (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.erf", "mpfr_t");
     }
 
@@ -875,12 +814,13 @@ SeedValue seed_mpfr_erf (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_erfc (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_erfc(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -891,12 +831,9 @@ SeedValue seed_mpfr_erfc (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.erfc", "mpfr_t");
     }
 
@@ -906,12 +843,13 @@ SeedValue seed_mpfr_erfc (SeedContext ctx,
 }
 
 /* bessel functions */
-SeedValue seed_mpfr_j0 (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+SeedValue
+seed_mpfr_j0(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue args[],
+             SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -922,12 +860,9 @@ SeedValue seed_mpfr_j0 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.j0", "mpfr_t");
     }
 
@@ -936,12 +871,13 @@ SeedValue seed_mpfr_j0 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_j1 (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+SeedValue
+seed_mpfr_j1(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue args[],
+             SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -952,12 +888,9 @@ SeedValue seed_mpfr_j1 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.j1", "mpfr_t");
     }
 
@@ -966,12 +899,13 @@ SeedValue seed_mpfr_j1 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_jn (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+SeedValue
+seed_mpfr_jn(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue args[],
+             SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -982,21 +916,15 @@ SeedValue seed_mpfr_jn (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[1], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.jn", "mpfr_t");
     }
 
-    if ( seed_value_is_number(ctx, args[0]) )
-    {
+    if (seed_value_is_number(ctx, args[0])) {
         n = seed_value_to_int(ctx, args[0], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.jn", "int");
     }
 
@@ -1005,12 +933,13 @@ SeedValue seed_mpfr_jn (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_y0 (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+SeedValue
+seed_mpfr_y0(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue args[],
+             SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -1021,12 +950,9 @@ SeedValue seed_mpfr_y0 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.y0", "mpfr_t");
     }
 
@@ -1035,12 +961,13 @@ SeedValue seed_mpfr_y0 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_y1 (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+SeedValue
+seed_mpfr_y1(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue args[],
+             SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -1051,12 +978,9 @@ SeedValue seed_mpfr_y1 (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.y1", "mpfr_t");
     }
 
@@ -1065,12 +989,13 @@ SeedValue seed_mpfr_y1 (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_yn (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+SeedValue
+seed_mpfr_yn(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue args[],
+             SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -1081,21 +1006,15 @@ SeedValue seed_mpfr_yn (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[1], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.yn", "mpfr_t");
     }
 
-    if ( seed_value_is_number(ctx, args[0]) )
-    {
+    if (seed_value_is_number(ctx, args[0])) {
         n = seed_value_to_int(ctx, args[0], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.yn", "int");
     }
 
@@ -1104,12 +1023,13 @@ SeedValue seed_mpfr_yn (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_fma (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_fma(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2, op3;
@@ -1120,16 +1040,13 @@ SeedValue seed_mpfr_fma (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[3], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[2], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[2], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         op3 = seed_object_get_private(args[2]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.fma", "mpfr_t");
     }
 
@@ -1138,12 +1055,13 @@ SeedValue seed_mpfr_fma (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_fms (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_fms(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2, op3;
@@ -1154,16 +1072,13 @@ SeedValue seed_mpfr_fms (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[3], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[2], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[2], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
         op3 = seed_object_get_private(args[2]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.fms", "mpfr_t");
     }
 
@@ -1172,12 +1087,13 @@ SeedValue seed_mpfr_fms (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_agm (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+SeedValue
+seed_mpfr_agm(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -1188,14 +1104,11 @@ SeedValue seed_mpfr_agm (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.agm", "mpfr_t");
     }
 
@@ -1204,12 +1117,13 @@ SeedValue seed_mpfr_agm (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_hypot (SeedContext ctx,
-                           SeedObject function,
-                           SeedObject this_object,
-                           gsize argument_count,
-                           const SeedValue args[],
-                           SeedException *exception)
+SeedValue
+seed_mpfr_hypot(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op1, op2;
@@ -1220,14 +1134,11 @@ SeedValue seed_mpfr_hypot (SeedContext ctx,
     rop = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) &&
-         seed_value_is_object_of_class(ctx, args[1], mpfr_class))
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)
+        && seed_value_is_object_of_class(ctx, args[1], mpfr_class)) {
         op1 = seed_object_get_private(args[0]);
         op2 = seed_object_get_private(args[1]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.hypot", "mpfr_t");
     }
 
@@ -1236,27 +1147,28 @@ SeedValue seed_mpfr_hypot (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_free_cache (SeedContext ctx,
-                                SeedObject function,
-                                SeedObject this_object,
-                                gsize argument_count,
-                                const SeedValue args[],
-                                SeedException *exception)
+SeedValue
+seed_mpfr_free_cache(SeedContext ctx,
+                     SeedObject function,
+                     SeedObject this_object,
+                     gsize argument_count,
+                     const SeedValue args[],
+                     SeedException* exception)
 {
     CHECK_ARG_COUNT("mpfr.free_cache", 0);
     mpfr_free_cache();
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_clear_flags (SeedContext ctx,
-                                 SeedObject function,
-                                 SeedObject this_object,
-                                 gsize argument_count,
-                                 const SeedValue args[],
-                                 SeedException *exception)
+SeedValue
+seed_mpfr_clear_flags(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     CHECK_ARG_COUNT("mpfr.clear_flags", 0);
     mpfr_clear_flags();
     return seed_make_null(ctx);
 }
-
diff --git a/modules/mpfr/seed-mpfr.c b/modules/mpfr/seed-mpfr.c
index 2e03126..85cb185 100644
--- a/modules/mpfr/seed-mpfr.c
+++ b/modules/mpfr/seed-mpfr.c
@@ -27,30 +27,31 @@
 SeedObject ns_ref;
 SeedClass mpfr_class;
 
-/* For now at least ignoring the ability to use gmp types since there is no gmp module */
+/* For now at least ignoring the ability to use gmp types since there is no gmp
+ * module */
 
-SeedEngine * eng;
+SeedEngine* eng;
 
-inline seed_mpfr_t
+seed_mpfr_t
 seed_mpfr_arg_type(SeedContext ctx, SeedValue arg, SeedException exept)
 {
-    if ( seed_value_is_object_of_class(ctx, arg, mpfr_class) )
+    if (seed_value_is_object_of_class(ctx, arg, mpfr_class))
         return SEED_MPFR_MPFR;
-    else if ( seed_value_is_number(ctx, arg) )
+    else if (seed_value_is_number(ctx, arg))
         return SEED_MPFR_DOUBLE;
-    else if ( seed_value_is_string(ctx, arg) )
+    else if (seed_value_is_string(ctx, arg))
         return SEED_MPFR_STRING;
     else
         return SEED_MPFR_UNKNOWN;
 }
 
 static SeedValue
-seed_mpfr_out_str (SeedContext ctx,
-                   SeedObject function,
-                   SeedObject this_object,
-                   gsize argument_count,
-                   const SeedValue args[],
-                   SeedException *exception)
+seed_mpfr_out_str(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     gsize n;
     FILE* stream;
@@ -66,19 +67,19 @@ seed_mpfr_out_str (SeedContext ctx,
     op = seed_object_get_private(this_object);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[3], exception);
 
-    return seed_value_from_uint(ctx,
-                                mpfr_out_str(stream, base, n, op, rnd),
+    return seed_value_from_uint(ctx, mpfr_out_str(stream, base, n, op, rnd),
                                 exception);
 }
 
-/* no way to do real printf with varargs yet, this is a way to get fake printf  */
+/* no way to do real printf with varargs yet, this is a way to get fake printf
+ */
 static SeedValue
-seed_mpfr_print (SeedContext ctx,
-                 SeedObject function,
-                 SeedObject this_object,
-                 gsize argument_count,
-                 const SeedValue args[],
-                 SeedException *exception)
+seed_mpfr_print(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_ptr op;
     mpfr_rnd_t rnd;
@@ -92,18 +93,18 @@ seed_mpfr_print (SeedContext ctx,
     sigdigits = seed_value_to_uint(ctx, args[1], exception);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[2], exception);
 
-    ret = mpfr_printf("%*.*R*g", width, sigdigits, rnd, op );
+    ret = mpfr_printf("%*.*R*g", width, sigdigits, rnd, op);
 
     return seed_value_from_int(ctx, ret, exception);
 }
 
 static SeedValue
-seed_mpfr_const_pi (SeedContext ctx,
-                    SeedObject function,
-                    SeedObject this_object,
-                    gsize argument_count,
-                    const SeedValue args[],
-                    SeedException *exception)
+seed_mpfr_const_pi(SeedContext ctx,
+                   SeedObject function,
+                   SeedObject this_object,
+                   gsize argument_count,
+                   const SeedValue args[],
+                   SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -120,12 +121,12 @@ seed_mpfr_const_pi (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_const_euler (SeedContext ctx,
-                       SeedObject function,
-                       SeedObject this_object,
-                       gsize argument_count,
-                       const SeedValue args[],
-                       SeedException *exception)
+seed_mpfr_const_euler(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -142,12 +143,12 @@ seed_mpfr_const_euler (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_const_catalan (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+seed_mpfr_const_catalan(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue args[],
+                        SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -164,12 +165,12 @@ seed_mpfr_const_catalan (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_get_d (SeedContext ctx,
-                 SeedObject function,
-                 SeedObject this_object,
-                 gsize argument_count,
-                 const SeedValue args[],
-                 SeedException *exception)
+seed_mpfr_get_d(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                gsize argument_count,
+                const SeedValue args[],
+                SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -186,12 +187,12 @@ seed_mpfr_get_d (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_ulong_p (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+seed_mpfr_fits_ulong_p(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue args[],
+                       SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -208,12 +209,12 @@ seed_mpfr_fits_ulong_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_slong_p (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+seed_mpfr_fits_slong_p(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue args[],
+                       SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -230,12 +231,12 @@ seed_mpfr_fits_slong_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_uint_p (SeedContext ctx,
-                       SeedObject function,
-                       SeedObject this_object,
-                       gsize argument_count,
-                       const SeedValue args[],
-                       SeedException *exception)
+seed_mpfr_fits_uint_p(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -252,12 +253,12 @@ seed_mpfr_fits_uint_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_sint_p (SeedContext ctx,
-                       SeedObject function,
-                       SeedObject this_object,
-                       gsize argument_count,
-                       const SeedValue args[],
-                       SeedException *exception)
+seed_mpfr_fits_sint_p(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -274,12 +275,12 @@ seed_mpfr_fits_sint_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_ushort_p (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+seed_mpfr_fits_ushort_p(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue args[],
+                        SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -296,12 +297,12 @@ seed_mpfr_fits_ushort_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_sshort_p (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+seed_mpfr_fits_sshort_p(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue args[],
+                        SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -318,12 +319,12 @@ seed_mpfr_fits_sshort_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_intmax_p (SeedContext ctx,
-                         SeedObject function,
-                         SeedObject this_object,
-                         gsize argument_count,
-                         const SeedValue args[],
-                         SeedException *exception)
+seed_mpfr_fits_intmax_p(SeedContext ctx,
+                        SeedObject function,
+                        SeedObject this_object,
+                        gsize argument_count,
+                        const SeedValue args[],
+                        SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -340,12 +341,12 @@ seed_mpfr_fits_intmax_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_fits_uintmax_p (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+seed_mpfr_fits_uintmax_p(SeedContext ctx,
+                         SeedObject function,
+                         SeedObject this_object,
+                         gsize argument_count,
+                         const SeedValue args[],
+                         SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -362,21 +363,21 @@ seed_mpfr_fits_uintmax_p (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_get_exp (SeedContext ctx,
-                   SeedObject this_object,
-                   SeedString property_name,
-                   SeedException *exception)
+seed_mpfr_get_exp(SeedContext ctx,
+                  SeedObject this_object,
+                  SeedString property_name,
+                  SeedException* exception)
 {
     mpfr_ptr ptr = seed_object_get_private(this_object);
     return seed_value_from_mp_exp_t(ctx, mpfr_get_exp(ptr), exception);
 }
 
 static gboolean
-seed_mpfr_set_exp (SeedContext ctx,
-                   SeedObject this_object,
-                   SeedString property_name,
-                   SeedValue value,
-                   SeedException *exception)
+seed_mpfr_set_exp(SeedContext ctx,
+                  SeedObject this_object,
+                  SeedString property_name,
+                  SeedValue value,
+                  SeedException* exception)
 {
     mpfr_ptr ptr = seed_object_get_private(this_object);
     mpfr_set_exp(ptr, seed_value_to_mp_exp_t(ctx, value, exception));
@@ -384,41 +385,43 @@ seed_mpfr_set_exp (SeedContext ctx,
 }
 
 static gboolean
-seed_mpfr_set_default_rounding_mode (SeedContext ctx,
-                                     SeedObject this_object,
-                                     SeedString property_name,
-                                     SeedValue value,
-                                     SeedException *exception)
+seed_mpfr_set_default_rounding_mode(SeedContext ctx,
+                                    SeedObject this_object,
+                                    SeedString property_name,
+                                    SeedValue value,
+                                    SeedException* exception)
 {
-    mpfr_set_default_rounding_mode(seed_value_to_mpfr_rnd_t(ctx, value, exception));
+    mpfr_set_default_rounding_mode(
+      seed_value_to_mpfr_rnd_t(ctx, value, exception));
     return TRUE;
 }
 
 static SeedValue
-seed_mpfr_get_default_rounding_mode (SeedContext ctx,
-                                     SeedObject this_object,
-                                     SeedString property_name,
-                                     SeedException *exception)
+seed_mpfr_get_default_rounding_mode(SeedContext ctx,
+                                    SeedObject this_object,
+                                    SeedString property_name,
+                                    SeedException* exception)
 {
-    return seed_value_from_mpfr_rnd_t(ctx, mpfr_get_default_rounding_mode(), exception);
+    return seed_value_from_mpfr_rnd_t(ctx, mpfr_get_default_rounding_mode(),
+                                      exception);
 }
 
 static SeedValue
-seed_mpfr_get_prec (SeedContext ctx,
-                    SeedObject this_object,
-                    SeedString property_name,
-                    SeedException *exception)
+seed_mpfr_get_prec(SeedContext ctx,
+                   SeedObject this_object,
+                   SeedString property_name,
+                   SeedException* exception)
 {
     mpfr_ptr ptr = seed_object_get_private(this_object);
     return seed_value_from_mpfr_prec_t(ctx, mpfr_get_prec(ptr), exception);
 }
 
 static gboolean
-seed_mpfr_set_prec (SeedContext ctx,
-                    SeedObject this_object,
-                    SeedString property_name,
-                    SeedValue value,
-                    SeedException *exception)
+seed_mpfr_set_prec(SeedContext ctx,
+                   SeedObject this_object,
+                   SeedString property_name,
+                   SeedValue value,
+                   SeedException* exception)
 {
     mpfr_ptr ptr = seed_object_get_private(this_object);
     mpfr_set_prec(ptr, seed_value_to_mpfr_prec_t(ctx, value, exception));
@@ -426,23 +429,22 @@ seed_mpfr_set_prec (SeedContext ctx,
 }
 
 static void
-seed_mpfr_finalize (SeedObject obj)
+seed_mpfr_finalize(SeedObject obj)
 {
     mpfr_ptr ptr = seed_object_get_private(obj);
-    if ( ptr )
-    {
+    if (ptr) {
         mpfr_clear(ptr);
-        g_free( ptr );
+        g_free(ptr);
     }
 }
 
 static SeedValue
-seed_mpfr_set (SeedContext ctx,
-               SeedObject function,
-               SeedObject this_object,
-               gsize argument_count,
-               const SeedValue args[],
-               SeedException *exception)
+seed_mpfr_set(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              gsize argument_count,
+              const SeedValue args[],
+              SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop, op;
@@ -457,8 +459,7 @@ seed_mpfr_set (SeedContext ctx,
     argt = seed_mpfr_arg_type(ctx, args[0], exception);
     rnd = seed_value_to_mpfr_rnd_t(ctx, args[1], exception);
 
-    switch ( argt )
-    {
+    switch (argt) {
         case SEED_MPFR_MPFR:
             op = seed_object_get_private(args[0]);
             ret = mpfr_set(rop, op, rnd);
@@ -470,7 +471,7 @@ seed_mpfr_set (SeedContext ctx,
         case SEED_MPFR_STRING:
             str = seed_value_to_string(ctx, args[0], exception);
             ret = mpfr_set_str(rop, str, 10, rnd);
-            g_free( str );
+            g_free(str);
             break;
         default:
             TYPE_EXCEPTION("mpfr.set", "mpfr_t, double or string");
@@ -479,12 +480,13 @@ seed_mpfr_set (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-SeedValue seed_mpfr_set_inf (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_set_inf(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_ptr rop;
     gint sign;
@@ -493,12 +495,9 @@ SeedValue seed_mpfr_set_inf (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_number(ctx, args[0]) )
-    {
+    if (seed_value_is_number(ctx, args[0])) {
         sign = seed_value_to_int(ctx, args[0], exception);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.set_inf", "int");
     }
 
@@ -507,12 +506,13 @@ SeedValue seed_mpfr_set_inf (SeedContext ctx,
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_set_nan (SeedContext ctx,
-                             SeedObject function,
-                             SeedObject this_object,
-                             gsize argument_count,
-                             const SeedValue args[],
-                             SeedException *exception)
+SeedValue
+seed_mpfr_set_nan(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  gsize argument_count,
+                  const SeedValue args[],
+                  SeedException* exception)
 {
     mpfr_ptr rop;
 
@@ -525,12 +525,13 @@ SeedValue seed_mpfr_set_nan (SeedContext ctx,
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_swap (SeedContext ctx,
-                          SeedObject function,
-                          SeedObject this_object,
-                          gsize argument_count,
-                          const SeedValue args[],
-                          SeedException *exception)
+SeedValue
+seed_mpfr_swap(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               gsize argument_count,
+               const SeedValue args[],
+               SeedException* exception)
 {
     mpfr_ptr rop, op;
 
@@ -538,12 +539,9 @@ SeedValue seed_mpfr_swap (SeedContext ctx,
 
     rop = seed_object_get_private(this_object);
 
-    if ( seed_value_is_object_of_class(ctx, args[0], mpfr_class) )
-    {
+    if (seed_value_is_object_of_class(ctx, args[0], mpfr_class)) {
         op = seed_object_get_private(args[0]);
-    }
-    else
-    {
+    } else {
         TYPE_EXCEPTION("mpfr.swap", "mpfr_t");
     }
 
@@ -552,12 +550,13 @@ SeedValue seed_mpfr_swap (SeedContext ctx,
     return seed_make_null(ctx);
 }
 
-SeedValue seed_mpfr_can_round (SeedContext ctx,
-                               SeedObject function,
-                               SeedObject this_object,
-                               gsize argument_count,
-                               const SeedValue args[],
-                               SeedException *exception)
+SeedValue
+seed_mpfr_can_round(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    gsize argument_count,
+                    const SeedValue args[],
+                    SeedException* exception)
 {
     mpfr_rnd_t rnd1, rnd2;
     mpfr_ptr rop;
@@ -578,13 +577,14 @@ SeedValue seed_mpfr_can_round (SeedContext ctx,
     return seed_value_from_boolean(ctx, ret, exception);
 }
 
-/* init and set functions, using default precision, or optionally specifying it */
+/* init and set functions, using default precision, or optionally specifying it
+ */
 SeedObject
 seed_mpfr_construct_with_set(SeedContext ctx,
                              SeedObject constructor,
                              gsize argument_count,
                              const SeedValue args[],
-                             SeedException*exception)
+                             SeedException* exception)
 {
     mpfr_prec_t prec;
     mpfr_rnd_t rnd;
@@ -595,32 +595,30 @@ seed_mpfr_construct_with_set(SeedContext ctx,
     seed_mpfr_t argt;
 
     /* TODO: Precision range check */
-    switch ( argument_count )
-    {
+    switch (argument_count) {
         case 2:
             prec = mpfr_get_default_prec();
             break;
         case 3:
-            if ( seed_value_is_number(ctx, args[1]) )
-            {
+            if (seed_value_is_number(ctx, args[1])) {
                 prec = seed_value_to_mpfr_prec_t(ctx, args[1], exception);
-            }
-            else
-            {
+            } else {
                 TYPE_EXCEPTION("mpfr constructor with set", "mpfr_prec_t");
             }
             break;
         default:
-            seed_make_exception (ctx, exception, "ArgumentError",
-                                 "mpfr_t constructor.set expected 2 or 3 arguments got %Zd", argument_count);
-            return seed_make_undefined (ctx);
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "mpfr_t constructor.set expected 2 or 3 arguments got %zd",
+              argument_count);
+            return seed_make_undefined(ctx);
     }
 
     /* last argument is always rnd */
-    if ( seed_value_is_number(ctx, args[argument_count - 1]) )
-        rnd = seed_value_to_mpfr_rnd_t(ctx, args[argument_count - 1], exception);
-    else
-    {
+    if (seed_value_is_number(ctx, args[argument_count - 1]))
+        rnd
+          = seed_value_to_mpfr_rnd_t(ctx, args[argument_count - 1], exception);
+    else {
         TYPE_EXCEPTION("mpfr constructor", "mpfr_rnd_t");
     }
 
@@ -629,8 +627,7 @@ seed_mpfr_construct_with_set(SeedContext ctx,
 
     argt = seed_mpfr_arg_type(ctx, args[0], exception);
 
-    switch ( argt )
-    {
+    switch (argt) {
         case SEED_MPFR_MPFR:
             obj = seed_value_to_object(ctx, args[0], exception);
             op = seed_object_get_private(obj);
@@ -646,8 +643,8 @@ seed_mpfr_construct_with_set(SeedContext ctx,
             mpfr_set_str(newmp, str, 10, rnd);
             break;
         default:
-            mpfr_clear( newmp );
-            g_free( newmp );
+            mpfr_clear(newmp);
+            g_free(newmp);
             TYPE_EXCEPTION("mpfr_constructor", "mpfr_t, double or string");
     }
 
@@ -660,41 +657,40 @@ seed_mpfr_construct(SeedContext ctx,
                     SeedObject constructor,
                     gsize argument_count,
                     const SeedValue args[],
-                    SeedException*exception)
+                    SeedException* exception)
 {
     mpfr_prec_t prec;
     mpfr_ptr newmp = (mpfr_ptr) g_malloc(sizeof(mpfr_t));
 
-    switch (argument_count)
-    {
+    switch (argument_count) {
         case 0:
-            mpfr_init(newmp);           /* use default precision */
+            mpfr_init(newmp); /* use default precision */
             break;
         case 1:
-            if ( seed_value_is_number(ctx, args[0]) )
-            {
+            if (seed_value_is_number(ctx, args[0])) {
                 prec = seed_value_to_mpfr_prec_t(ctx, args[0], exception);
                 mpfr_init2(newmp, prec);
-            }
-            else
-            {
-                g_free( newmp );
+            } else {
+                g_free(newmp);
                 TYPE_EXCEPTION("mpfr constructor", "mpfr_prec_t");
             }
             break;
         default:
-            seed_make_exception (ctx, exception, "ArgumentError",
-                                 "mpfr_t constructor expected 0 or 1 arguments got %Zd", argument_count);
-            return seed_make_undefined (ctx);
+            seed_make_exception(
+              ctx, exception, "ArgumentError",
+              "mpfr_t constructor expected 0 or 1 arguments got %zd",
+              argument_count);
+            return seed_make_undefined(ctx);
     }
 
     return seed_make_object(ctx, mpfr_class, newmp);
 }
 
-SeedValue seed_mpfr_get_version (SeedContext ctx,
-                                 SeedObject this_object,
-                                 SeedString property_name,
-                                 SeedException *exception)
+SeedValue
+seed_mpfr_get_version(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
     const gchar* str;
     SeedValue ret;
@@ -705,10 +701,11 @@ SeedValue seed_mpfr_get_version (SeedContext ctx,
     return ret;
 }
 
-SeedValue seed_mpfr_get_patches (SeedContext ctx,
-                                 SeedObject this_object,
-                                 SeedString property_name,
-                                 SeedException *exception)
+SeedValue
+seed_mpfr_get_patches(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
     const gchar* str;
     SeedValue ret;
@@ -719,11 +716,12 @@ SeedValue seed_mpfr_get_patches (SeedContext ctx,
     return ret;
 }
 
-static gboolean seed_mpfr_set_emin (SeedContext ctx,
-                                    SeedObject this_object,
-                                    SeedString property_name,
-                                    SeedValue value,
-                                    SeedException*exception)
+static gboolean
+seed_mpfr_set_emin(SeedContext ctx,
+                   SeedObject this_object,
+                   SeedString property_name,
+                   SeedValue value,
+                   SeedException* exception)
 {
     mp_exp_t exp;
     gint ret;
@@ -734,11 +732,12 @@ static gboolean seed_mpfr_set_emin (SeedContext ctx,
     return ret;
 }
 
-static gboolean seed_mpfr_set_emax (SeedContext ctx,
-                                    SeedObject this_object,
-                                    SeedString property_name,
-                                    SeedValue value,
-                                    SeedException *exception)
+static gboolean
+seed_mpfr_set_emax(SeedContext ctx,
+                   SeedObject this_object,
+                   SeedString property_name,
+                   SeedValue value,
+                   SeedException* exception)
 {
     mp_exp_t exp;
     gint ret;
@@ -749,84 +748,92 @@ static gboolean seed_mpfr_set_emax (SeedContext ctx,
     return ret;
 }
 
-SeedValue seed_mpfr_get_emax (SeedContext ctx,
-                              SeedObject this_object,
-                              SeedString property_name,
-                              SeedException *exception)
+SeedValue
+seed_mpfr_get_emax(SeedContext ctx,
+                   SeedObject this_object,
+                   SeedString property_name,
+                   SeedException* exception)
 {
     mp_exp_t exp;
     exp = mpfr_get_emax();
     return seed_value_from_mp_exp_t(ctx, exp, exception);
 }
 
-SeedValue seed_mpfr_get_emin (SeedContext ctx,
-                              SeedObject this_object,
-                              SeedString property_name,
-                              SeedException* exception)
+SeedValue
+seed_mpfr_get_emin(SeedContext ctx,
+                   SeedObject this_object,
+                   SeedString property_name,
+                   SeedException* exception)
 {
     mp_exp_t exp;
     exp = mpfr_get_emin();
     return seed_value_from_mp_exp_t(ctx, exp, exception);
 }
 
-SeedValue seed_mpfr_get_emin_min (SeedContext ctx,
-                                  SeedObject this_object,
-                                  SeedString property_name,
-                                  SeedException* exception)
+SeedValue
+seed_mpfr_get_emin_min(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
     mp_exp_t exp;
     exp = mpfr_get_emin_min();
     return seed_value_from_mp_exp_t(ctx, exp, exception);
 }
 
-SeedValue seed_mpfr_get_emin_max (SeedContext ctx,
-                                  SeedObject this_object,
-                                  SeedString property_name,
-                                  SeedException* exception)
+SeedValue
+seed_mpfr_get_emin_max(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
     mp_exp_t exp;
     exp = mpfr_get_emin_max();
     return seed_value_from_mp_exp_t(ctx, exp, exception);
 }
 
-SeedValue seed_mpfr_get_emax_min (SeedContext ctx,
-                                  SeedObject this_object,
-                                  SeedString property_name,
-                                  SeedException* exception)
+SeedValue
+seed_mpfr_get_emax_min(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
     mp_exp_t exp;
     exp = mpfr_get_emax_min();
     return seed_value_from_mp_exp_t(ctx, exp, exception);
 }
 
-SeedValue seed_mpfr_get_emax_max (SeedContext ctx,
-                                  SeedObject this_object,
-                                  SeedString property_name,
-                                  SeedException* exception)
+SeedValue
+seed_mpfr_get_emax_max(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
     mp_exp_t exp;
     exp = mpfr_get_emax_max();
     return seed_value_from_mp_exp_t(ctx, exp, exception);
 }
 
-SeedValue seed_mpfr_underflow_p (SeedContext ctx,
-                                 SeedObject this_object,
-                                 SeedString property_name,
-                                 SeedException* exception)
+SeedValue
+seed_mpfr_underflow_p(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedException* exception)
 {
     gint ret = mpfr_underflow_p();
     return seed_value_from_int(ctx, ret, exception);
 }
 
-gboolean seed_mpfr_set_underflow (SeedContext ctx,
-                                  SeedObject this_object,
-                                  SeedString property_name,
-                                  SeedValue value,
-                                  SeedException * exception)
+gboolean
+seed_mpfr_set_underflow(SeedContext ctx,
+                        SeedObject this_object,
+                        SeedString property_name,
+                        SeedValue value,
+                        SeedException* exception)
 {
     gboolean setorclear;
     setorclear = seed_value_to_boolean(ctx, value, exception);
-    if ( setorclear )
+    if (setorclear)
         mpfr_set_underflow();
     else
         mpfr_clear_underflow();
@@ -834,24 +841,26 @@ gboolean seed_mpfr_set_underflow (SeedContext ctx,
     return setorclear;
 }
 
-SeedValue seed_mpfr_overflow_p (SeedContext ctx,
-                                SeedObject this_object,
-                                SeedString property_name,
-                                SeedException* exception)
+SeedValue
+seed_mpfr_overflow_p(SeedContext ctx,
+                     SeedObject this_object,
+                     SeedString property_name,
+                     SeedException* exception)
 {
     gint ret = mpfr_overflow_p();
     return seed_value_from_int(ctx, ret, exception);
 }
 
-gboolean seed_mpfr_set_overflow (SeedContext ctx,
-                                 SeedObject this_object,
-                                 SeedString property_name,
-                                 SeedValue value,
-                                 SeedException *exception)
+gboolean
+seed_mpfr_set_overflow(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedValue value,
+                       SeedException* exception)
 {
     gboolean setorclear;
     setorclear = seed_value_to_boolean(ctx, value, exception);
-    if ( setorclear )
+    if (setorclear)
         mpfr_set_overflow();
     else
         mpfr_clear_overflow();
@@ -859,24 +868,26 @@ gboolean seed_mpfr_set_overflow (SeedContext ctx,
     return setorclear;
 }
 
-SeedValue seed_mpfr_nanflag_p (SeedContext ctx,
-                               SeedObject this_object,
-                               SeedString property_name,
-                               SeedException*exception)
+SeedValue
+seed_mpfr_nanflag_p(SeedContext ctx,
+                    SeedObject this_object,
+                    SeedString property_name,
+                    SeedException* exception)
 {
     gint ret = mpfr_nanflag_p();
     return seed_value_from_int(ctx, ret, exception);
 }
 
-gboolean seed_mpfr_set_nanflag (SeedContext ctx,
-                                SeedObject this_object,
-                                SeedString property_name,
-                                SeedValue value,
-                                SeedException *exception)
+gboolean
+seed_mpfr_set_nanflag(SeedContext ctx,
+                      SeedObject this_object,
+                      SeedString property_name,
+                      SeedValue value,
+                      SeedException* exception)
 {
     gboolean setorclear;
     setorclear = seed_value_to_boolean(ctx, value, exception);
-    if ( setorclear )
+    if (setorclear)
         mpfr_set_nanflag();
     else
         mpfr_clear_nanflag();
@@ -884,24 +895,26 @@ gboolean seed_mpfr_set_nanflag (SeedContext ctx,
     return setorclear;
 }
 
-SeedValue seed_mpfr_inexflag_p (SeedContext ctx,
-                                SeedObject this_object,
-                                SeedString property_name,
-                                SeedException*exception)
+SeedValue
+seed_mpfr_inexflag_p(SeedContext ctx,
+                     SeedObject this_object,
+                     SeedString property_name,
+                     SeedException* exception)
 {
     gint ret = mpfr_inexflag_p();
     return seed_value_from_int(ctx, ret, exception);
 }
 
-gboolean seed_mpfr_set_inexflag (SeedContext ctx,
-                                 SeedObject this_object,
-                                 SeedString property_name,
-                                 SeedValue value,
-                                 SeedException *exception)
+gboolean
+seed_mpfr_set_inexflag(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedValue value,
+                       SeedException* exception)
 {
     gboolean setorclear;
     setorclear = seed_value_to_boolean(ctx, value, exception);
-    if ( setorclear )
+    if (setorclear)
         mpfr_set_inexflag();
     else
         mpfr_clear_inexflag();
@@ -909,24 +922,26 @@ gboolean seed_mpfr_set_inexflag (SeedContext ctx,
     return setorclear;
 }
 
-SeedValue seed_mpfr_erangeflag_p (SeedContext ctx,
-                                  SeedObject this_object,
-                                  SeedString property_name,
-                                  SeedException *exception)
+SeedValue
+seed_mpfr_erangeflag_p(SeedContext ctx,
+                       SeedObject this_object,
+                       SeedString property_name,
+                       SeedException* exception)
 {
     gint ret = mpfr_erangeflag_p();
     return seed_value_from_int(ctx, ret, exception);
 }
 
-gboolean seed_mpfr_set_erangeflag (SeedContext ctx,
-                                   SeedObject this_object,
-                                   SeedString property_name,
-                                   SeedValue value,
-                                   SeedException *exception)
+gboolean
+seed_mpfr_set_erangeflag(SeedContext ctx,
+                         SeedObject this_object,
+                         SeedString property_name,
+                         SeedValue value,
+                         SeedException* exception)
 {
     gboolean setorclear;
     setorclear = seed_value_to_boolean(ctx, value, exception);
-    if ( setorclear )
+    if (setorclear)
         mpfr_set_erangeflag();
     else
         mpfr_clear_erangeflag();
@@ -935,12 +950,12 @@ gboolean seed_mpfr_set_erangeflag (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_subnormalize (SeedContext ctx,
-                        SeedObject function,
-                        SeedObject this_object,
-                        gsize argument_count,
-                        const SeedValue args[],
-                        SeedException *exception)
+seed_mpfr_subnormalize(SeedContext ctx,
+                       SeedObject function,
+                       SeedObject this_object,
+                       gsize argument_count,
+                       const SeedValue args[],
+                       SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -958,12 +973,12 @@ seed_mpfr_subnormalize (SeedContext ctx,
 }
 
 static SeedValue
-seed_mpfr_check_range (SeedContext ctx,
-                       SeedObject function,
-                       SeedObject this_object,
-                       gsize argument_count,
-                       const SeedValue args[],
-                       SeedException *exception)
+seed_mpfr_check_range(SeedContext ctx,
+                      SeedObject function,
+                      SeedObject this_object,
+                      gsize argument_count,
+                      const SeedValue args[],
+                      SeedException* exception)
 {
     mpfr_rnd_t rnd;
     mpfr_ptr rop;
@@ -980,158 +995,167 @@ seed_mpfr_check_range (SeedContext ctx,
     return seed_value_from_int(ctx, ret, exception);
 }
 
-seed_static_value mpfr_ns_values[] =
-{
-    {"default_rounding_mode", seed_mpfr_get_default_rounding_mode, seed_mpfr_set_default_rounding_mode, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"emax", seed_mpfr_get_emax, seed_mpfr_set_emax, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"emin", seed_mpfr_get_emin, seed_mpfr_set_emin, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"emin_min", seed_mpfr_get_emin_min, NULL, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"emin_max", seed_mpfr_get_emin_max, NULL, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"emax_min", seed_mpfr_get_emax_min, NULL, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"emax_max", seed_mpfr_get_emax_max, NULL, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"underflow", seed_mpfr_underflow_p, seed_mpfr_set_underflow, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"overflow", seed_mpfr_overflow_p, seed_mpfr_set_overflow, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"nanflag", seed_mpfr_nanflag_p, seed_mpfr_set_nanflag, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"inexflag", seed_mpfr_inexflag_p, seed_mpfr_set_inexflag, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"erangeflag", seed_mpfr_erangeflag_p, seed_mpfr_set_erangeflag, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"version", seed_mpfr_get_version, NULL, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"patches", seed_mpfr_get_patches, NULL, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {NULL, NULL, NULL, 0}
-};
-
-seed_static_function mpfr_ns_funcs[] =
-{
-    {"free_cache", seed_mpfr_free_cache, 0},
-    {"clear_flags", seed_mpfr_clear_flags, 0},
-    {NULL, NULL, 0}
-};
-
-seed_static_function mpfr_funcs[] =
-{
-    {"add", seed_mpfr_add, 0},
-    {"sub", seed_mpfr_sub, 0},
-    {"mul", seed_mpfr_mul, 0},
-    {"div", seed_mpfr_div, 0},
-    {"sqrt", seed_mpfr_sqrt, 0},
-    {"sqr", seed_mpfr_sqr, 0},
-    {"pow", seed_mpfr_pow, 0},
-    {"mul_2si", seed_mpfr_mul_2si, 0},
-    {"div_2si", seed_mpfr_div_2si, 0},
-    {"root", seed_mpfr_root, 0},
-    {"rec_sqrt", seed_mpfr_rec_sqrt, 0},
-    {"cbrt", seed_mpfr_cbrt, 0},
-    {"neg", seed_mpfr_neg, 0},
-    {"abs", seed_mpfr_abs, 0},
-    {"rint", seed_mpfr_rint, 0},
-    {"ceil", seed_mpfr_ceil, 0},
-    {"floor", seed_mpfr_floor, 0},
-    {"round", seed_mpfr_round, 0},
-    {"trunc", seed_mpfr_trunc, 0},
-    {"prec_round", seed_mpfr_prec_round, 0},
-    {"can_round", seed_mpfr_can_round, 0},
-    {"signbit", seed_mpfr_signbit, 0},
-    {"setsign", seed_mpfr_setsign, 0},
-    {"copysign", seed_mpfr_copysign, 0},
-    {"nexttoward", seed_mpfr_nexttoward, 0},
-    {"nextabove", seed_mpfr_nextabove, 0},
-    {"nextbelow", seed_mpfr_nextbelow, 0},
-    {"rint_ceil", seed_mpfr_rint_ceil, 0},
-    {"rint_floor", seed_mpfr_rint_floor, 0},
-    {"rint_round", seed_mpfr_rint_round, 0},
-    {"rint_trunc", seed_mpfr_rint_trunc, 0},
-    {"min", seed_mpfr_min, 0},
-    {"max", seed_mpfr_max, 0},
-    {"frac", seed_mpfr_frac, 0},
-    {"fmod", seed_mpfr_fmod, 0},
-    {"remainder", seed_mpfr_remainder, 0},
-    {"integer_p", seed_mpfr_integer_p, 0},
-    {"dim", seed_mpfr_dim, 0},
-    {"sin", seed_mpfr_sin, 0},
-    {"cos", seed_mpfr_cos, 0},
-    {"tan", seed_mpfr_tan, 0},
-    {"asin", seed_mpfr_asin, 0},
-    {"acos", seed_mpfr_acos, 0},
-    {"atan", seed_mpfr_atan, 0},
-    {"csc", seed_mpfr_csc, 0},
-    {"sec", seed_mpfr_sec, 0},
-    {"cot", seed_mpfr_cot, 0},
-    {"log", seed_mpfr_log, 0},
-    {"log2", seed_mpfr_log2, 0},
-    {"log10", seed_mpfr_log10, 0},
-    {"sinh", seed_mpfr_sinh, 0},
-    {"cosh", seed_mpfr_cosh, 0},
-    {"tanh", seed_mpfr_tanh, 0},
-    {"csch", seed_mpfr_csch, 0},
-    {"sech", seed_mpfr_sech, 0},
-    {"coth", seed_mpfr_coth, 0},
-    {"asinh", seed_mpfr_asinh, 0},
-    {"acosh", seed_mpfr_acosh, 0},
-    {"atanh", seed_mpfr_atanh, 0},
-    {"log1p", seed_mpfr_log1p, 0},
-    {"expm1", seed_mpfr_expm1, 0},
-    {"li2", seed_mpfr_li2, 0},
-    {"gamma", seed_mpfr_gamma, 0},
-    {"lngamma", seed_mpfr_lngamma, 0},
-    {"zeta", seed_mpfr_zeta, 0},
-    {"erf", seed_mpfr_erf, 0},
-    {"erfc", seed_mpfr_erfc, 0},
-    {"j0", seed_mpfr_j0, 0},
-    {"j1", seed_mpfr_j1, 0},
-    {"jn", seed_mpfr_jn, 0},
-    {"y0", seed_mpfr_y0, 0},
-    {"y1", seed_mpfr_y1, 0},
-    {"yn", seed_mpfr_yn, 0},
-    {"fma", seed_mpfr_fma, 0},
-    {"fms", seed_mpfr_fms, 0},
-    {"agm", seed_mpfr_agm, 0},
-    {"hypot", seed_mpfr_hypot, 0},
-    {"set", seed_mpfr_set, 0},
-    {"set_inf", seed_mpfr_set_inf, 0},
-    {"set_nan", seed_mpfr_set_nan, 0},
-    {"swap", seed_mpfr_swap, 0},
-    {"cmp", seed_mpfr_cmp, 0},
-    {"cmpabs", seed_mpfr_cmpabs, 0},
-    {"cmp_si_2exp", seed_mpfr_cmp_si_2exp, 0},
-    {"greater_p", seed_mpfr_greater_p, 0},
-    {"greaterequal_p", seed_mpfr_greaterequal_p, 0},
-    {"less_p", seed_mpfr_less_p, 0},
-    {"lessequal_p", seed_mpfr_lessequal_p, 0},
-    {"lessgreater_p", seed_mpfr_lessgreater_p, 0},
-    {"equal_p", seed_mpfr_equal_p, 0},
-    {"unordered_p", seed_mpfr_unordered_p, 0},
-    {"nan_p", seed_mpfr_nan_p, 0},
-    {"inf_p", seed_mpfr_inf_p, 0},
-    {"number_p", seed_mpfr_number_p, 0},
-    {"zero_p", seed_mpfr_zero_p, 0},
-    {"sgn", seed_mpfr_sgn, 0},
-    {"get_d", seed_mpfr_get_d, 0},
-    {"fits_ulong_p", seed_mpfr_fits_ulong_p, 0},
-    {"fits_slong_p", seed_mpfr_fits_slong_p, 0},
-    {"fits_uint_p", seed_mpfr_fits_uint_p, 0},
-    {"fits_sint_p", seed_mpfr_fits_sint_p, 0},
-    {"fits_ushort_p", seed_mpfr_fits_ushort_p, 0},
-    {"fits_sshort_p", seed_mpfr_fits_sshort_p, 0},
-    {"fits_intmax_p", seed_mpfr_fits_intmax_p, 0},
-    {"fits_uintmax_p", seed_mpfr_fits_uintmax_p, 0},
-    {"out_str", seed_mpfr_out_str, 0},
-    {"print", seed_mpfr_print, 0},
-    {"pi", seed_mpfr_const_pi, 0},
-    {"euler", seed_mpfr_const_euler, 0},
-    {"catalan", seed_mpfr_const_catalan, 0},
-    {"subnormalize", seed_mpfr_subnormalize, 0},
-    {"check_range", seed_mpfr_check_range, 0},
-    {NULL, NULL, 0}
-};
-
-seed_static_value mpfr_values[] =
-{
-    {"prec", seed_mpfr_get_prec, seed_mpfr_set_prec, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {"exp", seed_mpfr_get_exp, seed_mpfr_set_exp, SEED_PROPERTY_ATTRIBUTE_DONT_DELETE},
-    {NULL, NULL, NULL, 0}
-};
+seed_static_value mpfr_ns_values[]
+  = { { "default_rounding_mode", seed_mpfr_get_default_rounding_mode,
+        seed_mpfr_set_default_rounding_mode,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "emax", seed_mpfr_get_emax, seed_mpfr_set_emax,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "emin", seed_mpfr_get_emin, seed_mpfr_set_emin,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "emin_min", seed_mpfr_get_emin_min, NULL,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "emin_max", seed_mpfr_get_emin_max, NULL,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "emax_min", seed_mpfr_get_emax_min, NULL,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "emax_max", seed_mpfr_get_emax_max, NULL,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "underflow", seed_mpfr_underflow_p, seed_mpfr_set_underflow,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "overflow", seed_mpfr_overflow_p, seed_mpfr_set_overflow,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "nanflag", seed_mpfr_nanflag_p, seed_mpfr_set_nanflag,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "inexflag", seed_mpfr_inexflag_p, seed_mpfr_set_inexflag,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "erangeflag", seed_mpfr_erangeflag_p, seed_mpfr_set_erangeflag,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "version", seed_mpfr_get_version, NULL,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "patches", seed_mpfr_get_patches, NULL,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { NULL, NULL, NULL, 0 } };
+
+seed_static_function mpfr_ns_funcs[]
+  = { { "free_cache", seed_mpfr_free_cache, 0 },
+      { "clear_flags", seed_mpfr_clear_flags, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_function mpfr_funcs[]
+  = { { "add", seed_mpfr_add, 0 },
+      { "sub", seed_mpfr_sub, 0 },
+      { "mul", seed_mpfr_mul, 0 },
+      { "div", seed_mpfr_div, 0 },
+      { "sqrt", seed_mpfr_sqrt, 0 },
+      { "sqr", seed_mpfr_sqr, 0 },
+      { "pow", seed_mpfr_pow, 0 },
+      { "mul_2si", seed_mpfr_mul_2si, 0 },
+      { "div_2si", seed_mpfr_div_2si, 0 },
+      { "root", seed_mpfr_root, 0 },
+      { "rec_sqrt", seed_mpfr_rec_sqrt, 0 },
+      { "cbrt", seed_mpfr_cbrt, 0 },
+      { "neg", seed_mpfr_neg, 0 },
+      { "abs", seed_mpfr_abs, 0 },
+      { "rint", seed_mpfr_rint, 0 },
+      { "ceil", seed_mpfr_ceil, 0 },
+      { "floor", seed_mpfr_floor, 0 },
+      { "round", seed_mpfr_round, 0 },
+      { "trunc", seed_mpfr_trunc, 0 },
+      { "prec_round", seed_mpfr_prec_round, 0 },
+      { "can_round", seed_mpfr_can_round, 0 },
+      { "signbit", seed_mpfr_signbit, 0 },
+      { "setsign", seed_mpfr_setsign, 0 },
+      { "copysign", seed_mpfr_copysign, 0 },
+      { "nexttoward", seed_mpfr_nexttoward, 0 },
+      { "nextabove", seed_mpfr_nextabove, 0 },
+      { "nextbelow", seed_mpfr_nextbelow, 0 },
+      { "rint_ceil", seed_mpfr_rint_ceil, 0 },
+      { "rint_floor", seed_mpfr_rint_floor, 0 },
+      { "rint_round", seed_mpfr_rint_round, 0 },
+      { "rint_trunc", seed_mpfr_rint_trunc, 0 },
+      { "min", seed_mpfr_min, 0 },
+      { "max", seed_mpfr_max, 0 },
+      { "frac", seed_mpfr_frac, 0 },
+      { "fmod", seed_mpfr_fmod, 0 },
+      { "remainder", seed_mpfr_remainder, 0 },
+      { "integer_p", seed_mpfr_integer_p, 0 },
+      { "dim", seed_mpfr_dim, 0 },
+      { "sin", seed_mpfr_sin, 0 },
+      { "cos", seed_mpfr_cos, 0 },
+      { "tan", seed_mpfr_tan, 0 },
+      { "asin", seed_mpfr_asin, 0 },
+      { "acos", seed_mpfr_acos, 0 },
+      { "atan", seed_mpfr_atan, 0 },
+      { "csc", seed_mpfr_csc, 0 },
+      { "sec", seed_mpfr_sec, 0 },
+      { "cot", seed_mpfr_cot, 0 },
+      { "log", seed_mpfr_log, 0 },
+      { "log2", seed_mpfr_log2, 0 },
+      { "log10", seed_mpfr_log10, 0 },
+      { "sinh", seed_mpfr_sinh, 0 },
+      { "cosh", seed_mpfr_cosh, 0 },
+      { "tanh", seed_mpfr_tanh, 0 },
+      { "csch", seed_mpfr_csch, 0 },
+      { "sech", seed_mpfr_sech, 0 },
+      { "coth", seed_mpfr_coth, 0 },
+      { "asinh", seed_mpfr_asinh, 0 },
+      { "acosh", seed_mpfr_acosh, 0 },
+      { "atanh", seed_mpfr_atanh, 0 },
+      { "log1p", seed_mpfr_log1p, 0 },
+      { "expm1", seed_mpfr_expm1, 0 },
+      { "li2", seed_mpfr_li2, 0 },
+      { "gamma", seed_mpfr_gamma, 0 },
+      { "lngamma", seed_mpfr_lngamma, 0 },
+      { "zeta", seed_mpfr_zeta, 0 },
+      { "erf", seed_mpfr_erf, 0 },
+      { "erfc", seed_mpfr_erfc, 0 },
+      { "j0", seed_mpfr_j0, 0 },
+      { "j1", seed_mpfr_j1, 0 },
+      { "jn", seed_mpfr_jn, 0 },
+      { "y0", seed_mpfr_y0, 0 },
+      { "y1", seed_mpfr_y1, 0 },
+      { "yn", seed_mpfr_yn, 0 },
+      { "fma", seed_mpfr_fma, 0 },
+      { "fms", seed_mpfr_fms, 0 },
+      { "agm", seed_mpfr_agm, 0 },
+      { "hypot", seed_mpfr_hypot, 0 },
+      { "set", seed_mpfr_set, 0 },
+      { "set_inf", seed_mpfr_set_inf, 0 },
+      { "set_nan", seed_mpfr_set_nan, 0 },
+      { "swap", seed_mpfr_swap, 0 },
+      { "cmp", seed_mpfr_cmp, 0 },
+      { "cmpabs", seed_mpfr_cmpabs, 0 },
+      { "cmp_si_2exp", seed_mpfr_cmp_si_2exp, 0 },
+      { "greater_p", seed_mpfr_greater_p, 0 },
+      { "greaterequal_p", seed_mpfr_greaterequal_p, 0 },
+      { "less_p", seed_mpfr_less_p, 0 },
+      { "lessequal_p", seed_mpfr_lessequal_p, 0 },
+      { "lessgreater_p", seed_mpfr_lessgreater_p, 0 },
+      { "equal_p", seed_mpfr_equal_p, 0 },
+      { "unordered_p", seed_mpfr_unordered_p, 0 },
+      { "nan_p", seed_mpfr_nan_p, 0 },
+      { "inf_p", seed_mpfr_inf_p, 0 },
+      { "number_p", seed_mpfr_number_p, 0 },
+      { "zero_p", seed_mpfr_zero_p, 0 },
+      { "sgn", seed_mpfr_sgn, 0 },
+      { "get_d", seed_mpfr_get_d, 0 },
+      { "fits_ulong_p", seed_mpfr_fits_ulong_p, 0 },
+      { "fits_slong_p", seed_mpfr_fits_slong_p, 0 },
+      { "fits_uint_p", seed_mpfr_fits_uint_p, 0 },
+      { "fits_sint_p", seed_mpfr_fits_sint_p, 0 },
+      { "fits_ushort_p", seed_mpfr_fits_ushort_p, 0 },
+      { "fits_sshort_p", seed_mpfr_fits_sshort_p, 0 },
+      { "fits_intmax_p", seed_mpfr_fits_intmax_p, 0 },
+      { "fits_uintmax_p", seed_mpfr_fits_uintmax_p, 0 },
+      { "out_str", seed_mpfr_out_str, 0 },
+      { "print", seed_mpfr_print, 0 },
+      { "pi", seed_mpfr_const_pi, 0 },
+      { "euler", seed_mpfr_const_euler, 0 },
+      { "catalan", seed_mpfr_const_catalan, 0 },
+      { "subnormalize", seed_mpfr_subnormalize, 0 },
+      { "check_range", seed_mpfr_check_range, 0 },
+      { NULL, NULL, 0 } };
+
+seed_static_value mpfr_values[]
+  = { { "prec", seed_mpfr_get_prec, seed_mpfr_set_prec,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { "exp", seed_mpfr_get_exp, seed_mpfr_set_exp,
+        SEED_PROPERTY_ATTRIBUTE_DONT_DELETE },
+      { NULL, NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine *local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
     SeedGlobalContext ctx = local_eng->context;
     seed_class_definition mpfr_def = seed_empty_class;
@@ -1154,11 +1178,14 @@ seed_module_init(SeedEngine *local_eng)
 
     mpfr_class = seed_create_class(&mpfr_def);
 
-    mpfr_constructor = seed_make_constructor(ctx, mpfr_class, seed_mpfr_construct);
-    mpfr_constructor_set = seed_make_constructor(ctx, mpfr_class, seed_mpfr_construct_with_set);
+    mpfr_constructor
+      = seed_make_constructor(ctx, mpfr_class, seed_mpfr_construct);
+    mpfr_constructor_set
+      = seed_make_constructor(ctx, mpfr_class, seed_mpfr_construct_with_set);
 
     seed_object_set_property(ctx, ns_ref, "mpfr_t", mpfr_constructor);
-    seed_object_set_property(ctx, mpfr_constructor, "set", mpfr_constructor_set);
+    seed_object_set_property(ctx, mpfr_constructor, "set",
+                             mpfr_constructor_set);
 
     /* Setup enums */
     DEFINE_ENUM_MEMBER(ns_ref, GMP_RNDN);
@@ -1168,9 +1195,11 @@ seed_module_init(SeedEngine *local_eng)
 
     DEFINE_ENUM_MEMBER_EXT(ns_ref, "VERSION_MAJOR", MPFR_VERSION_MAJOR);
     DEFINE_ENUM_MEMBER_EXT(ns_ref, "VERSION_MINOR", MPFR_VERSION_MINOR);
-    DEFINE_ENUM_MEMBER_EXT(ns_ref, "VERSION_PATCHLEVEL", MPFR_VERSION_PATCHLEVEL);
+    DEFINE_ENUM_MEMBER_EXT(ns_ref, "VERSION_PATCHLEVEL",
+                           MPFR_VERSION_PATCHLEVEL);
     seed_object_set_property(ctx, ns_ref, "VERSION_STRING",
-                             seed_value_from_string(ctx, MPFR_VERSION_STRING, NULL));
+                             seed_value_from_string(ctx, MPFR_VERSION_STRING,
+                                                    NULL));
 
     DEFINE_ENUM_MEMBER_EXT(ns_ref, "PREC_MIN", MPFR_PREC_MIN);
     DEFINE_ENUM_MEMBER_EXT(ns_ref, "PREC_MAX", MPFR_PREC_MAX);
@@ -1185,4 +1214,3 @@ seed_module_init(SeedEngine *local_eng)
 
     return ns_ref;
 }
-
diff --git a/modules/mpfr/seed-mpfr.h b/modules/mpfr/seed-mpfr.h
index 35ed94c..a7ad1a4 100644
--- a/modules/mpfr/seed-mpfr.h
+++ b/modules/mpfr/seed-mpfr.h
@@ -4,26 +4,27 @@
 #include <seed-module.h>
 #include <seed.h>
 
-#define TYPE_EXCEPTION(name, wanted) \
-    seed_make_exception(ctx, exception, "TypeError", name " expected " wanted ); \
+#define TYPE_EXCEPTION(name, wanted)                                           \
+    seed_make_exception(ctx, exception, "TypeError",                           \
+                        name " expected " wanted);                             \
     return seed_make_undefined(ctx);
 
 #if 0 /* TODO: Make this work */
 /* kind of stupid hack */
 #if MPFR_PREC_MAX == G_MAXLONG
-    #define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_ulong(a, b, c)
-    #define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_ulong(a, b, c)
+#define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_ulong(a, b, c)
+#define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_ulong(a, b, c)
 #elif MPFR_PREC_MAX == G_MAXUSHORT
-    #define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_ushort(a, b, c)
-    #define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_ushort(a, b, c)
+#define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_ushort(a, b, c)
+#define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_ushort(a, b, c)
 #elif MPFR_PREC_MAX == G_MAXINT
-    #define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_int(a, b, c)
-    #define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_int(a, b, c)
+#define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_int(a, b, c)
+#define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_int(a, b, c)
 #elif MPFR_PREC_MAX == G_MAXUINT64
-    #define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_uint64(a, b, c)
-    #define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_uint64(a, b, c)
+#define seed_value_to_mpfr_prec_t(a, b, c) seed_value_to_uint64(a, b, c)
+#define seed_value_from_mpfr_prec_t(a, b, c) seed_value_from_uint64(a, b, c)
 #else
-    #error "Wrong mpfr_prec_t size somehow?"
+#error "Wrong mpfr_prec_t size somehow?"
 #endif
 #endif
 
@@ -37,22 +38,21 @@
 #define seed_value_from_mp_exp_t(a, b, c) seed_value_from_ulong(a, b, c)
 #define seed_value_to_mp_exp_t(a, b, c) seed_value_to_ulong(a, b, c)
 
-
-#define DEF_SEED_MPFR_FUNC(name) SeedValue name( SeedContext,SeedObject,\
-SeedObject, gsize, const SeedValue[], SeedException*)
+#define DEF_SEED_MPFR_FUNC(name)                                               \
+    SeedValue name(SeedContext, SeedObject, SeedObject, gsize,                 \
+                   const SeedValue[], SeedException*)
 
 extern SeedObject ns_ref;
 extern SeedClass mpfr_class;
 
-typedef enum _seed_mpfr_t
-{
+typedef enum _seed_mpfr_t {
     SEED_MPFR_UNKNOWN = 0,
     SEED_MPFR_MPFR = 1 << 1,
     SEED_MPFR_DOUBLE = 1 << 2,
     SEED_MPFR_STRING = 1 << 3,
 } seed_mpfr_t;
 
-inline seed_mpfr_t seed_mpfr_arg_type(SeedContext, SeedValue, SeedException);
+seed_mpfr_t seed_mpfr_arg_type(SeedContext, SeedValue, SeedException);
 
 DEF_SEED_MPFR_FUNC(seed_mpfr_neg);
 DEF_SEED_MPFR_FUNC(seed_mpfr_abs);
@@ -170,6 +170,4 @@ DEF_SEED_MPFR_FUNC(seed_mpfr_hypot);
 DEF_SEED_MPFR_FUNC(seed_mpfr_free_cache);
 DEF_SEED_MPFR_FUNC(seed_mpfr_clear_flags);
 
-
-#endif      /* _SEED_MFPR_H_ */
-
+#endif /* _SEED_MFPR_H_ */
diff --git a/modules/multiprocessing/Makefile.in b/modules/multiprocessing/Makefile.in
index 4f2c0f6..1ef93a7 100644
--- a/modules/multiprocessing/Makefile.in
+++ b/modules/multiprocessing/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/multiprocessing
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -100,12 +141,25 @@ libseed_multiprocessing_la_OBJECTS =  \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_multiprocessing_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_multiprocessing_la_CFLAGS) $(CFLAGS) \
 	$(libseed_multiprocessing_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MULTIPROCESSING_MODULE_TRUE@am_libseed_multiprocessing_la_rpath =  \
 @BUILD_MULTIPROCESSING_MODULE_TRUE@	-rpath $(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -118,20 +172,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_multiprocessing_la_SOURCES)
 DIST_SOURCES = $(am__libseed_multiprocessing_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -139,8 +189,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -204,6 +272,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -217,6 +287,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -240,8 +311,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -253,6 +333,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -347,6 +428,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -393,7 +475,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/multiprocessing/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/multiprocessing/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -411,6 +492,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -437,12 +519,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_multiprocessing.la: $(libseed_multiprocessing_la_OBJECTS) $(libseed_multiprocessing_la_DEPENDENCIES) $(EXTRA_libseed_multiprocessing_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_multiprocessing_la_LINK) $(am_libseed_multiprocessing_la_rpath) $(libseed_multiprocessing_la_OBJECTS) $(libseed_multiprocessing_la_LIBADD) $(LIBS)
 
@@ -459,14 +544,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -488,26 +573,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -519,15 +593,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -536,6 +606,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -680,19 +765,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/multiprocessing/seed-multiprocessing.c b/modules/multiprocessing/seed-multiprocessing.c
index 38d0655..4cce55c 100644
--- a/modules/multiprocessing/seed-multiprocessing.c
+++ b/modules/multiprocessing/seed-multiprocessing.c
@@ -22,191 +22,194 @@
 #include <unistd.h>
 #include <stdio.h>
 
-SeedEngine *eng;
+SeedEngine* eng;
 SeedObject namespace_ref;
 SeedClass pipe_class;
 
-typedef struct _pipe_priv {
-  GIOChannel *read;
-  GIOChannel *write;
+typedef struct _pipe_priv
+{
+    GIOChannel* read;
+    GIOChannel* write;
 } pipe_priv;
 
-void pipe_finalize(SeedObject pipeobj)
+void
+pipe_finalize(SeedObject pipeobj)
 {
-  pipe_priv *priv = seed_object_get_private(pipeobj);
-  g_io_channel_unref(priv->read);
-  g_io_channel_unref(priv->write);
-  g_free(priv);
+    pipe_priv* priv = seed_object_get_private(pipeobj);
+    g_io_channel_unref(priv->read);
+    g_io_channel_unref(priv->write);
+    g_free(priv);
 }
 
-SeedObject seed_construct_pipe(SeedContext ctx,
-			       SeedObject constructor,
-			       size_t argument_count,
-			       const SeedValue arguments[],
-			       SeedException * exception)
+SeedObject
+seed_construct_pipe(SeedContext ctx,
+                    SeedObject constructor,
+                    size_t argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  SeedObject jsone, jstwo, jsret;
-  int fd1[2], fd2[2];
-  pipe_priv *priv_one, *priv_two;
-  
-  CHECK_ARG_COUNT("multiprocessing.pipe constructor", 0);
-
-  if (pipe(fd1) < 0)
-    {
-      perror("Pipe failed. Make me a javascript exception");
-      return seed_make_null(ctx);
+    SeedObject jsone, jstwo, jsret;
+    int fd1[2], fd2[2];
+    pipe_priv *priv_one, *priv_two;
+
+    CHECK_ARG_COUNT("multiprocessing.pipe constructor", 0);
+
+    if (pipe(fd1) < 0) {
+        perror("Pipe failed. Make me a javascript exception");
+        return seed_make_null(ctx);
     }
-  if (pipe(fd2) < 0)
-    {
-      perror("Pipe failed. Make me a javascript exception");
-      return seed_make_null(ctx);
+    if (pipe(fd2) < 0) {
+        perror("Pipe failed. Make me a javascript exception");
+        return seed_make_null(ctx);
     }
 
-  priv_one = g_new0(pipe_priv, 1);
-  priv_two = g_new0(pipe_priv, 1);
+    priv_one = g_new0(pipe_priv, 1);
+    priv_two = g_new0(pipe_priv, 1);
 
-  priv_one->read = g_io_channel_unix_new(fd1[0]);
-  priv_one->write = g_io_channel_unix_new(fd2[1]);
-  priv_two->read = g_io_channel_unix_new(fd2[0]);
-  priv_two->write = g_io_channel_unix_new(fd1[1]);
+    priv_one->read = g_io_channel_unix_new(fd1[0]);
+    priv_one->write = g_io_channel_unix_new(fd2[1]);
+    priv_two->read = g_io_channel_unix_new(fd2[0]);
+    priv_two->write = g_io_channel_unix_new(fd1[1]);
 
-  g_io_channel_set_close_on_unref(priv_one->read, TRUE);
-  g_io_channel_set_close_on_unref(priv_one->write, TRUE);
-  g_io_channel_set_close_on_unref(priv_two->read, TRUE);
-  g_io_channel_set_close_on_unref(priv_two->write, TRUE);
+    g_io_channel_set_close_on_unref(priv_one->read, TRUE);
+    g_io_channel_set_close_on_unref(priv_one->write, TRUE);
+    g_io_channel_set_close_on_unref(priv_two->read, TRUE);
+    g_io_channel_set_close_on_unref(priv_two->write, TRUE);
 
-  jsret = seed_make_object(ctx, 0, 0);
-  jsone = seed_make_object(ctx, pipe_class, priv_one);
-  jstwo = seed_make_object(ctx, pipe_class, priv_two);
+    jsret = seed_make_object(ctx, 0, 0);
+    jsone = seed_make_object(ctx, pipe_class, priv_one);
+    jstwo = seed_make_object(ctx, pipe_class, priv_two);
 
-  seed_object_set_property_at_index(ctx, jsret, 0, jsone, exception);
-  seed_object_set_property_at_index(ctx, jsret, 1, jstwo, exception);
+    seed_object_set_property_at_index(ctx, jsret, 0, jsone, exception);
+    seed_object_set_property_at_index(ctx, jsret, 1, jstwo, exception);
 
-  return jsret;
+    return jsret;
 }
 
-#define GET_CHANNEL pipe_priv * priv =		\
-    seed_object_get_private(this_object)
+#define GET_CHANNEL pipe_priv* priv = seed_object_get_private(this_object)
 
-SeedValue seed_pipe_read(SeedContext ctx,
-			 SeedObject function,
-			 SeedObject this_object,
-			 size_t argument_count,
-			 const SeedValue arguments[], SeedException * exception)
+SeedValue
+seed_pipe_read(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  SeedValue ret;
-  gchar *read;
-  GET_CHANNEL;
-  
-  CHECK_ARG_COUNT("multiprocessing.pipe.read", 0);
+    SeedValue ret;
+    gchar* read;
+    GET_CHANNEL;
+
+    CHECK_ARG_COUNT("multiprocessing.pipe.read", 0);
 
-  g_io_channel_read_line(priv->read, &read, 0, 0, 0);
-  ret = seed_value_from_string(ctx, read, exception);
-  g_free(read);
+    g_io_channel_read_line(priv->read, &read, 0, 0, 0);
+    ret = seed_value_from_string(ctx, read, exception);
+    g_free(read);
 
-  return ret;
+    return ret;
 }
 
-typedef struct _marshal_privates {
-  SeedObject function;
-  SeedObject source;
-  SeedValue user_data;
+typedef struct _marshal_privates
+{
+    SeedObject function;
+    SeedObject source;
+    SeedValue user_data;
 } marshal_privates;
 
-static gboolean gio_marshal_func(GIOChannel * source,
-				 GIOCondition condition, gpointer data)
+static gboolean
+gio_marshal_func(GIOChannel* source, GIOCondition condition, gpointer data)
 {
-  SeedGlobalContext ctx = seed_context_create(eng->group, 0);
-  SeedValue jscondition = seed_value_from_long(ctx, (glong) condition, 0);
-  SeedValue args[3], ret;
-  marshal_privates *priv = (marshal_privates *) data;
-  gboolean bret;
+    SeedGlobalContext ctx = seed_context_create(eng->group, 0);
+    SeedValue jscondition = seed_value_from_long(ctx, (glong) condition, 0);
+    SeedValue args[3], ret;
+    marshal_privates* priv = (marshal_privates*) data;
+    gboolean bret;
 
-  args[0] = priv->source;
-  args[1] = jscondition;
-  args[2] = priv->user_data;
+    args[0] = priv->source;
+    args[1] = jscondition;
+    args[2] = priv->user_data;
 
-  ret = seed_object_call(ctx, priv->function, 0, 3, args, 0);
+    ret = seed_object_call(ctx, priv->function, 0, 3, args, 0);
 
-  bret = seed_value_to_boolean(ctx, ret, 0);
-  seed_context_unref(ctx);
+    bret = seed_value_to_boolean(ctx, ret, 0);
+    seed_context_unref(ctx);
 
-  if (!bret)
-    g_free(priv);
+    if (!bret)
+        g_free(priv);
 
-  return bret;
+    return bret;
 }
 
-SeedValue seed_pipe_write(SeedContext ctx,
-			  SeedObject function,
-			  SeedObject this_object,
-			  size_t argument_count,
-			  const SeedValue arguments[],
-			  SeedException * exception)
+SeedValue
+seed_pipe_write(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  gchar *data;
-  gsize written;
-  gchar eol = '\n';
-  GET_CHANNEL;
-  
-  CHECK_ARG_COUNT("multiprocessing.pipe.write", 1);
-
-  data = seed_value_to_string(ctx, arguments[0], exception);
-  g_io_channel_write_chars(priv->write, data, -1, &written, 0);
-  g_io_channel_write_chars(priv->write, &eol, 1, 0, 0);
-  g_io_channel_flush(priv->write, 0);
-
-  return seed_value_from_int(ctx, written, exception);
+    gchar* data;
+    gsize written;
+    gchar eol = '\n';
+    GET_CHANNEL;
+
+    CHECK_ARG_COUNT("multiprocessing.pipe.write", 1);
+
+    data = seed_value_to_string(ctx, arguments[0], exception);
+    g_io_channel_write_chars(priv->write, data, -1, &written, 0);
+    g_io_channel_write_chars(priv->write, &eol, 1, 0, 0);
+    g_io_channel_flush(priv->write, 0);
+
+    return seed_value_from_int(ctx, written, exception);
 }
 
-SeedValue seed_pipe_add_watch(SeedContext ctx,
-			      SeedObject function,
-			      SeedObject this_object,
-			      size_t argument_count,
-			      const SeedValue arguments[],
-			      SeedException * exception)
+SeedValue
+seed_pipe_add_watch(SeedContext ctx,
+                    SeedObject function,
+                    SeedObject this_object,
+                    size_t argument_count,
+                    const SeedValue arguments[],
+                    SeedException* exception)
 {
-  GET_CHANNEL;
-  
-  marshal_privates *mpriv = g_malloc0(sizeof(marshal_privates));
-  glong condition = seed_value_to_long(ctx, arguments[0], exception);
+    GET_CHANNEL;
+
+    marshal_privates* mpriv = g_malloc0(sizeof(marshal_privates));
+    glong condition = seed_value_to_long(ctx, arguments[0], exception);
 
-  mpriv->function = arguments[1];
-  mpriv->source = this_object;
-  mpriv->user_data = argument_count == 3 ? arguments[2] : seed_make_null(ctx);
+    mpriv->function = arguments[1];
+    mpriv->source = this_object;
+    mpriv->user_data = argument_count == 3 ? arguments[2] : seed_make_null(ctx);
 
-  g_io_add_watch(priv->read, condition, gio_marshal_func, mpriv);
+    g_io_add_watch(priv->read, condition, gio_marshal_func, mpriv);
 
-  return seed_value_from_boolean(ctx, TRUE, exception);
+    return seed_value_from_boolean(ctx, TRUE, exception);
 }
 
-seed_static_function pipe_funcs[] = {
-  {"read", seed_pipe_read, 0},
-  {"write", seed_pipe_write, 0},
-  {"add_watch", seed_pipe_add_watch, 0},
-  {NULL, NULL, 0}
-};
+seed_static_function pipe_funcs[] = { { "read", seed_pipe_read, 0 },
+                                      { "write", seed_pipe_write, 0 },
+                                      { "add_watch", seed_pipe_add_watch, 0 },
+                                      { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine * local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-  SeedObject pipe_constructor;
-  seed_class_definition pipe_class_def = seed_empty_class;
-  eng = local_eng;
+    SeedObject pipe_constructor;
+    seed_class_definition pipe_class_def = seed_empty_class;
+    eng = local_eng;
 
-  namespace_ref = seed_make_object(eng->context, 0, 0);
+    namespace_ref = seed_make_object(eng->context, 0, 0);
 
-  pipe_class_def.class_name = "Pipe";
-  pipe_class_def.static_functions = pipe_funcs;
-  pipe_class_def.finalize = pipe_finalize;
+    pipe_class_def.class_name = "Pipe";
+    pipe_class_def.static_functions = pipe_funcs;
+    pipe_class_def.finalize = pipe_finalize;
 
-  pipe_class = seed_create_class(&pipe_class_def);
+    pipe_class = seed_create_class(&pipe_class_def);
 
-  pipe_constructor = seed_make_constructor(eng->context,
-					   0, seed_construct_pipe);
+    pipe_constructor
+      = seed_make_constructor(eng->context, 0, seed_construct_pipe);
 
-  seed_object_set_property(eng->context,
-			   namespace_ref, "Pipe", pipe_constructor);
+    seed_object_set_property(eng->context, namespace_ref, "Pipe",
+                             pipe_constructor);
 
-  return namespace_ref;
+    return namespace_ref;
 }
diff --git a/modules/os/Makefile.in b/modules/os/Makefile.in
index 3834a14..5183f26 100644
--- a/modules/os/Makefile.in
+++ b/modules/os/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/os
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -100,10 +141,23 @@ libseed_os_la_OBJECTS = $(am_libseed_os_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_os_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libseed_os_la_CFLAGS) \
 	$(CFLAGS) $(libseed_os_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_OS_MODULE_TRUE@am_libseed_os_la_rpath = -rpath $(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -116,20 +170,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_os_la_SOURCES)
 DIST_SOURCES = $(am__libseed_os_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -137,8 +187,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -202,6 +270,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -215,6 +285,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -238,8 +309,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -251,6 +331,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -345,6 +426,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -392,7 +474,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/os/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/os/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -410,6 +491,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -436,12 +518,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_os.la: $(libseed_os_la_OBJECTS) $(libseed_os_la_DEPENDENCIES) $(EXTRA_libseed_os_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_os_la_LINK) $(am_libseed_os_la_rpath) $(libseed_os_la_OBJECTS) $(libseed_os_la_LIBADD) $(LIBS)
 
@@ -458,14 +543,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -487,26 +572,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -518,15 +592,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -535,6 +605,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -679,19 +764,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/os/seed-os.c b/modules/os/seed-os.c
index 0f9dcf0..1a5a0dd 100644
--- a/modules/os/seed-os.c
+++ b/modules/os/seed-os.c
@@ -51,1117 +51,1055 @@
 
 SeedObject os_namespace;
 
-#define EXPECTED_EXCEPTION(name, argnum)				\
-  seed_make_exception (ctx, exception, "ArgumentError", name " expected " argnum " got %Zd", argument_count); \
-  return seed_make_undefined (ctx);
+#define EXPECTED_EXCEPTION(name, argnum)                                       \
+    seed_make_exception(ctx, exception, "ArgumentError",                       \
+                        name " expected " argnum " got %zd", argument_count);  \
+    return seed_make_undefined(ctx);
 
 SeedValue
-seed_os_realpath (SeedContext ctx,
-	          SeedObject function,
-	          SeedObject this_object,
-	          size_t argument_count,
-	          const SeedValue arguments[],
-	          SeedException * exception)
+seed_os_realpath(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  SeedValue sv;
-  gchar *arg;
-  gchar *resolved_path;
-  gchar *ret;
-  gsize path_max;
-
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.realpath", "1 argument");
+    SeedValue sv;
+    gchar* arg;
+    gchar* resolved_path;
+
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.realpath", "1 argument");
     }
-  arg = seed_value_to_string (ctx, arguments[0], exception);
-#ifdef PATH_MAX
-  path_max = PATH_MAX;
-#else
-  path_max = pathconf (arg, _PC_PATH_MAX);
-  if (path_max <= 0)
-    path_max = 4096;
-#endif
-  resolved_path = (gchar *) g_malloc (path_max);
-  ret = realpath(arg, resolved_path);
-  g_free (arg);
+    arg = seed_value_to_string(ctx, arguments[0], exception);
+    resolved_path = realpath(arg, NULL);
+    g_free(arg);
 
-  sv = seed_value_from_string (ctx, ret, exception);
-  g_free (resolved_path);
+    sv = seed_value_from_string(ctx, resolved_path, exception);
+    g_free(resolved_path);
 
-  return sv;
+    return sv;
 }
 
 SeedValue
-seed_os_chdir (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_chdir(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  gchar *arg;
-  gint ret;
+    gchar* arg;
+    gint ret;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.chdir", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.chdir", "1 argument");
     }
-  arg = seed_value_to_string (ctx, arguments[0], exception);
-  ret = chdir (arg);
-  g_free (arg);
+    arg = seed_value_to_string(ctx, arguments[0], exception);
+    ret = chdir(arg);
+    g_free(arg);
 
-  return seed_value_from_int (ctx, ret, exception);
+    return seed_value_from_int(ctx, ret, exception);
 }
 
 SeedValue
-seed_os_fchdir (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_fchdir(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gint ret, arg;
+    gint ret, arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.fchdir", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.fchdir", "1 argument");
     }
-  arg = seed_value_to_int (ctx, arguments[0], exception);
-  ret = fchdir (arg);
+    arg = seed_value_to_int(ctx, arguments[0], exception);
+    ret = fchdir(arg);
 
-  return seed_value_from_int (ctx, ret, exception);
+    return seed_value_from_int(ctx, ret, exception);
 }
 
 SeedValue
-seed_os_getcwd (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_getcwd(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  SeedValue seed_ret;
-  gchar *ret;
+    SeedValue seed_ret;
+    gchar* ret;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getcwd", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getcwd", "no arguments");
     }
-  ret = getcwd (NULL, 0);
-  seed_ret = seed_value_from_string (ctx, ret, exception);
-  g_free (ret);
+    ret = getcwd(NULL, 0);
+    seed_ret = seed_value_from_string(ctx, ret, exception);
+    g_free(ret);
 
-  return seed_ret;
+    return seed_ret;
 }
 
 SeedValue
-seed_os_ctermid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_ctermid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  SeedValue seed_ret;
-  gchar *ret;
+    SeedValue seed_ret;
+    gchar* ret;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getcwd", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getcwd", "no arguments");
     }
-  // ctermid returns a static buffer
-  ret = ctermid (NULL);
-  seed_ret = seed_value_from_string (ctx, ret, exception);
+    // ctermid returns a static buffer
+    ret = ctermid(NULL);
+    seed_ret = seed_value_from_string(ctx, ret, exception);
 
-  return seed_ret;
+    return seed_ret;
 }
 
 SeedValue
-seed_os_getegid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_getegid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  gid_t ret;
+    gid_t ret;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getegid", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getegid", "no arguments");
     }
-  ret = getegid ();
+    ret = getegid();
 
-  return seed_value_from_long (ctx, (glong) ret, exception);
+    return seed_value_from_long(ctx, (glong) ret, exception);
 }
 
 SeedValue
-seed_os_geteuid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_geteuid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  uid_t ret;
+    uid_t ret;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.geteuid", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.geteuid", "no arguments");
     }
-  ret = geteuid ();
+    ret = geteuid();
 
-  return seed_value_from_long (ctx, (glong) ret, exception);
+    return seed_value_from_long(ctx, (glong) ret, exception);
 }
 
 SeedValue
-seed_os_getgid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_getgid(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gid_t ret;
+    gid_t ret;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getgid", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getgid", "no arguments");
     }
-  ret = getgid ();
+    ret = getgid();
 
-  return seed_value_from_long (ctx, (glong) ret, exception);
+    return seed_value_from_long(ctx, (glong) ret, exception);
 }
 
 SeedValue
-seed_os_getuid (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_getuid(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  uid_t ret;
+    uid_t ret;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getuid", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getuid", "no arguments");
     }
-  ret = getuid ();
+    ret = getuid();
 
-  return seed_value_from_long (ctx, (glong) ret, exception);
+    return seed_value_from_long(ctx, (glong) ret, exception);
 }
 
 SeedValue
-seed_os_getgroups (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[],
-		   SeedException * exception)
+seed_os_getgroups(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  SeedValue ret;
-  SeedValue *groups;
-  gid_t *group_list;
-  guint num_groups, i;
-
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getgroups", "no arguments");
+    SeedValue ret;
+    SeedValue* groups;
+    gid_t* group_list;
+    guint num_groups, i;
+
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getgroups", "no arguments");
     }
-  num_groups = getgroups(0, NULL);
-  group_list = g_alloca (num_groups * sizeof(gid_t));
-  groups = g_alloca (num_groups * sizeof(SeedValue));
-  if (getgroups (num_groups, group_list) < 0)
-    {
-      // TODO: Decide on how to handle exceptions for things like this...
-      // Investigate python
-      return seed_make_null (ctx);
+    num_groups = getgroups(0, NULL);
+    group_list = g_alloca(num_groups * sizeof(gid_t));
+    groups = g_alloca(num_groups * sizeof(SeedValue));
+    if (getgroups(num_groups, group_list) < 0) {
+        // TODO: Decide on how to handle exceptions for things like this...
+        // Investigate python
+        return seed_make_null(ctx);
     }
 
-  for (i = 0; i < num_groups; i++)
-    {
-      groups[i] = seed_value_from_long (ctx, (glong) group_list[i], exception);
+    for (i = 0; i < num_groups; i++) {
+        groups[i] = seed_value_from_long(ctx, (glong) group_list[i], exception);
     }
-  ret = seed_make_array (ctx, groups, num_groups, exception);
+    ret = seed_make_array(ctx, groups, num_groups, exception);
 
-  return ret;
+    return ret;
 }
 
 SeedValue
-seed_os_getlogin (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[],
-		  SeedException * exception)
+seed_os_getlogin(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getlogin", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getlogin", "no arguments");
     }
 
-  return seed_value_from_string (ctx, getlogin(), exception);
+    return seed_value_from_string(ctx, getlogin(), exception);
 }
 
 SeedValue
-seed_os_getpgid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_getpgid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  pid_t pid;
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.getpgid", "1 argument");
+    pid_t pid;
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.getpgid", "1 argument");
     }
-  pid = (pid_t) seed_value_to_long (ctx, arguments[0], exception);
+    pid = (pid_t) seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_long (ctx, (glong) getpgid(pid), exception);
+    return seed_value_from_long(ctx, (glong) getpgid(pid), exception);
 }
 
 SeedValue
-seed_os_getpgrp (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_getpgrp(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getpgrp", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getpgrp", "no arguments");
     }
 
-  return seed_value_from_long (ctx, (glong) getpgrp(), exception);
+    return seed_value_from_long(ctx, (glong) getpgrp(), exception);
 }
 
 SeedValue
-seed_os_getpid (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_getpid(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getpid", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getpid", "no arguments");
     }
 
-  return seed_value_from_long (ctx, (glong) getpid(), exception);
+    return seed_value_from_long(ctx, (glong) getpid(), exception);
 }
 
 SeedValue
-seed_os_getppid (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_getppid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.getppid", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.getppid", "no arguments");
     }
 
-  return seed_value_from_long (ctx, (glong) getppid(), exception);
+    return seed_value_from_long(ctx, (glong) getppid(), exception);
 }
 
 SeedValue
-seed_os_getenv (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_getenv(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  SeedValue ret;
-  gchar *name, *value;
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.getenv", "1 arguments");
+    SeedValue ret;
+    gchar *name, *value;
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.getenv", "1 arguments");
     }
-  name = seed_value_to_string (ctx, arguments[0], exception);
-  value = getenv (name);
-  ret = seed_value_from_string (ctx, value, exception);
-  g_free (name);
+    name = seed_value_to_string(ctx, arguments[0], exception);
+    value = getenv(name);
+    ret = seed_value_from_string(ctx, value, exception);
+    g_free(name);
 
-  return ret;
+    return ret;
 }
 
 SeedValue
-seed_os_putenv (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_putenv(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gint ret;
-  gchar *name, *value, *arg;
+    gint ret;
+    gchar *name, *value, *arg;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("os.putenv", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.putenv", "2 arguments");
     }
-  name = seed_value_to_string (ctx, arguments[0], exception);
-  value = seed_value_to_string (ctx, arguments[1], exception);
-  arg = g_strconcat (name, "=", value, NULL);
+    name = seed_value_to_string(ctx, arguments[0], exception);
+    value = seed_value_to_string(ctx, arguments[1], exception);
+    arg = g_strconcat(name, "=", value, NULL);
 
-  ret = putenv (arg);
+    ret = putenv(arg);
 
-  g_free (name);
-  g_free (value);
+    g_free(name);
+    g_free(value);
 
-  return seed_value_from_int (ctx, ret, exception);
+    return seed_value_from_int(ctx, ret, exception);
 }
 
-
 SeedValue
-seed_os_setegid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_setegid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  gid_t arg;
+    gid_t arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.setegid", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.setegid", "1 argument");
     }
-  arg = seed_value_to_long (ctx, arguments[0], exception);
+    arg = seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, setegid(arg), exception);
+    return seed_value_from_int(ctx, setegid(arg), exception);
 }
 
 SeedValue
-seed_os_setgid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_setgid(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gid_t arg;
+    gid_t arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.setgid", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.setgid", "1 argument");
     }
-  arg = seed_value_to_long (ctx, arguments[0], exception);
+    arg = seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, setgid(arg), exception);
+    return seed_value_from_int(ctx, setgid(arg), exception);
 }
 
 SeedValue
-seed_os_seteuid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_seteuid(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  uid_t arg;
+    uid_t arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.seteuid", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.seteuid", "1 argument");
     }
-  arg = seed_value_to_long (ctx, arguments[0], exception);
+    arg = seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, seteuid(arg), exception);
+    return seed_value_from_int(ctx, seteuid(arg), exception);
 }
 
 SeedValue
-seed_os_setuid (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_setuid(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  uid_t arg;
+    uid_t arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.setuid", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.setuid", "1 argument");
     }
-  arg = seed_value_to_long (ctx, arguments[0], exception);
+    arg = seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, setuid(arg), exception);
+    return seed_value_from_int(ctx, setuid(arg), exception);
 }
 
 SeedValue
-seed_os_strerror (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[],
-		  SeedException * exception)
+seed_os_strerror(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  int arg;
+    int arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.strerror", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.strerror", "1 argument");
     }
-  arg = seed_value_to_int (ctx, arguments[0], exception);
+    arg = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_string (ctx, strerror(arg), exception);
+    return seed_value_from_string(ctx, strerror(arg), exception);
 }
 
 SeedValue
-seed_os_umask (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_umask(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  mode_t arg;
+    mode_t arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.umask", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.umask", "1 argument");
     }
-  arg = seed_value_to_long (ctx, arguments[0], exception);
+    arg = seed_value_to_long(ctx, arguments[0], exception);
 
-  return seed_value_from_long (ctx, umask(arg), exception);
+    return seed_value_from_long(ctx, umask(arg), exception);
 }
 
 SeedValue
-seed_os_uname (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_uname(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  SeedValue elements[5], ret;
-  guint c;
-  struct utsname name;
+    SeedValue elements[5], ret;
+    guint c;
+    struct utsname name;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION("os.uname", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.uname", "no arguments");
     }
-  c = uname (&name);
-  // TODO: Do something with c
-  elements[0] = seed_value_from_string (ctx, name.sysname, exception);
-  elements[1] = seed_value_from_string (ctx, name.nodename, exception);
-  elements[2] = seed_value_from_string (ctx, name.release, exception);
-  elements[3] = seed_value_from_string (ctx, name.version, exception);
-  elements[4] = seed_value_from_string (ctx, name.machine, exception);
-  ret = seed_make_array (ctx, elements, 5, exception);
-
-
-  return ret;
+    c = uname(&name);
+    // TODO: Do something with c
+    elements[0] = seed_value_from_string(ctx, name.sysname, exception);
+    elements[1] = seed_value_from_string(ctx, name.nodename, exception);
+    elements[2] = seed_value_from_string(ctx, name.release, exception);
+    elements[3] = seed_value_from_string(ctx, name.version, exception);
+    elements[4] = seed_value_from_string(ctx, name.machine, exception);
+    ret = seed_make_array(ctx, elements, 5, exception);
+
+    return ret;
 }
 
-
 SeedValue
-seed_os_unsetenv (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[],
-		  SeedException * exception)
+seed_os_unsetenv(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  gint ret;
-  gchar *arg;
+    gint ret;
+    gchar* arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.unsetenv", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.unsetenv", "1 argument");
     }
 
-  arg = seed_value_to_string (ctx, arguments[0], exception);
+    arg = seed_value_to_string(ctx, arguments[0], exception);
 #if __FreeBSD_version < 700000
-  ret = 0;
-  unsetenv (arg);
+    ret = 0;
+    unsetenv(arg);
 #else
-  ret = unsetenv (arg);
+    ret = unsetenv(arg);
 #endif
-  g_free (arg);
+    g_free(arg);
 
-  return seed_value_from_int (ctx, ret, exception);
+    return seed_value_from_int(ctx, ret, exception);
 }
 
 SeedValue
-seed_os_open (SeedContext ctx,
-	      SeedObject function,
-	      SeedObject this_object,
-	      size_t argument_count,
-	      const SeedValue arguments[],
-	      SeedException * exception)
+seed_os_open(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             size_t argument_count,
+             const SeedValue arguments[],
+             SeedException* exception)
 {
-  gchar *path;
-  gint flags, ret;
+    gchar* path;
+    gint flags, ret;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("os.open", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.open", "2 arguments");
     }
 
-  path = seed_value_to_string (ctx, arguments[0], exception);
-  flags = seed_value_to_int (ctx, arguments[1], exception);
+    path = seed_value_to_string(ctx, arguments[0], exception);
+    flags = seed_value_to_int(ctx, arguments[1], exception);
 
-  ret = open (path, flags);
-  g_free (path);
+    ret = open(path, flags);
+    g_free(path);
 
-  return seed_value_from_int (ctx, ret, exception);
+    return seed_value_from_int(ctx, ret, exception);
 }
 
 SeedValue
-seed_os_close (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_close(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  gint arg;
+    gint arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.close", "2 arguments");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.close", "2 arguments");
     }
 
-  arg = seed_value_to_int (ctx, arguments[0], exception);
+    arg = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, close (arg), exception);
+    return seed_value_from_int(ctx, close(arg), exception);
 }
 
 SeedValue
-seed_os_dup (SeedContext ctx,
-	     SeedObject function,
-	     SeedObject this_object,
-	     size_t argument_count,
-	     const SeedValue arguments[],
-	     SeedException * exception)
+seed_os_dup(SeedContext ctx,
+            SeedObject function,
+            SeedObject this_object,
+            size_t argument_count,
+            const SeedValue arguments[],
+            SeedException* exception)
 {
-  gint arg;
+    gint arg;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION("os.dup", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.dup", "1 argument");
     }
 
-  arg = seed_value_to_int (ctx, arguments[0], exception);
+    arg = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, dup (arg), exception);
+    return seed_value_from_int(ctx, dup(arg), exception);
 }
 SeedValue
-seed_os_dup2 (SeedContext ctx,
-	      SeedObject function,
-	      SeedObject this_object,
-	      size_t argument_count,
-	      const SeedValue arguments[],
-	      SeedException * exception)
+seed_os_dup2(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             size_t argument_count,
+             const SeedValue arguments[],
+             SeedException* exception)
 {
-  gint arg, arg2;
+    gint arg, arg2;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION("os.dup2", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.dup2", "2 arguments");
     }
 
-  arg = seed_value_to_int (ctx, arguments[0], exception);
-  arg2 = seed_value_to_int (ctx, arguments[0], exception);
+    arg = seed_value_to_int(ctx, arguments[0], exception);
+    arg2 = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, dup2 (arg, arg2), exception);
+    return seed_value_from_int(ctx, dup2(arg, arg2), exception);
 }
 
 SeedValue
-seed_os_fchmod (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_fchmod(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gint fd;
-  mode_t mode;
+    gint fd;
+    mode_t mode;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.fchmod", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.fchmod", "2 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  mode = seed_value_to_long (ctx, arguments[1], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    mode = seed_value_to_long(ctx, arguments[1], exception);
 
-  return seed_value_from_int (ctx, fchmod (fd, mode), exception);
+    return seed_value_from_int(ctx, fchmod(fd, mode), exception);
 }
 
 SeedValue
-seed_os_fchown (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_fchown(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gint fd;
-  gid_t gid;
-  uid_t uid;
+    gint fd;
+    gid_t gid;
+    uid_t uid;
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION ("os.fchown", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("os.fchown", "3 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  uid = seed_value_to_long (ctx, arguments[1], exception);
-  gid = seed_value_to_long (ctx, arguments[2], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    uid = seed_value_to_long(ctx, arguments[1], exception);
+    gid = seed_value_to_long(ctx, arguments[2], exception);
 
-  return seed_value_from_int (ctx, fchown (fd, uid, gid), exception);
+    return seed_value_from_int(ctx, fchown(fd, uid, gid), exception);
 }
 
 SeedValue
-seed_os_fdatasync (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[],
-		   SeedException * exception)
+seed_os_fdatasync(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
-  gint fd;
+    gint fd;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("os.fdatasync", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.fdatasync", "1 argument");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_int (ctx, fdatasync (fd), exception);
+    return seed_value_from_int(ctx, fdatasync(fd), exception);
 #else
-  errno = ENOSYS;
-  return seed_value_from_int (ctx, -1, exception);
+    errno = ENOSYS;
+    return seed_value_from_int(ctx, -1, exception);
 #endif
 }
 
 SeedValue
-seed_os_fpathconf (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[],
-		   SeedException * exception)
+seed_os_fpathconf(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  gint fd, name;
+    gint fd, name;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.fpathconf", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.fpathconf", "2 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  name = seed_value_to_int (ctx, arguments[1], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    name = seed_value_to_int(ctx, arguments[1], exception);
 
-  return seed_value_from_long (ctx, fpathconf (fd, name), exception);
+    return seed_value_from_long(ctx, fpathconf(fd, name), exception);
 }
 
 SeedValue
-seed_os_fsync (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_fsync(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  gint fd;
+    gint fd;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("os.fsync", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.fsync", "1 argument");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_long (ctx, fsync (fd), exception);
+    return seed_value_from_long(ctx, fsync(fd), exception);
 }
 
 SeedValue
-seed_os_ftruncate (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[],
-		   SeedException * exception)
+seed_os_ftruncate(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  gint fd;
-  off_t length;
+    gint fd;
+    off_t length;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.ftruncate", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.ftruncate", "2 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  length = seed_value_to_int (ctx, arguments[1], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    length = seed_value_to_int(ctx, arguments[1], exception);
 
-  return seed_value_from_long (ctx, ftruncate (fd, length), exception);
+    return seed_value_from_long(ctx, ftruncate(fd, length), exception);
 }
 
 SeedValue
-seed_os_isatty (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_isatty(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  gint fd;
+    gint fd;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("os.isatty", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.isatty", "1 argument");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_boolean (ctx, isatty (fd), exception);
+    return seed_value_from_boolean(ctx, isatty(fd), exception);
 }
 
 SeedValue
-seed_os_lseek (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_lseek(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  gint fd, whence;
-  off_t offset;
+    gint fd, whence;
+    off_t offset;
 
-  if (argument_count != 3)
-    {
-      EXPECTED_EXCEPTION ("os.lseek", "3 arguments");
+    if (argument_count != 3) {
+        EXPECTED_EXCEPTION("os.lseek", "3 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  offset = seed_value_to_long (ctx, arguments[1], exception);
-  whence = seed_value_to_int (ctx, arguments[2], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    offset = seed_value_to_long(ctx, arguments[1], exception);
+    whence = seed_value_to_int(ctx, arguments[2], exception);
 
-  return seed_value_from_long (ctx, lseek (fd, offset, whence), exception);
+    return seed_value_from_long(ctx, lseek(fd, offset, whence), exception);
 }
 
 SeedValue
-seed_os_openpty (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_openpty(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  SeedValue fds[2], ret;
-  gint master,slave;
+    SeedValue fds[2], ret;
+    gint master, slave;
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION ("os.openpty", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.openpty", "no arguments");
     }
-  openpty (&master, &slave, NULL, NULL, NULL);
+    openpty(&master, &slave, NULL, NULL, NULL);
 
-  fds[0] = seed_value_from_int (ctx, master, exception);
-  fds[1] = seed_value_from_int (ctx, slave, exception);
+    fds[0] = seed_value_from_int(ctx, master, exception);
+    fds[1] = seed_value_from_int(ctx, slave, exception);
 
-  ret = seed_make_array (ctx, fds, 2, exception);
+    ret = seed_make_array(ctx, fds, 2, exception);
 
-  return ret;
+    return ret;
 }
 
 SeedValue
-seed_os_pipe (SeedContext ctx,
-	      SeedObject function,
-	      SeedObject this_object,
-	      size_t argument_count,
-	      const SeedValue arguments[],
-	      SeedException * exception)
+seed_os_pipe(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             size_t argument_count,
+             const SeedValue arguments[],
+             SeedException* exception)
 {
-  SeedValue fds[2], ret;
-  gint fildes[2];
+    SeedValue fds[2], ret;
+    gint fildes[2];
 
-  if (argument_count != 0)
-    {
-      EXPECTED_EXCEPTION ("os.pipe", "no arguments");
+    if (argument_count != 0) {
+        EXPECTED_EXCEPTION("os.pipe", "no arguments");
     }
-  if (pipe (fildes) < 0)
-    {
-      // TODO
+    if (pipe(fildes) < 0) {
+        // TODO
     }
 
-  fds[0] = seed_value_from_int (ctx, fildes[0], exception);
-  fds[1] = seed_value_from_int (ctx, fildes[1], exception);
+    fds[0] = seed_value_from_int(ctx, fildes[0], exception);
+    fds[1] = seed_value_from_int(ctx, fildes[1], exception);
 
-  ret = seed_make_array (ctx, fds, 2, exception);
+    ret = seed_make_array(ctx, fds, 2, exception);
 
-  return ret;
+    return ret;
 }
 
 SeedValue
-seed_os_read (SeedContext ctx,
-	      SeedObject function,
-	      SeedObject this_object,
-	      size_t argument_count,
-	      const SeedValue arguments[],
-	      SeedException * exception)
+seed_os_read(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             size_t argument_count,
+             const SeedValue arguments[],
+             SeedException* exception)
 {
-  SeedValue ret;
-  gint fd, n, nr;
-  gchar *buf;
+    SeedValue ret;
+    gint fd, n, nr;
+    gchar* buf;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.read", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.read", "2 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  n = seed_value_to_int (ctx, arguments[1], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    n = seed_value_to_int(ctx, arguments[1], exception);
 
-  buf = g_alloca (n * sizeof (gchar));
-  nr = read (fd, buf, n);
-  buf[nr] = '\0';
+    buf = g_alloca(n * sizeof(gchar));
+    nr = read(fd, buf, n);
+    buf[nr] = '\0';
 
-  if (nr)
-    ret = seed_value_from_string (ctx, buf, exception);
-  else
-    ret = seed_make_null (ctx);
+    if (nr)
+        ret = seed_value_from_string(ctx, buf, exception);
+    else
+        ret = seed_make_null(ctx);
 
-  return ret;
+    return ret;
 }
 
 SeedValue
-seed_os_write (SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedException * exception)
+seed_os_write(SeedContext ctx,
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedException* exception)
 {
-  gint fd, nw;
-  gchar *buf;
+    gint fd, nw;
+    gchar* buf;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.write", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.write", "2 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  buf = seed_value_to_string (ctx, arguments[1], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    buf = seed_value_to_string(ctx, arguments[1], exception);
 
-  nw = write (fd, buf, strlen (buf));
+    nw = write(fd, buf, strlen(buf));
 
-  return seed_value_from_int (ctx, nw, exception);
+    return seed_value_from_int(ctx, nw, exception);
 }
 
 SeedValue
-seed_os_ttyname (SeedContext ctx,
-		 SeedObject function,
-		 SeedObject this_object,
-		 size_t argument_count,
-		 const SeedValue arguments[],
-		 SeedException * exception)
+seed_os_ttyname(SeedContext ctx,
+                SeedObject function,
+                SeedObject this_object,
+                size_t argument_count,
+                const SeedValue arguments[],
+                SeedException* exception)
 {
-  gint fd;
+    gint fd;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("os.ttyname", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.ttyname", "1 argument");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_string (ctx, ttyname (fd), exception);
+    return seed_value_from_string(ctx, ttyname(fd), exception);
 }
 
 SeedValue
-seed_os_tcgetpgrp (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[],
-		   SeedException * exception)
+seed_os_tcgetpgrp(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  gint fd;
+    gint fd;
 
-  if (argument_count != 1)
-    {
-      EXPECTED_EXCEPTION ("os.tcgetpgrp", "1 argument");
+    if (argument_count != 1) {
+        EXPECTED_EXCEPTION("os.tcgetpgrp", "1 argument");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
 
-  return seed_value_from_long (ctx, tcgetpgrp (fd), exception);
+    return seed_value_from_long(ctx, tcgetpgrp(fd), exception);
 }
 
 SeedValue
-seed_os_tcsetpgrp (SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[],
-		   SeedException * exception)
+seed_os_tcsetpgrp(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  gint fd;
-  pid_t pgrp;
+    gint fd;
+    pid_t pgrp;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.tcsetpgrp", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.tcsetpgrp", "2 arguments");
     }
-  fd = seed_value_to_int (ctx, arguments[0], exception);
-  pgrp = seed_value_to_int (ctx, arguments[1], exception);
+    fd = seed_value_to_int(ctx, arguments[0], exception);
+    pgrp = seed_value_to_int(ctx, arguments[1], exception);
 
-  return seed_value_from_int (ctx, tcsetpgrp (fd, pgrp), exception);
+    return seed_value_from_int(ctx, tcsetpgrp(fd, pgrp), exception);
 }
 
 SeedValue
-seed_os_access (SeedContext ctx,
-		SeedObject function,
-		SeedObject this_object,
-		size_t argument_count,
-		const SeedValue arguments[],
-		SeedException * exception)
+seed_os_access(SeedContext ctx,
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedException* exception)
 {
-  int ret;
-  gchar *path;
-  int amd;
+    int ret;
+    gchar* path;
+    int amd;
 
-  if (argument_count != 2)
-    {
-      EXPECTED_EXCEPTION ("os.access", "2 arguments");
+    if (argument_count != 2) {
+        EXPECTED_EXCEPTION("os.access", "2 arguments");
     }
-  path = seed_value_to_string (ctx, arguments[0], exception);
-  amd = seed_value_to_int (ctx, arguments[1], exception);
+    path = seed_value_to_string(ctx, arguments[0], exception);
+    amd = seed_value_to_int(ctx, arguments[1], exception);
 
-  ret = access (path, amd);
+    ret = access(path, amd);
 
-  if (ret == 0)
-    return seed_value_from_boolean (ctx, TRUE, exception);
-  else
-    return seed_value_from_boolean (ctx, FALSE, exception);
+    if (ret == 0)
+        return seed_value_from_boolean(ctx, TRUE, exception);
+    else
+        return seed_value_from_boolean(ctx, FALSE, exception);
 }
 
 static SeedValue
-seed_os_fork (SeedContext ctx,
-	      SeedObject function,
-	      SeedObject this_object,
-	      gsize argument_count,
-	      const SeedValue arguments[],
-	      SeedException *exception)
+seed_os_fork(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             gsize argument_count,
+             const SeedValue arguments[],
+             SeedException* exception)
 {
-  pid_t t = fork();
+    pid_t t = fork();
 
-  return seed_value_from_long (ctx, t, exception);
+    return seed_value_from_long(ctx, t, exception);
 }
 
-seed_static_function os_funcs[] = {
-  {"fork", seed_os_fork, 0},
-  {"realpath", seed_os_realpath, 0},
-  {"chdir", seed_os_chdir, 0},
-  {"fchdir", seed_os_fchdir, 0},
-  {"getcwd", seed_os_getcwd, 0},
-  {"ctermid", seed_os_ctermid, 0},
-  {"getegid", seed_os_getegid, 0},
-  {"geteuid", seed_os_geteuid, 0},
-  {"getgid", seed_os_getgid, 0},
-  {"getuid", seed_os_getuid, 0},
-  {"getlogin", seed_os_getlogin, 0},
-  {"getpgid", seed_os_getpgid, 0},
-  {"getpgrp", seed_os_getpgrp, 0},
-  {"getpid", seed_os_getpid, 0},
-  {"getppid", seed_os_getuid, 0},
-  {"getenv", seed_os_getenv, 0},
-  {"putenv", seed_os_putenv, 0},
-  {"setegid", seed_os_setegid, 0},
-  {"setgid", seed_os_setegid, 0},
-  {"seteuid", seed_os_setegid, 0},
-  {"setuid", seed_os_setuid, 0},
-  {"strerror", seed_os_strerror, 0},
-  {"umask", seed_os_umask, 0},
-  {"uname", seed_os_uname, 0},
-  {"unsetenv", seed_os_unsetenv, 0},
-  {"open", seed_os_open, 0},
-  {"close", seed_os_close, 0},
-  {"dup", seed_os_dup, 0},
-  {"dup2", seed_os_dup2, 0},
-  {"fchmod", seed_os_fchmod, 0},
-  {"fchown", seed_os_fchown, 0},
-  {"fdatasync", seed_os_fdatasync, 0},
-  {"fpathconf", seed_os_fpathconf, 0},
-  {"fsync", seed_os_fsync, 0},
-  {"ftruncate", seed_os_ftruncate, 0},
-  {"isatty", seed_os_isatty, 0},
-  {"lseek", seed_os_lseek, 0},
-  {"openpty", seed_os_openpty, 0},
-  {"pipe", seed_os_pipe, 0},
-  {"read", seed_os_read, 0},
-  {"write", seed_os_write, 0},
-  {"ttyname", seed_os_ttyname, 0},
-  {"tcgetpgrp", seed_os_tcgetpgrp, 0},
-  {"tcsetpgrp", seed_os_tcsetpgrp, 0},
-  {"access", seed_os_access, 0},
-  {NULL, NULL, 0}
-};
-
-#define OS_DEFINE_ENUM(name, value) \
-  seed_object_set_property (eng->context, os_namespace, name,		\
-			    seed_value_from_long (eng->context, value, NULL))
-#define OS_DEFINE_QUICK_ENUM(value)					\
-seed_object_set_property (eng->context, os_namespace, #value,		\
-			  seed_value_from_long (eng->context, value, NULL)) \
+seed_static_function os_funcs[] = { { "fork", seed_os_fork, 0 },
+                                    { "realpath", seed_os_realpath, 0 },
+                                    { "chdir", seed_os_chdir, 0 },
+                                    { "fchdir", seed_os_fchdir, 0 },
+                                    { "getcwd", seed_os_getcwd, 0 },
+                                    { "ctermid", seed_os_ctermid, 0 },
+                                    { "getegid", seed_os_getegid, 0 },
+                                    { "geteuid", seed_os_geteuid, 0 },
+                                    { "getgid", seed_os_getgid, 0 },
+                                    { "getuid", seed_os_getuid, 0 },
+                                    { "getlogin", seed_os_getlogin, 0 },
+                                    { "getpgid", seed_os_getpgid, 0 },
+                                    { "getpgrp", seed_os_getpgrp, 0 },
+                                    { "getpid", seed_os_getpid, 0 },
+                                    { "getppid", seed_os_getuid, 0 },
+                                    { "getenv", seed_os_getenv, 0 },
+                                    { "putenv", seed_os_putenv, 0 },
+                                    { "setegid", seed_os_setegid, 0 },
+                                    { "setgid", seed_os_setegid, 0 },
+                                    { "seteuid", seed_os_setegid, 0 },
+                                    { "setuid", seed_os_setuid, 0 },
+                                    { "strerror", seed_os_strerror, 0 },
+                                    { "umask", seed_os_umask, 0 },
+                                    { "uname", seed_os_uname, 0 },
+                                    { "unsetenv", seed_os_unsetenv, 0 },
+                                    { "open", seed_os_open, 0 },
+                                    { "close", seed_os_close, 0 },
+                                    { "dup", seed_os_dup, 0 },
+                                    { "dup2", seed_os_dup2, 0 },
+                                    { "fchmod", seed_os_fchmod, 0 },
+                                    { "fchown", seed_os_fchown, 0 },
+                                    { "fdatasync", seed_os_fdatasync, 0 },
+                                    { "fpathconf", seed_os_fpathconf, 0 },
+                                    { "fsync", seed_os_fsync, 0 },
+                                    { "ftruncate", seed_os_ftruncate, 0 },
+                                    { "isatty", seed_os_isatty, 0 },
+                                    { "lseek", seed_os_lseek, 0 },
+                                    { "openpty", seed_os_openpty, 0 },
+                                    { "pipe", seed_os_pipe, 0 },
+                                    { "read", seed_os_read, 0 },
+                                    { "write", seed_os_write, 0 },
+                                    { "ttyname", seed_os_ttyname, 0 },
+                                    { "tcgetpgrp", seed_os_tcgetpgrp, 0 },
+                                    { "tcsetpgrp", seed_os_tcsetpgrp, 0 },
+                                    { "access", seed_os_access, 0 },
+                                    { NULL, NULL, 0 } };
+
+#define OS_DEFINE_ENUM(name, value)                                            \
+    seed_object_set_property(eng->context, os_namespace, name,                 \
+                             seed_value_from_long(eng->context, value, NULL))
+#define OS_DEFINE_QUICK_ENUM(value)                                            \
+    seed_object_set_property(eng->context, os_namespace, #value,               \
+                             seed_value_from_long(eng->context, value, NULL))
 
 SeedObject
-seed_module_init(SeedEngine * eng)
+seed_module_init(SeedEngine* eng)
 {
-  SeedClass os_namespace_class;
-  seed_class_definition os_namespace_class_definition = seed_empty_class;
+    SeedClass os_namespace_class;
+    seed_class_definition os_namespace_class_definition = seed_empty_class;
 
-  os_namespace_class_definition.static_functions = os_funcs;
-  os_namespace_class = seed_create_class (&os_namespace_class_definition);
+    os_namespace_class_definition.static_functions = os_funcs;
+    os_namespace_class = seed_create_class(&os_namespace_class_definition);
 
-  os_namespace = seed_make_object (eng->context, os_namespace_class, NULL);
+    os_namespace = seed_make_object(eng->context, os_namespace_class, NULL);
 
-  OS_DEFINE_QUICK_ENUM (O_RDONLY);
-  OS_DEFINE_QUICK_ENUM (O_WRONLY);
-  OS_DEFINE_QUICK_ENUM (O_RDWR);
-  OS_DEFINE_QUICK_ENUM (O_APPEND);
-  OS_DEFINE_QUICK_ENUM (O_CREAT);
-  OS_DEFINE_QUICK_ENUM (O_EXCL);
-  OS_DEFINE_QUICK_ENUM (O_TRUNC);
+    OS_DEFINE_QUICK_ENUM(O_RDONLY);
+    OS_DEFINE_QUICK_ENUM(O_WRONLY);
+    OS_DEFINE_QUICK_ENUM(O_RDWR);
+    OS_DEFINE_QUICK_ENUM(O_APPEND);
+    OS_DEFINE_QUICK_ENUM(O_CREAT);
+    OS_DEFINE_QUICK_ENUM(O_EXCL);
+    OS_DEFINE_QUICK_ENUM(O_TRUNC);
 
-#if defined (O_DSYNC)
-  OS_DEFINE_QUICK_ENUM (O_DSYNC);
+#if defined(O_DSYNC)
+    OS_DEFINE_QUICK_ENUM(O_DSYNC);
 #endif
-#if defined (O_RSYNC)
-  OS_DEFINE_QUICK_ENUM (O_RSYNC);
+#if defined(O_RSYNC)
+    OS_DEFINE_QUICK_ENUM(O_RSYNC);
 #endif
 
-  OS_DEFINE_QUICK_ENUM (O_SYNC);
-  OS_DEFINE_QUICK_ENUM (O_NDELAY);
-  OS_DEFINE_QUICK_ENUM (O_NONBLOCK);
-  OS_DEFINE_QUICK_ENUM (O_NOCTTY);
-  //  OS_DEFINE_QUICK_ENUM (O_SHLOCK);
-  //  OS_DEFINE_QUICK_ENUM (O_EXLOCK);
+    OS_DEFINE_QUICK_ENUM(O_SYNC);
+    OS_DEFINE_QUICK_ENUM(O_NDELAY);
+    OS_DEFINE_QUICK_ENUM(O_NONBLOCK);
+    OS_DEFINE_QUICK_ENUM(O_NOCTTY);
+    //  OS_DEFINE_QUICK_ENUM (O_SHLOCK);
+    //  OS_DEFINE_QUICK_ENUM (O_EXLOCK);
 
-  OS_DEFINE_QUICK_ENUM (O_ASYNC);
-#if defined (O_DIRECT)
-  OS_DEFINE_QUICK_ENUM (O_DIRECT);
+    OS_DEFINE_QUICK_ENUM(O_ASYNC);
+#if defined(O_DIRECT)
+    OS_DEFINE_QUICK_ENUM(O_DIRECT);
 #endif
-#if defined (O_DIRECTORY)
-  OS_DEFINE_QUICK_ENUM (O_DIRECTORY);
+#if defined(O_DIRECTORY)
+    OS_DEFINE_QUICK_ENUM(O_DIRECTORY);
 #endif
-  OS_DEFINE_QUICK_ENUM (O_NOFOLLOW);
-#if defined (O_NOATIME)
-  OS_DEFINE_QUICK_ENUM (O_NOATIME);
+    OS_DEFINE_QUICK_ENUM(O_NOFOLLOW);
+#if defined(O_NOATIME)
+    OS_DEFINE_QUICK_ENUM(O_NOATIME);
 #endif
 
-  OS_DEFINE_QUICK_ENUM (SEEK_SET);
-  OS_DEFINE_QUICK_ENUM (SEEK_CUR);
-  OS_DEFINE_QUICK_ENUM (SEEK_END);
+    OS_DEFINE_QUICK_ENUM(SEEK_SET);
+    OS_DEFINE_QUICK_ENUM(SEEK_CUR);
+    OS_DEFINE_QUICK_ENUM(SEEK_END);
 
-  OS_DEFINE_QUICK_ENUM (F_OK);
-  OS_DEFINE_QUICK_ENUM (R_OK);
-  OS_DEFINE_QUICK_ENUM (W_OK);
-  OS_DEFINE_QUICK_ENUM (X_OK);
+    OS_DEFINE_QUICK_ENUM(F_OK);
+    OS_DEFINE_QUICK_ENUM(R_OK);
+    OS_DEFINE_QUICK_ENUM(W_OK);
+    OS_DEFINE_QUICK_ENUM(X_OK);
 
-  return os_namespace;
+    return os_namespace;
 }
diff --git a/modules/readline/Makefile.in b/modules/readline/Makefile.in
index 1c58394..917a439 100644
--- a/modules/readline/Makefile.in
+++ b/modules/readline/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/readline
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -99,12 +140,25 @@ libseed_readline_la_OBJECTS = $(am_libseed_readline_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_readline_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_readline_la_CFLAGS) $(CFLAGS) \
 	$(libseed_readline_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_READLINE_MODULE_TRUE@am_libseed_readline_la_rpath = -rpath \
 @BUILD_READLINE_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -117,20 +171,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_readline_la_SOURCES)
 DIST_SOURCES = $(am__libseed_readline_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -138,8 +188,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -203,6 +271,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -216,6 +286,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -239,8 +310,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -252,6 +332,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -346,6 +427,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -394,7 +476,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/readline/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/readline/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -412,6 +493,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -438,12 +520,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_readline.la: $(libseed_readline_la_OBJECTS) $(libseed_readline_la_DEPENDENCIES) $(EXTRA_libseed_readline_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_readline_la_LINK) $(am_libseed_readline_la_rpath) $(libseed_readline_la_OBJECTS) $(libseed_readline_la_LIBADD) $(LIBS)
 
@@ -460,14 +545,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -489,26 +574,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -520,15 +594,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -537,6 +607,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -681,19 +766,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/readline/seed-readline.c b/modules/readline/seed-readline.c
index cd5ecfe..fb3f7de 100644
--- a/modules/readline/seed-readline.c
+++ b/modules/readline/seed-readline.c
@@ -26,173 +26,167 @@
 #include <sys/mman.h>
 
 SeedObject namespace_ref;
-SeedEngine *eng;
+SeedEngine* eng;
 gboolean readline_has_initialized = FALSE;
 
 static void
-seed_handle_rl_closure(ffi_cif * cif, void *result, void **args, void *userdata)
+seed_handle_rl_closure(ffi_cif* cif, void* result, void** args, void* userdata)
 {
-  SeedContext ctx = seed_context_create(eng->group, NULL);
-  SeedValue exception = 0;
-  SeedObject function = (SeedObject) userdata;
-
-  seed_object_call(ctx, function, 0, 0, 0, &exception);
-  if (exception)
-    {
-      gchar *mes = seed_exception_to_string(ctx,
-					    exception);
-      g_warning("Exception in readline bind key closure. %s \n", mes);
+    SeedContext ctx = seed_context_create(eng->group, NULL);
+    SeedValue exception = 0;
+    SeedObject function = (SeedObject) userdata;
+
+    seed_object_call(ctx, function, 0, 0, 0, &exception);
+    if (exception) {
+        gchar* mes = seed_exception_to_string(ctx, exception);
+        g_warning("Exception in readline bind key closure. %s \n", mes);
     }
-  seed_context_unref((SeedContext) ctx);
+    seed_context_unref((SeedContext) ctx);
 }
 
 // "Leaky" in that it exists for lifetime of program,
 // kind of unavoidable though.
-static ffi_closure *seed_make_rl_closure(SeedObject function)
+static ffi_closure*
+seed_make_rl_closure(SeedObject function)
 {
-  ffi_cif *cif;
-  ffi_closure *closure;
+    ffi_cif* cif;
+    ffi_closure* closure;
 
-  cif = g_new0(ffi_cif, 1);
-  closure = mmap(0, sizeof(ffi_closure), PROT_READ | PROT_WRITE |
-		 PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0);
-  ffi_prep_cif(cif, FFI_DEFAULT_ABI, 0, &ffi_type_sint, 0);
-  ffi_prep_closure(closure, cif, seed_handle_rl_closure, function);
+    cif = g_new0(ffi_cif, 1);
+    closure = mmap(0, sizeof(ffi_closure), PROT_READ | PROT_WRITE | PROT_EXEC,
+                   MAP_ANON | MAP_PRIVATE, -1, 0);
+    ffi_prep_cif(cif, FFI_DEFAULT_ABI, 0, &ffi_type_sint, 0);
+    ffi_prep_closure(closure, cif, seed_handle_rl_closure, function);
 
-  return closure;
+    return closure;
 }
 
 static SeedValue
 seed_readline_bind(SeedContext ctx,
-		   SeedObject function,
-		   SeedObject this_object,
-		   size_t argument_count,
-		   const SeedValue arguments[], SeedValue * exception)
+                   SeedObject function,
+                   SeedObject this_object,
+                   size_t argument_count,
+                   const SeedValue arguments[],
+                   SeedValue* exception)
 {
-  gchar *key;
-  ffi_closure *c;
-  
-  CHECK_ARG_COUNT("readline.bind", 2);
+    gchar* key;
+    ffi_closure* c;
 
-  key = seed_value_to_string(ctx, arguments[0], exception);
-  c = seed_make_rl_closure((SeedObject) arguments[1]);
+    CHECK_ARG_COUNT("readline.bind", 2);
 
-  rl_bind_key(*key, (Function *) c);
+    key = seed_value_to_string(ctx, arguments[0], exception);
+    c = seed_make_rl_closure((SeedObject) arguments[1]);
 
-  g_free(key);
+    rl_bind_key(*key, (rl_command_func_t*) c);
 
-  return seed_make_null(ctx);
+    g_free(key);
+
+    return seed_make_null(ctx);
 }
 
 static SeedValue
 seed_rl_done(SeedContext ctx,
-	     SeedObject function,
-	     SeedObject this_object,
-	     size_t argument_count,
-	     const SeedValue arguments[],
-	     SeedValue * exception)
+             SeedObject function,
+             SeedObject this_object,
+             size_t argument_count,
+             const SeedValue arguments[],
+             SeedValue* exception)
 {
-  CHECK_ARG_COUNT("readline.done", 0);
-  rl_done = 1;
-  return seed_make_null (ctx);
+    CHECK_ARG_COUNT("readline.done", 0);
+    rl_done = 1;
+    return seed_make_null(ctx);
 }
 
 static SeedValue
 seed_rl_buffer(SeedContext ctx,
-	     SeedObject function,
-	     SeedObject this_object,
-	     size_t argument_count,
-	     const SeedValue arguments[],
-	     SeedValue * exception)
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedValue* exception)
 {
-  CHECK_ARG_COUNT("readline.buffer", 0);
-  return seed_value_from_string (ctx, rl_line_buffer, exception);
+    CHECK_ARG_COUNT("readline.buffer", 0);
+    return seed_value_from_string(ctx, rl_line_buffer, exception);
 }
 
 static SeedValue
 seed_rl_insert(SeedContext ctx,
-	       SeedObject function,
-	       SeedObject this_object,
-	       size_t argument_count,
-	       const SeedValue arguments[],
-	       SeedValue * exception)
+               SeedObject function,
+               SeedObject this_object,
+               size_t argument_count,
+               const SeedValue arguments[],
+               SeedValue* exception)
 {
-  gchar *ins;
-  gint ret;
-  
-  CHECK_ARG_COUNT("readline.insert", 1);
-  
-  ins = seed_value_to_string (ctx, arguments[0], exception);
-  ret = rl_insert_text (ins);
-  g_free (ins);
-
-  return seed_value_from_int (ctx, ret, exception);
+    gchar* ins;
+    gint ret;
+
+    CHECK_ARG_COUNT("readline.insert", 1);
+
+    ins = seed_value_to_string(ctx, arguments[0], exception);
+    ret = rl_insert_text(ins);
+    g_free(ins);
+
+    return seed_value_from_int(ctx, ret, exception);
 }
 
 static SeedValue
 seed_readline(SeedContext ctx,
-	      SeedObject function,
-	      SeedObject this_object,
-	      size_t argument_count,
-	      const SeedValue arguments[], SeedValue * exception)
+              SeedObject function,
+              SeedObject this_object,
+              size_t argument_count,
+              const SeedValue arguments[],
+              SeedValue* exception)
 {
-  SeedValue valstr = 0;
-  gchar *str = NULL;
-  gchar *buf;
-  const gchar *histfname = g_get_home_dir();
-  gchar *path = g_build_filename(histfname, ".seed_history", NULL);
-
-  if (!readline_has_initialized)
-    {
-      read_history(path);
-      readline_has_initialized = TRUE;
+    SeedValue valstr = 0;
+    gchar* str = NULL;
+    gchar* buf;
+    const gchar* histfname = g_get_home_dir();
+    gchar* path = g_build_filename(histfname, ".seed_history", NULL);
+
+    if (!readline_has_initialized) {
+        read_history(path);
+        readline_has_initialized = TRUE;
     }
 
-  CHECK_ARG_COUNT("readline.readline", 1);
+    CHECK_ARG_COUNT("readline.readline", 1);
 
-  buf = seed_value_to_string(ctx, arguments[0], exception);
+    buf = seed_value_to_string(ctx, arguments[0], exception);
 
-  str = readline(buf);
-  if (str && *str)
-    {
-      add_history(str);
-      valstr = seed_value_from_string(ctx, str, exception);
-      g_free(str);
+    str = readline(buf);
+    if (str && *str) {
+        add_history(str);
+        valstr = seed_value_from_string(ctx, str, exception);
+        g_free(str);
     }
 
-  write_history(path);
-  history_truncate_file(path, 1000);
+    write_history(path);
+    history_truncate_file(path, 1000);
 
-  g_free(buf);
-  g_free(path);
+    g_free(buf);
+    g_free(path);
 
-  if (valstr == 0)
-    valstr = seed_make_null(ctx);
+    if (valstr == 0)
+        valstr = seed_make_null(ctx);
 
-  return valstr;
+    return valstr;
 }
 
-seed_static_function readline_funcs[] = {
-	{"readline", seed_readline, 0},
-	{"bind", seed_readline_bind, 0},
-	{"done", seed_rl_done, 0},
-	{"buffer", seed_rl_buffer, 0},
-	{"insert", seed_rl_insert, 0},
-	{NULL, NULL, 0}
-};
+seed_static_function readline_funcs[]
+  = { { "readline", seed_readline, 0 }, { "bind", seed_readline_bind, 0 },
+      { "done", seed_rl_done, 0 },      { "buffer", seed_rl_buffer, 0 },
+      { "insert", seed_rl_insert, 0 },  { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine * local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-  seed_class_definition readline_ns_class_def = seed_empty_class;
-  readline_ns_class_def.static_functions = readline_funcs;
-  
-  SeedClass readline_ns_class = seed_create_class(&readline_ns_class_def);
+    seed_class_definition readline_ns_class_def = seed_empty_class;
+    readline_ns_class_def.static_functions = readline_funcs;
 
-  eng = local_eng;
+    SeedClass readline_ns_class = seed_create_class(&readline_ns_class_def);
 
-  namespace_ref = seed_make_object(eng->context, readline_ns_class, 0);
+    eng = local_eng;
 
-  return namespace_ref;
-}
+    namespace_ref = seed_make_object(eng->context, readline_ns_class, 0);
 
+    return namespace_ref;
+}
diff --git a/modules/sandbox/Makefile.in b/modules/sandbox/Makefile.in
index 225279f..4c07f3a 100644
--- a/modules/sandbox/Makefile.in
+++ b/modules/sandbox/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/sandbox
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -99,10 +140,23 @@ libseed_sandbox_la_OBJECTS = $(am_libseed_sandbox_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_sandbox_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libseed_sandbox_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -115,20 +169,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_sandbox_la_SOURCES)
 DIST_SOURCES = $(libseed_sandbox_la_SOURCES)
 am__can_run_installinfo = \
@@ -136,8 +186,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -201,6 +269,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -214,6 +284,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -237,8 +308,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -250,6 +330,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -344,6 +425,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -389,7 +471,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/sandbox/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/sandbox/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -407,6 +488,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -433,12 +515,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_sandbox.la: $(libseed_sandbox_la_OBJECTS) $(libseed_sandbox_la_DEPENDENCIES) $(EXTRA_libseed_sandbox_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_sandbox_la_LINK) -rpath $(seedlibdir) $(libseed_sandbox_la_OBJECTS) $(libseed_sandbox_la_LIBADD) $(LIBS)
 
@@ -455,14 +540,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -477,26 +562,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -508,15 +582,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -525,6 +595,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -669,19 +754,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/sandbox/seed-sandbox.c b/modules/sandbox/seed-sandbox.c
index 20e0a5f..b6251ae 100644
--- a/modules/sandbox/seed-sandbox.c
+++ b/modules/sandbox/seed-sandbox.c
@@ -25,122 +25,119 @@ SeedObject namespace_ref;
 SeedClass context_class;
 
 static SeedObject
-seed_construct_sandbox_context (SeedContext ctx,
-				SeedObject constructor,
-				size_t argument_count,
-				const SeedValue arguments[],
-				SeedException * exception)
+seed_construct_sandbox_context(SeedContext ctx,
+                               SeedObject constructor,
+                               size_t argument_count,
+                               const SeedValue arguments[],
+                               SeedException* exception)
 {
-  SeedObject ret;
-  SeedContext c;
+    SeedObject ret;
+    SeedContext c;
 
-  c = seed_context_create (group, NULL);
-  ret = seed_make_object (ctx, context_class, c);
+    c = seed_context_create(group, NULL);
+    ret = seed_make_object(ctx, context_class, c);
 
-  seed_object_set_property (ctx, ret, "global", seed_context_get_global_object (c));
-  return ret;
+    seed_object_set_property(ctx, ret, "global",
+                             seed_context_get_global_object(c));
+    return ret;
 }
 
 static SeedValue
-seed_context_eval (SeedContext ctx,
-		  SeedObject function,
-		  SeedObject this_object,
-		  size_t argument_count,
-		  const SeedValue arguments[],
-		  SeedException * exception)
+seed_context_eval(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  SeedContext c = seed_object_get_private (this_object);
-  SeedValue ret;
-  gchar *s;
-
-  if (!c)
-    {
-      seed_make_exception (ctx, exception,
-			   "ArgumentError", "Context is destroyed");
-      return seed_make_undefined (ctx);
+    SeedContext c = seed_object_get_private(this_object);
+    SeedValue ret;
+    gchar* s;
+
+    if (!c) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Context is destroyed");
+        return seed_make_undefined(ctx);
     }
 
-  s = seed_value_to_string (ctx, arguments[0], exception);
-  ret = seed_simple_evaluate (c, s, exception);
-  g_free (s);
+    s = seed_value_to_string(ctx, arguments[0], exception);
+    ret = seed_simple_evaluate(c, s, exception);
+    g_free(s);
 
-  return ret;
+    return ret;
 }
 
 static SeedValue
-seed_sandbox_context_add_globals (SeedContext ctx,
-				  SeedObject function,
-				  SeedObject this_object,
-				  size_t argument_count,
-				  const SeedValue arguments[],
-				  SeedException * exception)
+seed_sandbox_context_add_globals(SeedContext ctx,
+                                 SeedObject function,
+                                 SeedObject this_object,
+                                 size_t argument_count,
+                                 const SeedValue arguments[],
+                                 SeedException* exception)
 {
-  SeedContext c = seed_object_get_private (this_object);
-  if (!c)
-    {
-      seed_make_exception (ctx, exception,
-			   "ArgumentError", "Context is destroyed");
-      return seed_make_undefined (ctx);
+    SeedContext c = seed_object_get_private(this_object);
+    if (!c) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "Context is destroyed");
+        return seed_make_undefined(ctx);
     }
-  seed_prepare_global_context (c);
+    seed_prepare_global_context(c);
 
-  SeedObject g = seed_context_get_global_object (c);
-  SeedObject global = seed_context_get_global_object (ctx);
+    SeedObject g = seed_context_get_global_object(c);
+    SeedObject global = seed_context_get_global_object(ctx);
 
-  SeedValue script_path = seed_object_get_property (ctx, global, "__script_path__"); 
+    SeedValue script_path
+      = seed_object_get_property(ctx, global, "__script_path__");
 
-  seed_object_set_property (c, g, "__script_path__", 
-     (script_path && seed_value_is_object(ctx, script_path)) ?
-     script_path : seed_make_undefined(ctx)
-  );
-    
-  return seed_make_null (ctx);
-}
+    seed_object_set_property(c, g, "__script_path__",
+                             (script_path
+                              && seed_value_is_object(ctx, script_path))
+                               ? script_path
+                               : seed_make_undefined(ctx));
 
+    return seed_make_null(ctx);
+}
 
 static SeedValue
-seed_sandbox_context_destroy (SeedContext ctx,
-			      SeedObject function,
-			      SeedObject this_object,
-			      size_t argument_count,
-			      const SeedValue arguments[],
-			      SeedException * exception)
+seed_sandbox_context_destroy(SeedContext ctx,
+                             SeedObject function,
+                             SeedObject this_object,
+                             size_t argument_count,
+                             const SeedValue arguments[],
+                             SeedException* exception)
 {
-  SeedContext c = seed_object_get_private (this_object);
+    SeedContext c = seed_object_get_private(this_object);
 
-  seed_context_unref (c);
-  seed_object_set_private (this_object, NULL);
-  return seed_make_null (ctx);
+    seed_context_unref(c);
+    seed_object_set_private(this_object, NULL);
+    return seed_make_null(ctx);
 }
 
-seed_static_function context_funcs[] = {
-  {"eval", seed_context_eval, 0},
-  {"add_globals", seed_sandbox_context_add_globals, 0},
-  {"destroy", seed_sandbox_context_destroy, 0},
-  {NULL, NULL, 0}
-};
+seed_static_function context_funcs[]
+  = { { "eval", seed_context_eval, 0 },
+      { "add_globals", seed_sandbox_context_add_globals, 0 },
+      { "destroy", seed_sandbox_context_destroy, 0 },
+      { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine * eng)
+seed_module_init(SeedEngine* eng)
 {
-  SeedObject context_constructor;
-  seed_class_definition context_class_def = seed_empty_class;
-
-  ctx = eng->context;
-  group = eng->group;
-  namespace_ref = seed_make_object (ctx, NULL, NULL);
-
-  context_class_def.class_name = "Context";
-  context_class_def.static_functions = context_funcs;
+    SeedObject context_constructor;
+    seed_class_definition context_class_def = seed_empty_class;
 
-  context_class = seed_create_class (&context_class_def);
+    ctx = eng->context;
+    group = eng->group;
+    namespace_ref = seed_make_object(ctx, NULL, NULL);
 
+    context_class_def.class_name = "Context";
+    context_class_def.static_functions = context_funcs;
 
-  context_constructor = seed_make_constructor (eng->context,
-					       context_class,
-					       seed_construct_sandbox_context);
-  seed_object_set_property (eng->context, namespace_ref, "Context", context_constructor);
+    context_class = seed_create_class(&context_class_def);
 
-  return namespace_ref;
+    context_constructor = seed_make_constructor(eng->context, context_class,
+                                                seed_construct_sandbox_context);
+    seed_object_set_property(eng->context, namespace_ref, "Context",
+                             context_constructor);
 
+    return namespace_ref;
 }
diff --git a/modules/sqlite/Makefile.in b/modules/sqlite/Makefile.in
index f619a0f..b0017d5 100644
--- a/modules/sqlite/Makefile.in
+++ b/modules/sqlite/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/sqlite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -101,12 +142,25 @@ libseed_sqlite_la_OBJECTS = $(am_libseed_sqlite_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_sqlite_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_sqlite_la_CFLAGS) $(CFLAGS) \
 	$(libseed_sqlite_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_SQLITE_MODULE_TRUE@am_libseed_sqlite_la_rpath = -rpath \
 @BUILD_SQLITE_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -119,20 +173,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_sqlite_la_SOURCES)
 DIST_SOURCES = $(am__libseed_sqlite_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -140,8 +190,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -205,6 +273,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -218,6 +288,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -241,8 +312,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -254,6 +334,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -348,6 +429,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -398,7 +480,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/sqlite/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/sqlite/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -416,6 +497,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -442,12 +524,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_sqlite.la: $(libseed_sqlite_la_OBJECTS) $(libseed_sqlite_la_DEPENDENCIES) $(EXTRA_libseed_sqlite_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_sqlite_la_LINK) $(am_libseed_sqlite_la_rpath) $(libseed_sqlite_la_OBJECTS) $(libseed_sqlite_la_LIBADD) $(LIBS)
 
@@ -464,14 +549,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -493,26 +578,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -524,15 +598,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -541,6 +611,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -685,19 +770,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/sqlite/seed-sqlite.c b/modules/sqlite/seed-sqlite.c
index 18f204c..9dcafae 100644
--- a/modules/sqlite/seed-sqlite.c
+++ b/modules/sqlite/seed-sqlite.c
@@ -22,194 +22,191 @@
 
 SeedObject namespace_ref;
 SeedClass sqlite_class;
-SeedEngine *eng;
+SeedEngine* eng;
 
-#define MAKE_ERROR_ENUM(name)						\
-  seed_object_set_property(eng->context, namespace_ref, #name,		\
-			   seed_value_from_int(eng->context, SQLITE_##name, 0))
+#define MAKE_ERROR_ENUM(name)                                                  \
+    seed_object_set_property(eng->context, namespace_ref, #name,               \
+                             seed_value_from_int(eng->context, SQLITE_##name,  \
+                                                 0))
 
-void define_errors(SeedEngine * eng)
+void
+define_errors(SeedEngine* eng)
 {
-  MAKE_ERROR_ENUM(OK);
-  MAKE_ERROR_ENUM(ERROR);
-  MAKE_ERROR_ENUM(INTERNAL);
-  MAKE_ERROR_ENUM(PERM);
-  MAKE_ERROR_ENUM(ABORT);
-  MAKE_ERROR_ENUM(BUSY);
-  MAKE_ERROR_ENUM(LOCKED);
-  MAKE_ERROR_ENUM(NOMEM);
-  MAKE_ERROR_ENUM(READONLY);
-  MAKE_ERROR_ENUM(INTERRUPT);
-  MAKE_ERROR_ENUM(CORRUPT);
-  MAKE_ERROR_ENUM(NOTFOUND);
-  MAKE_ERROR_ENUM(FULL);
-  MAKE_ERROR_ENUM(CANTOPEN);
-  MAKE_ERROR_ENUM(PROTOCOL);
-  MAKE_ERROR_ENUM(EMPTY);
-  MAKE_ERROR_ENUM(SCHEMA);
-  MAKE_ERROR_ENUM(TOOBIG);
-  MAKE_ERROR_ENUM(CONSTRAINT);
-  MAKE_ERROR_ENUM(MISMATCH);
-  MAKE_ERROR_ENUM(MISUSE);
-  MAKE_ERROR_ENUM(NOLFS);
-  MAKE_ERROR_ENUM(AUTH);
-  MAKE_ERROR_ENUM(FORMAT);
-  MAKE_ERROR_ENUM(RANGE);
-  MAKE_ERROR_ENUM(NOTADB);
-  MAKE_ERROR_ENUM(ROW);
-  MAKE_ERROR_ENUM(DONE);
+    MAKE_ERROR_ENUM(OK);
+    MAKE_ERROR_ENUM(ERROR);
+    MAKE_ERROR_ENUM(INTERNAL);
+    MAKE_ERROR_ENUM(PERM);
+    MAKE_ERROR_ENUM(ABORT);
+    MAKE_ERROR_ENUM(BUSY);
+    MAKE_ERROR_ENUM(LOCKED);
+    MAKE_ERROR_ENUM(NOMEM);
+    MAKE_ERROR_ENUM(READONLY);
+    MAKE_ERROR_ENUM(INTERRUPT);
+    MAKE_ERROR_ENUM(CORRUPT);
+    MAKE_ERROR_ENUM(NOTFOUND);
+    MAKE_ERROR_ENUM(FULL);
+    MAKE_ERROR_ENUM(CANTOPEN);
+    MAKE_ERROR_ENUM(PROTOCOL);
+    MAKE_ERROR_ENUM(EMPTY);
+    MAKE_ERROR_ENUM(SCHEMA);
+    MAKE_ERROR_ENUM(TOOBIG);
+    MAKE_ERROR_ENUM(CONSTRAINT);
+    MAKE_ERROR_ENUM(MISMATCH);
+    MAKE_ERROR_ENUM(MISUSE);
+    MAKE_ERROR_ENUM(NOLFS);
+    MAKE_ERROR_ENUM(AUTH);
+    MAKE_ERROR_ENUM(FORMAT);
+    MAKE_ERROR_ENUM(RANGE);
+    MAKE_ERROR_ENUM(NOTADB);
+    MAKE_ERROR_ENUM(ROW);
+    MAKE_ERROR_ENUM(DONE);
 }
 
-void sqlite_database_finalize(SeedObject object)
+void
+sqlite_database_finalize(SeedObject object)
 {
-  sqlite3 *db = seed_object_get_private(object);
-  if (db)
-    sqlite3_close(db);
+    sqlite3* db = seed_object_get_private(object);
+    if (db)
+        sqlite3_close(db);
 }
 
-SeedObject sqlite_construct_database(SeedContext ctx,
-				     SeedObject constructor,
-				     size_t argument_count,
-				     const SeedValue arguments[],
-				     SeedException * exception)
+SeedObject
+sqlite_construct_database(SeedContext ctx,
+                          SeedObject constructor,
+                          size_t argument_count,
+                          const SeedValue arguments[],
+                          SeedException* exception)
 {
-  SeedObject ret;
-  gchar *file;
-  sqlite3 *db;
-  int rc;
-
-  if (argument_count != 1)
-    {
-      seed_make_exception(ctx, exception, "ArgumentError",
-			  "sqlite.Database constructor expected 1 argument");
-      return (SeedObject) seed_make_null(ctx);
+    SeedObject ret;
+    gchar* file;
+    sqlite3* db;
+    int rc;
+
+    if (argument_count != 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "sqlite.Database constructor expected 1 argument");
+        return (SeedObject) seed_make_null(ctx);
     }
-  file = seed_value_to_string(ctx, arguments[0], exception);
+    file = seed_value_to_string(ctx, arguments[0], exception);
 
-  rc = sqlite3_open(file, &db);
+    rc = sqlite3_open(file, &db);
 
-  g_free(file);
+    g_free(file);
 
-  ret = seed_make_object(ctx, sqlite_class, db);
-  seed_object_set_property(ctx, ret, "status",
-			   seed_value_from_int(ctx, rc, exception));
+    ret = seed_make_object(ctx, sqlite_class, db);
+    seed_object_set_property(ctx, ret, "status",
+                             seed_value_from_int(ctx, rc, exception));
 
-  return ret;
+    return ret;
 }
 
-static int seed_sqlite_exec_callback(SeedObject function,
-				     int argc,
-				     gchar ** argv, gchar ** azColName)
+static int
+seed_sqlite_exec_callback(SeedObject function,
+                          int argc,
+                          gchar** argv,
+                          gchar** azColName)
 {
-  SeedGlobalContext ctx;
-  SeedObject hash;
-  int i;
+    SeedGlobalContext ctx;
+    SeedObject hash;
+    int i;
 
-  if (!function)
-    return 0;
+    if (!function)
+        return 0;
 
-  ctx = seed_context_create(eng->group, NULL);
+    ctx = seed_context_create(eng->group, NULL);
 
-  hash = seed_make_object(ctx, 0, 0);
-  for (i = 0; i < argc; i++)
-    {
-      seed_object_set_property(ctx, hash,
-			       azColName[i],
-			       seed_value_from_string(ctx, argv[i], 0));
+    hash = seed_make_object(ctx, 0, 0);
+    for (i = 0; i < argc; i++) {
+        seed_object_set_property(ctx, hash, azColName[i],
+                                 seed_value_from_string(ctx, argv[i], 0));
     }
 
-  seed_object_call(ctx, function, 0, 1, &hash, 0);
+    seed_object_call(ctx, function, 0, 1, &hash, 0);
 
-  seed_context_unref(ctx);
+    seed_context_unref(ctx);
 
-  return 0;
+    return 0;
 }
 
-SeedValue seed_sqlite_exec(SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   size_t argument_count,
-			   const SeedValue arguments[],
-			   SeedException * exception)
+SeedValue
+seed_sqlite_exec(SeedContext ctx,
+                 SeedObject function,
+                 SeedObject this_object,
+                 size_t argument_count,
+                 const SeedValue arguments[],
+                 SeedException* exception)
 {
-  gchar *statement;
-  gchar *sqlite_error = 0;
-  sqlite3 *db;
-  int rc;
-
-  if (argument_count < 1)
-    {
-      seed_make_exception(ctx, exception, "ArgumentError",
-			  "sqlite.Database.exec expected 1 or 2 arguments");
-      return seed_make_null(ctx);
+    gchar* statement;
+    gchar* sqlite_error = 0;
+    sqlite3* db;
+    int rc;
+
+    if (argument_count < 1) {
+        seed_make_exception(ctx, exception, "ArgumentError",
+                            "sqlite.Database.exec expected 1 or 2 arguments");
+        return seed_make_null(ctx);
     }
 
-  statement = seed_value_to_string(ctx, arguments[0], exception);
-  db = seed_object_get_private(this_object);
-
-  g_assert(db);
-
-  rc = sqlite3_exec(db, statement,
-		    seed_sqlite_exec_callback,
-		    argument_count == 2 ? arguments[1] : 0, &sqlite_error);
-  g_free(statement);
-
-  if (rc != SQLITE_OK)
-    {
-      if (sqlite_error)
-	{
-		seed_make_exception(ctx, exception, "SqliteError",
-				    sqlite_error, NULL);
-	  sqlite3_free(sqlite_error);
-	}
-      return seed_make_null(ctx);
-    }
+    statement = seed_value_to_string(ctx, arguments[0], exception);
+    db = seed_object_get_private(this_object);
 
-  return seed_value_from_int(ctx, rc, exception);
+    g_assert(db);
 
+    rc = sqlite3_exec(db, statement, seed_sqlite_exec_callback,
+                      argument_count == 2 ? arguments[1] : 0, &sqlite_error);
+    g_free(statement);
+
+    if (rc != SQLITE_OK) {
+        if (sqlite_error) {
+            seed_make_exception(ctx, exception, "SqliteError", sqlite_error,
+                                NULL);
+            sqlite3_free(sqlite_error);
+        }
+        return seed_make_null(ctx);
+    }
+
+    return seed_value_from_int(ctx, rc, exception);
 }
 
-SeedValue seed_sqlite_close(SeedContext ctx,
-			    SeedObject function,
-			    SeedObject this_object,
-			    size_t argument_count,
-			    const SeedValue arguments[],
-			    SeedException * exception)
+SeedValue
+seed_sqlite_close(SeedContext ctx,
+                  SeedObject function,
+                  SeedObject this_object,
+                  size_t argument_count,
+                  const SeedValue arguments[],
+                  SeedException* exception)
 {
-  sqlite3 *db = seed_object_get_private(this_object);
-  sqlite3_close(db);
-  return seed_value_from_boolean(ctx, TRUE, exception);
+    sqlite3* db = seed_object_get_private(this_object);
+    sqlite3_close(db);
+    return seed_value_from_boolean(ctx, TRUE, exception);
 }
 
-seed_static_function database_funcs[] = {
-  {"close", seed_sqlite_close, 0},
-  {"exec", seed_sqlite_exec, 0},
-  {NULL, NULL, 0}
-};
+seed_static_function database_funcs[] = { { "close", seed_sqlite_close, 0 },
+                                          { "exec", seed_sqlite_exec, 0 },
+                                          { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine * local_eng)
+seed_module_init(SeedEngine* local_eng)
 {
-  SeedObject db_constructor;
-  seed_class_definition sqlite_class_def = seed_empty_class;
+    SeedObject db_constructor;
+    seed_class_definition sqlite_class_def = seed_empty_class;
 
-  eng = local_eng;
+    eng = local_eng;
 
-  namespace_ref = seed_make_object(eng->context, 0, 0);
+    namespace_ref = seed_make_object(eng->context, 0, 0);
 
-  define_errors(eng);
+    define_errors(eng);
 
-  sqlite_class_def.class_name = "Database";
-  sqlite_class_def.finalize = sqlite_database_finalize;
-  sqlite_class_def.static_functions = database_funcs;
+    sqlite_class_def.class_name = "Database";
+    sqlite_class_def.finalize = sqlite_database_finalize;
+    sqlite_class_def.static_functions = database_funcs;
 
-  sqlite_class = seed_create_class(&sqlite_class_def);
+    sqlite_class = seed_create_class(&sqlite_class_def);
 
-  db_constructor = seed_make_constructor(eng->context,
-					 sqlite_class,
-					 sqlite_construct_database);
-  seed_object_set_property(eng->context,
-			   namespace_ref, "Database", db_constructor);
+    db_constructor = seed_make_constructor(eng->context, sqlite_class,
+                                           sqlite_construct_database);
+    seed_object_set_property(eng->context, namespace_ref, "Database",
+                             db_constructor);
 
-  return namespace_ref;
+    return namespace_ref;
 }
diff --git a/modules/xorg/Makefile.in b/modules/xorg/Makefile.in
index b551a4b..81e4428 100644
--- a/modules/xorg/Makefile.in
+++ b/modules/xorg/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +89,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/xorg
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -101,12 +142,25 @@ libseed_xorg_la_OBJECTS = $(am_libseed_xorg_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libseed_xorg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libseed_xorg_la_CFLAGS) $(CFLAGS) $(libseed_xorg_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_XORG_MODULE_TRUE@am_libseed_xorg_la_rpath = -rpath \
 @BUILD_XORG_MODULE_TRUE@	$(seedlibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -119,20 +173,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libseed_xorg_la_SOURCES)
 DIST_SOURCES = $(am__libseed_xorg_la_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -140,8 +190,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -205,6 +273,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -218,6 +288,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -241,8 +312,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -254,6 +334,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -348,6 +429,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -397,7 +479,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/xorg/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu modules/xorg/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -415,6 +496,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-seedlibLTLIBRARIES: $(seedlib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(seedlib_LTLIBRARIES)'; test -n "$(seedlibdir)" || list=; \
@@ -441,12 +523,15 @@ uninstall-seedlibLTLIBRARIES:
 
 clean-seedlibLTLIBRARIES:
 	-test -z "$(seedlib_LTLIBRARIES)" || rm -f $(seedlib_LTLIBRARIES)
-	@list='$(seedlib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(seedlib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libseed_xorg.la: $(libseed_xorg_la_OBJECTS) $(libseed_xorg_la_DEPENDENCIES) $(EXTRA_libseed_xorg_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libseed_xorg_la_LINK) $(am_libseed_xorg_la_rpath) $(libseed_xorg_la_OBJECTS) $(libseed_xorg_la_LIBADD) $(LIBS)
 
@@ -463,14 +548,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -492,26 +577,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -523,15 +597,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -540,6 +610,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -684,19 +769,22 @@ uninstall-am: uninstall-seedlibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-seedlibLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-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-seedlibLTLIBRARIES install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-seedlibLTLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-seedlibLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-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-seedlibLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-seedlibLTLIBRARIES
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/modules/xorg/seed-xorg.c b/modules/xorg/seed-xorg.c
index 75cc764..df57f3a 100644
--- a/modules/xorg/seed-xorg.c
+++ b/modules/xorg/seed-xorg.c
@@ -16,8 +16,9 @@
  *
  * Copyright (C) Alan Knowles 2011 <alan@akbkhome.com>
  *
- * This started of as a way to get Xorg information not easily available elsewhere
- * 
+ * This started of as a way to get Xorg information not easily available
+ * elsewhere
+ *
  * It currently is only used with libxss (screensaver extension) to
  * get the idle time.
  *
@@ -26,56 +27,51 @@
 #include "../../libseed/seed.h"
 #include <X11/extensions/scrnsaver.h>
 
-
 /**
  * screensaverinfo_get_idletime()
  * @returns screen idle time.
  */
 
-SeedValue seed_xorg_screensaverinfo_get_idletime(SeedContext ctx,
-			   SeedObject function,
-			   SeedObject this_object,
-			   size_t argument_count,
-			   const SeedValue arguments[],
-			   SeedException * exception)
+SeedValue
+seed_xorg_screensaverinfo_get_idletime(SeedContext ctx,
+                                       SeedObject function,
+                                       SeedObject this_object,
+                                       size_t argument_count,
+                                       const SeedValue arguments[],
+                                       SeedException* exception)
 {
-  int rc = -1;
- 
-  XScreenSaverInfo *info = XScreenSaverAllocInfo();
-  Display *display = XOpenDisplay(NULL);
-  
-  if (display != NULL) {
-	  XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
-	  rc = info->idle;
-	  XCloseDisplay(display);
-  }
-  
+    int rc = -1;
 
-  XFree(info);  
-  return  seed_value_from_int(ctx, rc, exception);
-  
+    XScreenSaverInfo* info = XScreenSaverAllocInfo();
+    Display* display = XOpenDisplay(NULL);
 
+    if (display != NULL) {
+        XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
+        rc = info->idle;
+        XCloseDisplay(display);
+    }
+
+    XFree(info);
+    return seed_value_from_int(ctx, rc, exception);
 }
- 
 
-seed_static_function xorg_funcs[] = {
-  {"screensaverinfo_get_idletime", seed_xorg_screensaverinfo_get_idletime, 0},
- 
-  {NULL, NULL, 0}
-};
+seed_static_function xorg_funcs[]
+  = { { "screensaverinfo_get_idletime", seed_xorg_screensaverinfo_get_idletime,
+        0 },
+
+      { NULL, NULL, 0 } };
 
 SeedObject
-seed_module_init(SeedEngine * eng)
+seed_module_init(SeedEngine* eng)
 {
-  SeedObject seed_xorg;
-  SeedClass seed_xorg_class;
-  seed_class_definition seed_xorg_class_definition = seed_empty_class;
+    SeedObject seed_xorg;
+    SeedClass seed_xorg_class;
+    seed_class_definition seed_xorg_class_definition = seed_empty_class;
 
-  seed_xorg_class_definition.static_functions = xorg_funcs;
-  seed_xorg_class = seed_create_class (&seed_xorg_class_definition);
+    seed_xorg_class_definition.static_functions = xorg_funcs;
+    seed_xorg_class = seed_create_class(&seed_xorg_class_definition);
 
-  seed_xorg = seed_make_object (eng->context, seed_xorg_class, NULL);
- 
+    seed_xorg = seed_make_object(eng->context, seed_xorg_class, NULL);
 
-  return seed_xorg;
+    return seed_xorg;
 }
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 06a8cfe..fcd2c3b 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@ INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@ install-data-no: all
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@ install-exec installcheck:
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot
diff --git a/seed.pc b/seed.pc
index 2d2cf18..6499968 100644
--- a/seed.pc
+++ b/seed.pc
@@ -1,13 +1,13 @@
-prefix=/usr/local
+prefix=/home/danilo/webkitinstall
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
 includedir=${prefix}/include
 
-Cflags: -I${includedir}/seed-gtk3
-Requires: javascriptcoregtk-3.0 gobject-introspection-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
-Libs: -L${libdir} -lseed-gtk3
+Cflags: -I${includedir}/seed-gtk4
+Requires: javascriptcoregtk-4.0 gobject-introspection-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
+Libs: -L${libdir} -lseed-gtk4
 
 Name: Seed
 Description: Seed Javascript Interpreter.
-Version: 3.8.1
+Version: 4.0.0
diff --git a/src/Makefile.in b/src/Makefile.in
index b691f25..f64f5fb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,12 +90,16 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = seed$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -70,9 +111,22 @@ seed_DEPENDENCIES = ../libseed/libseed@SEED_GTK_VERSION@.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 seed_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(seed_CFLAGS) $(CFLAGS) \
 	$(seed_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -85,20 +139,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(seed_SOURCES)
 DIST_SOURCES = $(seed_SOURCES)
 am__can_run_installinfo = \
@@ -106,8 +156,26 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -171,6 +239,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -184,6 +254,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -207,8 +278,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -220,6 +300,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -314,6 +395,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -362,7 +444,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -389,10 +470,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -413,7 +496,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -426,6 +510,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 seed$(EXEEXT): $(seed_OBJECTS) $(seed_DEPENDENCIES) $(EXTRA_seed_DEPENDENCIES) 
 	@rm -f seed$(EXEEXT)
 	$(AM_V_CCLD)$(seed_LINK) $(seed_OBJECTS) $(seed_LDADD) $(LIBS)
@@ -444,14 +529,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -494,26 +579,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -525,15 +599,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -542,6 +612,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -685,19 +770,21 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/args.c b/src/args.c
index 156ad70..ccdc415 100644
--- a/src/args.c
+++ b/src/args.c
@@ -26,60 +26,59 @@
 #include "config.h"
 
 extern gboolean seed_interpreter_arg_print_version;
-extern gchar *seed_interpreter_arg_exec_string;
+extern gchar* seed_interpreter_arg_exec_string;
 
 static GOptionEntry seed_args[] = {
-  {"version", 0, 0, G_OPTION_ARG_NONE, &seed_interpreter_arg_print_version,
-   "Print interpreter version", 0},
-  {"execute", 'e', 0, G_OPTION_ARG_STRING, &seed_interpreter_arg_exec_string,
-   "Pass program in as string", "expression"},
-  {NULL,},
+    { "version", 0, 0, G_OPTION_ARG_NONE, &seed_interpreter_arg_print_version,
+      "Print interpreter version", 0 },
+    { "execute", 'e', 0, G_OPTION_ARG_STRING, &seed_interpreter_arg_exec_string,
+      "Pass program in as string", "expression" },
+    {
+      NULL,
+    },
 };
 
-
-static GOptionGroup *
-seed_interpreter_get_option_group (void)
+static GOptionGroup*
+seed_interpreter_get_option_group(void)
 {
-  GOptionGroup *group;
+    GOptionGroup* group;
 
-  group = g_option_group_new ("seed-interpreter", "Interpreter Options",
-			      "Show Interpreter Options", NULL, NULL);
-  g_option_group_add_entries (group, seed_args);
+    group = g_option_group_new("seed-interpreter", "Interpreter Options",
+                               "Show Interpreter Options", NULL, NULL);
+    g_option_group_add_entries(group, seed_args);
 
-  return group;
+    return group;
 }
 
 gboolean
-seed_interpreter_parse_args (int *argc, char ***argv)
+seed_interpreter_parse_args(int* argc, char*** argv)
 {
-  GOptionContext *option_context;
-  GOptionGroup *interpreter_group;
+    GOptionContext* option_context;
+    GOptionGroup* interpreter_group;
 
-  GError *error = NULL;
-  gboolean ret = TRUE;
+    GError* error = NULL;
+    gboolean ret = TRUE;
 
-  option_context = g_option_context_new (NULL);
-  g_option_context_set_ignore_unknown_options (option_context, TRUE);
-  g_option_context_set_help_enabled (option_context, TRUE);
+    option_context = g_option_context_new(NULL);
+    g_option_context_set_ignore_unknown_options(option_context, TRUE);
+    g_option_context_set_help_enabled(option_context, TRUE);
 
-  /* Initiate any command line options from the backend */
+    /* Initiate any command line options from the backend */
 
-  interpreter_group = seed_interpreter_get_option_group ();
-  g_option_context_set_main_group (option_context, interpreter_group);
-  g_option_context_add_group (option_context, seed_get_option_group ());
+    interpreter_group = seed_interpreter_get_option_group();
+    g_option_context_set_main_group(option_context, interpreter_group);
+    g_option_context_add_group(option_context, seed_get_option_group());
 
-  if (!g_option_context_parse (option_context, argc, argv, &error))
-    {
-      if (error)
-	{
-	  g_warning ("%s", error->message);
-	  g_error_free (error);
-	}
+    if (!g_option_context_parse(option_context, argc, argv, &error)) {
+        if (error) {
+            g_warning("%s", error->message);
+            g_error_free(error);
+        }
 
-      ret = FALSE;
+        ret = FALSE;
     }
 
-  g_option_context_free (option_context);
+    g_option_context_free(option_context);
 
-  return ret;
+    return ret;
 }
diff --git a/src/main.c b/src/main.c
index 504a00a..317121e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,138 +27,128 @@
 
 #define DEFAULT_PATH "."
 
-SeedEngine *eng;
+SeedEngine* eng;
 gboolean seed_interpreter_arg_print_version;
-gchar *seed_interpreter_arg_exec_string;
+gchar* seed_interpreter_arg_exec_string;
 
-gboolean seed_interpreter_parse_args (int *argc, char ***argv);
+gboolean seed_interpreter_parse_args(int* argc, char*** argv);
 
 static void
-seed_repl ()
+seed_repl()
 {
-  SeedScript *script;
-  SeedException e;
+    SeedScript* script;
+    SeedException e;
 
-  script = seed_make_script (eng->context, "repl = imports.repl", NULL, 0);
+    script = seed_make_script(eng->context, "repl = imports.repl", NULL, 0);
 
-  if ((e = seed_script_exception (script)))
-    {
-      g_critical ("%s", seed_exception_to_string (eng->context, e));
-      exit (EXIT_FAILURE);
+    if ((e = seed_script_exception(script))) {
+        g_critical("%s", seed_exception_to_string(eng->context, e));
+        exit(EXIT_FAILURE);
     }
 
-  seed_evaluate (eng->context, script, 0);
+    seed_evaluate(eng->context, script, 0);
 
-  if ((e = seed_script_exception (script)))
-    {
-      g_critical ("%s", seed_exception_to_string (eng->context, e));
-      exit (EXIT_FAILURE);
+    if ((e = seed_script_exception(script))) {
+        g_critical("%s", seed_exception_to_string(eng->context, e));
+        exit(EXIT_FAILURE);
     }
 
-  g_free (script);
+    g_free(script);
 }
 
 static void
-seed_exec (gchar * filename)
+seed_exec(gchar* filename)
 {
-  SeedObject global;
-  SeedScript *script;
-  SeedException e;
-  gchar *buffer;
+    SeedObject global;
+    SeedScript* script;
+    SeedException e;
+    gchar* buffer;
 
-  g_file_get_contents (filename, &buffer, 0, 0);
+    g_file_get_contents(filename, &buffer, 0, 0);
 
-  if (!buffer)
-    {
-      g_critical ("File %s not found!", filename);
-      exit (EXIT_FAILURE);
+    if (!buffer) {
+        g_critical("File %s not found!", filename);
+        exit(EXIT_FAILURE);
     }
 
-  if (*buffer == '#')
-    {
-      while (*buffer != '\n')
-	buffer++;
-      buffer++;
+    if (*buffer == '#') {
+        while (*buffer != '\n')
+            buffer++;
+        buffer++;
     }
 
-  script = seed_make_script (eng->context, buffer, filename, 1);
+    script = seed_make_script(eng->context, buffer, filename, 1);
 
-  if ((e = seed_script_exception (script)))
-    {
-      g_critical ("%s", seed_exception_to_string (eng->context, e));
-      exit (EXIT_FAILURE);
+    if ((e = seed_script_exception(script))) {
+        g_critical("%s", seed_exception_to_string(eng->context, e));
+        exit(EXIT_FAILURE);
     }
 
-  global = seed_context_get_global_object (eng->context);
-  seed_importer_add_global (global, filename);
+    global = seed_context_get_global_object(eng->context);
+    seed_importer_add_global(global, filename);
 
-  seed_evaluate (eng->context, script, 0);
-  if ((e = seed_script_exception (script)))
-    {
-      g_critical ("%s", seed_exception_to_string (eng->context, e));
-      exit (EXIT_FAILURE);
+    seed_evaluate(eng->context, script, 0);
+    if ((e = seed_script_exception(script))) {
+        g_critical("%s", seed_exception_to_string(eng->context, e));
+        exit(EXIT_FAILURE);
     }
 
-  g_free (script);
+    g_free(script);
 }
 
 static void
-seed_exec_str ()
+seed_exec_str()
 {
-  SeedException e = NULL;
-  SeedValue val;
-  gchar *val_str;
-
-  val =
-    seed_simple_evaluate (eng->context, seed_interpreter_arg_exec_string, &e);
-
-  if (e)
-    {
-      g_critical ("%s", seed_exception_to_string (eng->context, e));
-      exit (EXIT_FAILURE);
+    SeedException e = NULL;
+    SeedValue val;
+    gchar* val_str;
+
+    val = seed_simple_evaluate(eng->context, seed_interpreter_arg_exec_string,
+                               &e);
+
+    if (e) {
+        g_critical("%s", seed_exception_to_string(eng->context, e));
+        exit(EXIT_FAILURE);
+    } else {
+        val_str = seed_value_to_string(eng->context, val, &e);
+        if (e) {
+            g_critical("%s", seed_exception_to_string(eng->context, e));
+            exit(EXIT_FAILURE);
+        }
+
+        g_print("%s\n", val_str);
+        g_free(seed_interpreter_arg_exec_string);
+        g_free(val_str);
+
+        exit(EXIT_SUCCESS);
     }
-  else
-    {
-      val_str = seed_value_to_string (eng->context, val, &e);
-      if (e)
-	{
-	  g_critical ("%s", seed_exception_to_string (eng->context, e));
-	  exit (EXIT_FAILURE);
-	}
-
-      g_print ("%s\n", val_str);
-      g_free (seed_interpreter_arg_exec_string);
-      g_free (val_str);
-
-      exit (EXIT_SUCCESS);
-    }
-
 }
 
 gint
-main (gint argc, gchar ** argv)
+main(gint argc, gchar** argv)
 {
-  g_set_prgname ("seed");
-  g_thread_init (NULL);
+    g_set_prgname("seed");
+#if !GLIB_CHECK_VERSION(2, 32, 0)
+    g_thread_init(NULL);
+#endif
 
-  seed_interpreter_parse_args (&argc, &argv);
+    seed_interpreter_parse_args(&argc, &argv);
 
-  if (seed_interpreter_arg_print_version)
-    {
-      g_print ("%s\n", "Seed " VERSION);
-      exit (EXIT_SUCCESS);
+    if (seed_interpreter_arg_print_version) {
+        g_print("%s\n", "Seed " VERSION);
+        exit(EXIT_SUCCESS);
     }
 
-  eng = seed_init (&argc, &argv);
+    eng = seed_init(&argc, &argv);
 
-  seed_engine_set_search_path (eng, DEFAULT_PATH);
+    seed_engine_set_search_path(eng, DEFAULT_PATH);
 
-  if (seed_interpreter_arg_exec_string)
-    seed_exec_str ();
-  else if (argc == 1)
-    seed_repl ();
-  else
-    seed_exec (argv[1]);
+    if (seed_interpreter_arg_exec_string)
+        seed_exec_str();
+    else if (argc == 1)
+        seed_repl();
+    else
+        seed_exec(argv[1]);
 
-  return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }
diff --git a/test-driver b/test-driver
new file mode 100755
index 0000000..8e575b0
--- /dev/null
+++ b/test-driver
@@ -0,0 +1,148 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2013-07-13.22; # UTC
+
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# 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.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 372417f..e909f01 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,30 +88,41 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -82,12 +130,33 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -176,6 +245,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -189,6 +260,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -212,8 +284,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -225,6 +306,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -319,6 +401,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -344,7 +427,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu tests/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -370,22 +452,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -400,57 +485,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -466,12 +506,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -483,15 +518,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -500,6 +531,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -660,22 +706,22 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/c/Makefile.in b/tests/c/Makefile.in
index 068f192..1b3aa6c 100644
--- a/tests/c/Makefile.in
+++ b/tests/c/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,12 +91,16 @@ host_triplet = @host@
 noinst_PROGRAMS = test$(EXEEXT)
 TESTS = test$(EXEEXT)
 subdir = tests/c
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -72,9 +113,22 @@ test_DEPENDENCIES = ../../libseed/libseed@SEED_GTK_VERSION@.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_CFLAGS) $(CFLAGS) \
 	$(test_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+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_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -87,20 +141,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-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_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(test_SOURCES)
 DIST_SOURCES = $(test_SOURCES)
 am__can_run_installinfo = \
@@ -108,10 +158,231 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+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__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	$(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -175,6 +446,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -188,6 +461,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -211,8 +485,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -224,6 +507,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -318,6 +602,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -349,7 +634,7 @@ test_LDADD = \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -362,7 +647,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/c/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu tests/c/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -389,6 +673,7 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) 
 	@rm -f test$(EXEEXT)
 	$(AM_V_CCLD)$(test_LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
@@ -410,14 +695,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -502,26 +787,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -533,15 +807,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -550,102 +820,187 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test.log: test$(EXEEXT)
+	@p='test$(EXEEXT)'; \
+	b='test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -702,6 +1057,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -785,9 +1143,9 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -797,7 +1155,9 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/c/api-closure.c b/tests/c/api-closure.c
index 44939a5..ae8c13f 100644
--- a/tests/c/api-closure.c
+++ b/tests/c/api-closure.c
@@ -20,46 +20,50 @@
 #include "../../libseed/seed.h"
 #include "test-common.h"
 
-SeedValue do_some_math(SeedContext ctx,
-					   SeedObject function,
-					   SeedObject this_object,
-					   size_t argument_count,
-					   const SeedValue arguments[], SeedException * exception)
+SeedValue
+do_some_math(SeedContext ctx,
+             SeedObject function,
+             SeedObject this_object,
+             size_t argument_count,
+             const SeedValue arguments[],
+             SeedException* exception)
 {
-	g_assert(argument_count == 4);
+    g_assert(argument_count == 4);
 
-	guint a = seed_value_to_uint(ctx, arguments[0], NULL);
-	gdouble b = seed_value_to_int(ctx, arguments[1], NULL);
-	gint c = seed_value_to_int(ctx, arguments[2], NULL);
-	gchar *d = seed_value_to_string(ctx, arguments[3], NULL);
+    guint a = seed_value_to_uint(ctx, arguments[0], NULL);
+    gdouble b = seed_value_to_int(ctx, arguments[1], NULL);
+    gint c = seed_value_to_int(ctx, arguments[2], NULL);
+    gchar* d = seed_value_to_string(ctx, arguments[3], NULL);
 
-	g_assert(d[0] == 'a');
+    g_assert(d[0] == 'a');
 
-	return seed_value_from_double(ctx, (a + b) / c, NULL);
+    return seed_value_from_double(ctx, (a + b) / c, NULL);
 }
 
-void closures(TestSimpleFixture * fixture, gconstpointer _data)
+void
+closures(TestSimpleFixture* fixture, gconstpointer _data)
 {
-	TestSharedState *state = (TestSharedState *) _data;
+    TestSharedState* state = (TestSharedState*) _data;
 
-	seed_create_function(state->eng->context, "do_some_math",
-						 (SeedFunctionCallback) do_some_math,
-						 (SeedObject) state->eng->global);
+    seed_create_function(state->eng->context, "do_some_math",
+                         (SeedFunctionCallback) do_some_math,
+                         (SeedObject) state->eng->global);
 
-	SeedValue *val = seed_simple_evaluate(state->eng->context,
-										  "do_some_math(5, 8.66, -2, 'a')", NULL);
-	g_assert(seed_value_to_double(state->eng->context, val, NULL) == -6.5);
+    SeedValue* val
+      = seed_simple_evaluate(state->eng->context,
+                             "do_some_math(5, 8.66, -2, 'a')", NULL);
+    g_assert(seed_value_to_double(state->eng->context, val, NULL) == -6.5);
 
-	SeedObject *dsm_obj = seed_object_get_property(state->eng->context,
-												   (SeedObject) state->eng->
-												   global,
-												   "do_some_math");
-	SeedValue args[4];
-	args[0] = seed_value_from_uint(state->eng->context, 5, NULL);
-	args[1] = seed_value_from_double(state->eng->context, 8.66, NULL);
-	args[2] = seed_value_from_int(state->eng->context, -2, NULL);
-	args[3] = seed_value_from_string(state->eng->context, "a", NULL);
-	val = seed_object_call(state->eng->context, dsm_obj, NULL, 4, args, NULL);
+    SeedObject* dsm_obj
+      = seed_object_get_property(state->eng->context,
+                                 (SeedObject) state->eng->global,
+                                 "do_some_math");
+    SeedValue args[4];
+    args[0] = seed_value_from_uint(state->eng->context, 5, NULL);
+    args[1] = seed_value_from_double(state->eng->context, 8.66, NULL);
+    args[2] = seed_value_from_int(state->eng->context, -2, NULL);
+    args[3] = seed_value_from_string(state->eng->context, "a", NULL);
+    val = seed_object_call(state->eng->context, dsm_obj, NULL, 4, args, NULL);
 
-	g_assert(seed_value_to_double(state->eng->context, val, NULL) == -6.5);
+    g_assert(seed_value_to_double(state->eng->context, val, NULL) == -6.5);
 }
diff --git a/tests/c/api-js-signal-from-c.c b/tests/c/api-js-signal-from-c.c
index b16c1ff..534d9b7 100644
--- a/tests/c/api-js-signal-from-c.c
+++ b/tests/c/api-js-signal-from-c.c
@@ -22,46 +22,52 @@
 
 #include <string.h>
 
-gdouble hello_cb(gpointer w, gint a, gchar * b)
+gdouble
+hello_cb(gpointer w, gint a, gchar* b)
 {
-	g_assert(a == 2);
-	g_assert(strncmp(b, "Test", 4) == 0);
+    g_assert(a == 2);
+    g_assert(strncmp(b, "Test", 4) == 0);
 
-	return 5.12;
+    return 5.12;
 }
 
-void js_signal_from_c(TestSimpleFixture * fixture, gconstpointer _data)
+void
+js_signal_from_c(TestSimpleFixture* fixture, gconstpointer _data)
 {
-	TestSharedState *state = (TestSharedState *) _data;
+    TestSharedState* state = (TestSharedState*) _data;
 
-	SeedValue *val = seed_simple_evaluate(state->eng->context,
-					      "Gtk = imports.gi.Gtk;"
-					      "GObject = imports.gi.GObject;"
-					      "Gtk.init(null, null);"
-					      "HelloWindowType = {"
-					      "    parent: Gtk.Window.type,"
-					      "    name: \"HelloWindow\","
-					      "    class_init: function(klass, prototype)"
-					      "    {"
-					      "	var HelloSignalDefinition = {name: \"hello\","
-					      "								 parameters: [GObject.TYPE_INT,"
-					      "											  GObject.TYPE_STRING],"
-					      "								 return_type: GObject.TYPE_DOUBLE};"
-					      "	hello_signal_id = klass.install_signal(HelloSignalDefinition);"
-					      "    },"
-					      "    init: function(instance)"
-					      "    {"
-					      "    }};"
-					      "HelloWindow = new GType(HelloWindowType);"
-					      "w = new HelloWindow();", NULL);
+    SeedValue* val = seed_simple_evaluate(
+      state->eng->context,
+      "Gtk = imports.gi.Gtk;"
+      "GObject = imports.gi.GObject;"
+      "Gtk.init(null, null);"
+      "HelloWindowType = {"
+      "    parent: Gtk.Window.type,"
+      "    name: \"HelloWindow\","
+      "    class_init: function(klass, prototype)"
+      "    {"
+      "	var HelloSignalDefinition = {name: \"hello\","
+      "								 "
+      "parameters: [GObject.TYPE_INT,"
+      "									"
+      "		  GObject.TYPE_STRING],"
+      "								 "
+      "return_type: GObject.TYPE_DOUBLE};"
+      "	hello_signal_id = klass.install_signal(HelloSignalDefinition);"
+      "    },"
+      "    init: function(instance)"
+      "    {"
+      "    }};"
+      "HelloWindow = new GType(HelloWindowType);"
+      "w = new HelloWindow();",
+      NULL);
 
-	GObject *obj = seed_value_to_object(state->eng->context, val, NULL);
+    GObject* obj = seed_value_to_object(state->eng->context, val, NULL);
 
-	g_signal_connect(obj, "hello", G_CALLBACK(hello_cb), NULL);
+    g_signal_connect(obj, "hello", G_CALLBACK(hello_cb), NULL);
 
-	val =
-		seed_simple_evaluate(state->eng->context,
-				     "g = w.signal.hello.emit(2,'Test')", NULL);
+    val = seed_simple_evaluate(state->eng->context,
+                               "g = w.signal.hello.emit(2,'Test')", NULL);
 
-	g_assert(seed_value_to_double(state->eng->context, val, NULL) == 5.12);
+    g_assert(seed_value_to_double(state->eng->context, val, NULL) == 5.12);
 }
diff --git a/tests/c/api-types.c b/tests/c/api-types.c
index 4d6bbde..560bf47 100644
--- a/tests/c/api-types.c
+++ b/tests/c/api-types.c
@@ -23,149 +23,144 @@
 
 // The biggest problem here is everything gets cast to a double in JSCore!
 
-void basic_types(TestSimpleFixture * fixture, gconstpointer _data)
+void
+basic_types(TestSimpleFixture* fixture, gconstpointer _data)
 {
-	// bool to/from JS equality
+    // bool to/from JS equality
 
-	gboolean bool_test_in = TRUE;
-	SeedValue *bool_test = seed_value_from_boolean(fixture->context,
-												   bool_test_in, NULL);
-	gboolean bool_test_out = seed_value_to_boolean(fixture->context,
-												   bool_test, NULL);
+    gboolean bool_test_in = TRUE;
+    SeedValue* bool_test
+      = seed_value_from_boolean(fixture->context, bool_test_in, NULL);
+    gboolean bool_test_out
+      = seed_value_to_boolean(fixture->context, bool_test, NULL);
 
-	g_assert(bool_test_in == bool_test_out);
+    g_assert(bool_test_in == bool_test_out);
 
-	// uint to/from JS equality
+    // uint to/from JS equality
 
-	guint uint_test_in = 2946623;
-	SeedValue *uint_test = seed_value_from_uint(fixture->context,
-												uint_test_in, NULL);
-	guint uint_test_out = seed_value_to_uint(fixture->context,
-											 uint_test, NULL);
+    guint uint_test_in = 2946623;
+    SeedValue* uint_test
+      = seed_value_from_uint(fixture->context, uint_test_in, NULL);
+    guint uint_test_out = seed_value_to_uint(fixture->context, uint_test, NULL);
 
-	g_assert(uint_test_in == uint_test_out);
+    g_assert(uint_test_in == uint_test_out);
 
-	// int to/from JS equality
+    // int to/from JS equality
 
-	gint int_test_in = -54374;
-	SeedValue *int_test = seed_value_from_int(fixture->context,
-											  int_test_in, NULL);
-	gint int_test_out = seed_value_to_int(fixture->context,
-										  int_test, NULL);
+    gint int_test_in = -54374;
+    SeedValue* int_test
+      = seed_value_from_int(fixture->context, int_test_in, NULL);
+    gint int_test_out = seed_value_to_int(fixture->context, int_test, NULL);
 
-	g_assert(int_test_in == int_test_out);
+    g_assert(int_test_in == int_test_out);
 
-	// char to/from JS equality
+    // char to/from JS equality
 
-	gchar char_test_in = -126;
-	SeedValue *char_test = seed_value_from_char(fixture->context,
-												char_test_in, NULL);
-	gchar char_test_out = seed_value_to_char(fixture->context,
-											 char_test, NULL);
+    gchar char_test_in = -126;
+    SeedValue* char_test
+      = seed_value_from_char(fixture->context, char_test_in, NULL);
+    gchar char_test_out = seed_value_to_char(fixture->context, char_test, NULL);
 
-	g_assert(char_test_in == char_test_out);
+    g_assert(char_test_in == char_test_out);
 
-	// uchar to/from JS equality
+    // uchar to/from JS equality
 
-	guchar uchar_test_in = 250;
-	SeedValue *uchar_test = seed_value_from_uchar(fixture->context,
-												  uchar_test_in, NULL);
-	guchar uchar_test_out = seed_value_to_uchar(fixture->context,
-												uchar_test, NULL);
+    guchar uchar_test_in = 250;
+    SeedValue* uchar_test
+      = seed_value_from_uchar(fixture->context, uchar_test_in, NULL);
+    guchar uchar_test_out
+      = seed_value_to_uchar(fixture->context, uchar_test, NULL);
 
-	g_assert(uchar_test_in == uchar_test_out);
+    g_assert(uchar_test_in == uchar_test_out);
 
-	// long to/from JS equality
+    // long to/from JS equality
 
-	glong long_test_in = -454250;
-	SeedValue *long_test = seed_value_from_long(fixture->context,
-												long_test_in, NULL);
-	glong long_test_out = seed_value_to_long(fixture->context,
-											 long_test, NULL);
+    glong long_test_in = -454250;
+    SeedValue* long_test
+      = seed_value_from_long(fixture->context, long_test_in, NULL);
+    glong long_test_out = seed_value_to_long(fixture->context, long_test, NULL);
 
-	g_assert(long_test_in == long_test_out);
+    g_assert(long_test_in == long_test_out);
 
-	// ulong to/from JS equality
+    // ulong to/from JS equality
 
-	gulong ulong_test_in = 250;
-	SeedValue *ulong_test = seed_value_from_ulong(fixture->context,
-												  ulong_test_in, NULL);
-	gulong ulong_test_out = seed_value_to_ulong(fixture->context,
-												ulong_test, NULL);
+    gulong ulong_test_in = 250;
+    SeedValue* ulong_test
+      = seed_value_from_ulong(fixture->context, ulong_test_in, NULL);
+    gulong ulong_test_out
+      = seed_value_to_ulong(fixture->context, ulong_test, NULL);
 
-	g_assert(ulong_test_in == ulong_test_out);
+    g_assert(ulong_test_in == ulong_test_out);
 
-	// int64 to/from JS equality
+    // int64 to/from JS equality
 
-	gint64 int64_test_in = -54374;
-	SeedValue *int64_test = seed_value_from_int64(fixture->context,
-												  int64_test_in, NULL);
-	gint64 int64_test_out = seed_value_to_int64(fixture->context,
-												int64_test, NULL);
+    gint64 int64_test_in = -54374;
+    SeedValue* int64_test
+      = seed_value_from_int64(fixture->context, int64_test_in, NULL);
+    gint64 int64_test_out
+      = seed_value_to_int64(fixture->context, int64_test, NULL);
 
-	g_assert(int64_test_in == int64_test_out);
+    g_assert(int64_test_in == int64_test_out);
 
-	// uint64 to/from JS equality
+    // uint64 to/from JS equality
 
-	guint64 uint64_test_in = 2946623;
-	SeedValue *uint64_test = seed_value_from_uint64(fixture->context,
-													uint64_test_in, NULL);
-	guint64 uint64_test_out = seed_value_to_uint64(fixture->context,
-												   uint64_test, NULL);
+    guint64 uint64_test_in = 2946623;
+    SeedValue* uint64_test
+      = seed_value_from_uint64(fixture->context, uint64_test_in, NULL);
+    guint64 uint64_test_out
+      = seed_value_to_uint64(fixture->context, uint64_test, NULL);
 
-	g_assert(uint64_test_in == uint64_test_out);
+    g_assert(uint64_test_in == uint64_test_out);
 
-	// float to/from JS equality
+    // float to/from JS equality
 
-	gfloat float_test_in = 1.618;
-	SeedValue *float_test = seed_value_from_float(fixture->context,
-												  float_test_in, NULL);
-	gfloat float_test_out = seed_value_to_float(fixture->context,
-												float_test, NULL);
+    gfloat float_test_in = 1.618;
+    SeedValue* float_test
+      = seed_value_from_float(fixture->context, float_test_in, NULL);
+    gfloat float_test_out
+      = seed_value_to_float(fixture->context, float_test, NULL);
 
-	g_assert(float_test_in == float_test_out);
+    g_assert(float_test_in == float_test_out);
 
-	// double to/from JS equality
+    // double to/from JS equality
 
-	gdouble double_test_in = 1.6134857638;
-	SeedValue *double_test = seed_value_from_double(fixture->context,
-													double_test_in, NULL);
-	gdouble double_test_out = seed_value_to_double(fixture->context,
-												   double_test, NULL);
+    gdouble double_test_in = 1.6134857638;
+    SeedValue* double_test
+      = seed_value_from_double(fixture->context, double_test_in, NULL);
+    gdouble double_test_out
+      = seed_value_to_double(fixture->context, double_test, NULL);
 
-	g_assert(double_test_in == double_test_out);
+    g_assert(double_test_in == double_test_out);
 
-	// string to/from JS equality
+    // string to/from JS equality
 
-	gchar *string_test_in = "Hello, world!";
-	SeedValue *string_test = seed_value_from_string(fixture->context,
-													string_test_in, NULL);
-	gchar *string_test_out = seed_value_to_string(fixture->context,
-												  string_test, NULL);
+    gchar* string_test_in = "Hello, world!";
+    SeedValue* string_test
+      = seed_value_from_string(fixture->context, string_test_in, NULL);
+    gchar* string_test_out
+      = seed_value_to_string(fixture->context, string_test, NULL);
 
-	g_assert(strncmp(string_test_in, string_test_out,
-					 strlen(string_test_in)) == 0);
+    g_assert(strncmp(string_test_in, string_test_out, strlen(string_test_in))
+             == 0);
 
-	// filename to/from JS equality
+    // filename to/from JS equality
 
-	gchar *filename_test_in = "/bin";
-	SeedValue *filename_test = seed_value_from_filename(fixture->context,
-														filename_test_in,
-														NULL);
-	gchar *filename_test_out = seed_value_to_filename(fixture->context,
-													  filename_test, NULL);
-
-	g_assert(strncmp(filename_test_in, filename_test_out,
-					 strlen(filename_test_in)) == 0);
-	SeedValue si[2];
-	si[0] = seed_value_from_string (fixture->context, "Hi", NULL);
-	si[1] = seed_value_from_int (fixture->context, 1, NULL);
-	gint ni;
-	gchar *ns;
-
-	seed_value_to_format (fixture->context, "si", si, NULL, &ns, &ni, NULL);
-	g_assert (ni == 1);
-	g_assert (!strcmp(ns, "Hi"));
+    gchar* filename_test_in = "/bin";
+    SeedValue* filename_test
+      = seed_value_from_filename(fixture->context, filename_test_in, NULL);
+    gchar* filename_test_out
+      = seed_value_to_filename(fixture->context, filename_test, NULL);
 
+    g_assert(
+      strncmp(filename_test_in, filename_test_out, strlen(filename_test_in))
+      == 0);
+    SeedValue si[2];
+    si[0] = seed_value_from_string(fixture->context, "Hi", NULL);
+    si[1] = seed_value_from_int(fixture->context, 1, NULL);
+    gint ni;
+    gchar* ns;
 
+    seed_value_to_format(fixture->context, "si", si, NULL, &ns, &ni, NULL);
+    g_assert(ni == 1);
+    g_assert(!strcmp(ns, "Hi"));
 }
diff --git a/tests/c/basic.c b/tests/c/basic.c
index 14c6809..3c75046 100644
--- a/tests/c/basic.c
+++ b/tests/c/basic.c
@@ -20,7 +20,8 @@
 #include "../../libseed/seed.h"
 #include "test-common.h"
 
-void basic(TestSimpleFixture * fixture, gconstpointer _data)
+void
+basic(TestSimpleFixture* fixture, gconstpointer _data)
 {
-	g_assert(1);
+    g_assert(1);
 }
diff --git a/tests/c/main.c b/tests/c/main.c
index 03b406d..013f39d 100644
--- a/tests/c/main.c
+++ b/tests/c/main.c
@@ -23,50 +23,47 @@
 
 // Test stuff stolen from Clutter
 
-#define TEST_SIMPLE(NAMESPACE, FUNC)					\
-  extern void FUNC (TestSimpleFixture *fixture, gconstpointer data);	\
-  g_test_add (NAMESPACE "/" #FUNC,					\
-	      TestSimpleFixture,					\
-	      shared_state,						\
-	      test_simple_fixture_setup,				\
-	      FUNC,							\
-	      test_simple_fixture_teardown);
+#define TEST_SIMPLE(NAMESPACE, FUNC)                                           \
+    extern void FUNC(TestSimpleFixture* fixture, gconstpointer data);          \
+    g_test_add(NAMESPACE "/" #FUNC, TestSimpleFixture, shared_state,           \
+               test_simple_fixture_setup, FUNC, test_simple_fixture_teardown);
 
-void test_simple_fixture_setup(TestSimpleFixture * fixture, gconstpointer data)
+void
+test_simple_fixture_setup(TestSimpleFixture* fixture, gconstpointer data)
 {
-  TestSharedState *state = (TestSharedState *) data;
-  fixture->context = seed_context_create(state->eng->group, NULL);
+    TestSharedState* state = (TestSharedState*) data;
+    fixture->context = seed_context_create(state->eng->group, NULL);
 }
 
-void test_simple_fixture_teardown(TestSimpleFixture * fixture,
-				  gconstpointer data)
+void
+test_simple_fixture_teardown(TestSimpleFixture* fixture, gconstpointer data)
 {
-  seed_context_unref(fixture->context);
+    seed_context_unref(fixture->context);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char** argv)
 {
-  TestSharedState *shared_state = g_new0(TestSharedState, 1);
-  const gchar *display = g_getenv("DISPLAY");
+    TestSharedState* shared_state = g_new0(TestSharedState, 1);
+    const gchar* display = g_getenv("DISPLAY");
 
-  if (!display || *display == '\0')
-    {
-      g_print("No DISPLAY found. Unable to run the test suite without X11.");
-      return EXIT_SUCCESS;
+    if (!display || *display == '\0') {
+        g_print("No DISPLAY found. Unable to run the test suite without X11.");
+        return EXIT_SUCCESS;
     }
 
-  g_test_init(&argc, &argv, NULL);
+    g_test_init(&argc, &argv, NULL);
 
-  SeedEngine *eng = seed_init(NULL, NULL);
+    SeedEngine* eng = seed_init(NULL, NULL);
 
-  shared_state->argc_addr = &argc;
-  shared_state->argv_addr = &argv;
-  shared_state->eng = eng;
+    shared_state->argc_addr = &argc;
+    shared_state->argv_addr = &argv;
+    shared_state->eng = eng;
 
-  TEST_SIMPLE("/", basic);
-  TEST_SIMPLE("/", closures);
-  TEST_SIMPLE("/types/", basic_types);
-  TEST_SIMPLE("/js-signal-from-c/", js_signal_from_c);
+    TEST_SIMPLE("/", basic);
+    TEST_SIMPLE("/", closures);
+    TEST_SIMPLE("/types/", basic_types);
+    TEST_SIMPLE("/js-signal-from-c/", js_signal_from_c);
 
-  return g_test_run();
+    return g_test_run();
 }
diff --git a/tests/c/test-common.h b/tests/c/test-common.h
index e70cfe0..5c0b6a5 100644
--- a/tests/c/test-common.h
+++ b/tests/c/test-common.h
@@ -2,16 +2,18 @@
 /* Stuff you put in here is setup once in main() and gets passed around to
  * all test functions and fixture setup/teardown functions in the data
  * argument */
-typedef struct _TestSharedState {
-	int *argc_addr;
-	char ***argv_addr;
-	SeedEngine *eng;
+typedef struct _TestSharedState
+{
+    int* argc_addr;
+    char*** argv_addr;
+    SeedEngine* eng;
 } TestSharedState;
 
 /* This fixture structure is allocated by glib, and before running each test
  * the test_conform_simple_fixture_setup func (see below) is called to
  * initialise it, and test_conform_simple_fixture_teardown is called when
  * the test is finished. */
-typedef struct _TestSimpleFixture {
-	SeedContext *context;
+typedef struct _TestSimpleFixture
+{
+    SeedContext* context;
 } TestSimpleFixture;
diff --git a/tests/javascript/Makefile.in b/tests/javascript/Makefile.in
index d098c00..98c4ffc 100644
--- a/tests/javascript/Makefile.in
+++ b/tests/javascript/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,30 +88,41 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tests/javascript
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -82,14 +130,237 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	check recheck distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+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__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/test-driver \
+	COPYING
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -178,6 +449,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -191,6 +464,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -214,8 +488,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -227,6 +510,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -321,6 +605,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -406,6 +691,7 @@ TESTS = \
 all: all-recursive
 
 .SUFFIXES:
+.SUFFIXES: .log .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -418,7 +704,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/javascript/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu tests/javascript/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -444,22 +729,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -474,57 +762,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -540,12 +783,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -557,15 +795,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -574,102 +808,404 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+argv.js.log: argv.js
+	@p='argv.js'; \
+	b='argv.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+array-gtype.js.log: array-gtype.js
+	@p='array-gtype.js'; \
+	b='array-gtype.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+builtin-argument-length.js.log: builtin-argument-length.js
+	@p='builtin-argument-length.js'; \
+	b='builtin-argument-length.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check-syntax.js.log: check-syntax.js
+	@p='check-syntax.js'; \
+	b='check-syntax.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+closure-finalization.js.log: closure-finalization.js
+	@p='closure-finalization.js'; \
+	b='closure-finalization.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+compare.js.log: compare.js
+	@p='compare.js'; \
+	b='compare.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+constructor-args.js.log: constructor-args.js
+	@p='constructor-args.js'; \
+	b='constructor-args.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+constructor-prototype.js.log: constructor-prototype.js
+	@p='constructor-prototype.js'; \
+	b='constructor-prototype.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+enum.js.log: enum.js
+	@p='enum.js'; \
+	b='enum.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+fork.js.log: fork.js
+	@p='fork.js'; \
+	b='fork.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+function-info.js.log: function-info.js
+	@p='function-info.js'; \
+	b='function-info.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gdk-event.js.log: gdk-event.js
+	@p='gdk-event.js'; \
+	b='gdk-event.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gerror.js.log: gerror.js
+	@p='gerror.js'; \
+	b='gerror.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gobject-scope.js.log: gobject-scope.js
+	@p='gobject-scope.js'; \
+	b='gobject-scope.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gvalue-argument.js.log: gvalue-argument.js
+	@p='gvalue-argument.js'; \
+	b='gvalue-argument.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+include.js.log: include.js
+	@p='include.js'; \
+	b='include.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+include-syntax.js.log: include-syntax.js
+	@p='include-syntax.js'; \
+	b='include-syntax.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+introspect.js.log: introspect.js
+	@p='introspect.js'; \
+	b='introspect.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+json-constructor.js.log: json-constructor.js
+	@p='json-constructor.js'; \
+	b='json-constructor.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+json.js.log: json.js
+	@p='json.js'; \
+	b='json.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+list-test.js.log: list-test.js
+	@p='list-test.js'; \
+	b='list-test.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+modules.js.log: modules.js
+	@p='modules.js'; \
+	b='modules.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+native-closure-exception.js.log: native-closure-exception.js
+	@p='native-closure-exception.js'; \
+	b='native-closure-exception.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+native-closure.js.log: native-closure.js
+	@p='native-closure.js'; \
+	b='native-closure.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+object-info.js.log: object-info.js
+	@p='object-info.js'; \
+	b='object-info.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+out-test.js.log: out-test.js
+	@p='out-test.js'; \
+	b='out-test.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+property-benchmark.js.log: property-benchmark.js
+	@p='property-benchmark.js'; \
+	b='property-benchmark.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+property-glib-exception.js.log: property-glib-exception.js
+	@p='property-glib-exception.js'; \
+	b='property-glib-exception.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+quit.js.log: quit.js
+	@p='quit.js'; \
+	b='quit.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+sqlite.js.log: sqlite.js
+	@p='sqlite.js'; \
+	b='sqlite.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+syntax-test.js.log: syntax-test.js
+	@p='syntax-test.js'; \
+	b='syntax-test.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+type-conversion.js.log: type-conversion.js
+	@p='type-conversion.js'; \
+	b='type-conversion.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -752,6 +1288,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -828,22 +1367,23 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-TESTS check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-TESTS check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags ctags-am distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am
+
+.PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/javascript/argv.js b/tests/javascript/argv.js
index 67c6930..f24b454 100755
--- a/tests/javascript/argv.js
+++ b/tests/javascript/argv.js
@@ -1,3 +1,5 @@
 #!/usr/bin/env seed
 
-imports.testsuite.assert(Seed.argv[0] == "seed")
+// when running make check, argv is actually path/to/lt-seed
+
+imports.testsuite.assert(Seed.argv[0] == "seed" || Seed.argv[0].match(/\/lt-seed$/))
diff --git a/tests/javascript/function-info.js b/tests/javascript/function-info.js
index 29cf6ea..67351eb 100755
--- a/tests/javascript/function-info.js
+++ b/tests/javascript/function-info.js
@@ -2,8 +2,9 @@
 
 testsuite = imports.testsuite
 Gtk = imports.gi.Gtk
-GIRepository = imports.gi.GIRepository
-
+GIRepository = imports.gi.GIRepository;
+ 
 f = Gtk.Window.prototype.resize.info;
-
-testsuite.assert(f.get_name() == "resize")
+ 
+//testsuite.assert(f.get_name() == "resize")
+testsuite.assert(f == undefined)
diff --git a/tests/javascript/gdk-event.js b/tests/javascript/gdk-event.js
index e91b404..a6b025a 100755
--- a/tests/javascript/gdk-event.js
+++ b/tests/javascript/gdk-event.js
@@ -25,4 +25,4 @@ win.show()
 
 Gtk.main()
 
-testsuite.checkAsserts(4)
+testsuite.checkAsserts(2)
diff --git a/tests/javascript/gtypes/Makefile.in b/tests/javascript/gtypes/Makefile.in
index 7e64b7c..1d491a9 100644
--- a/tests/javascript/gtypes/Makefile.in
+++ b/tests/javascript/gtypes/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,21 +88,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tests/javascript/gtypes
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -73,8 +120,212 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+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__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -138,6 +389,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -151,6 +404,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -174,8 +428,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -187,6 +450,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -281,6 +545,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -322,6 +587,7 @@ TESTS = \
 all: all-am
 
 .SUFFIXES:
+.SUFFIXES: .log .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -334,7 +600,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/javascript/gtypes/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu tests/javascript/gtypes/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -358,105 +623,252 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+gtype-class-init-exception.js.log: gtype-class-init-exception.js
+	@p='gtype-class-init-exception.js'; \
+	b='gtype-class-init-exception.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-typerror.js.log: gtype-typerror.js
+	@p='gtype-typerror.js'; \
+	b='gtype-typerror.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype.js.log: gtype.js
+	@p='gtype.js'; \
+	b='gtype.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-gtype.js.log: gtype-gtype.js
+	@p='gtype-gtype.js'; \
+	b='gtype-gtype.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-signal-args.js.log: gtype-signal-args.js
+	@p='gtype-signal-args.js'; \
+	b='gtype-signal-args.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-signal-order-bug663289.js.log: gtype-signal-order-bug663289.js
+	@p='gtype-signal-order-bug663289.js'; \
+	b='gtype-signal-order-bug663289.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-property-construct.js.log: gtype-property-construct.js
+	@p='gtype-property-construct.js'; \
+	b='gtype-property-construct.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-property-nice.js.log: gtype-property-nice.js
+	@p='gtype-property-nice.js'; \
+	b='gtype-property-nice.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-self.js.log: gtype-self.js
+	@p='gtype-self.js'; \
+	b='gtype-self.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-extraprop.js.log: gtype-extraprop.js
+	@p='gtype-extraprop.js'; \
+	b='gtype-extraprop.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-gtype-class-init.js.log: gtype-gtype-class-init.js
+	@p='gtype-gtype-class-init.js'; \
+	b='gtype-gtype-class-init.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+gtype-signal.js.log: gtype-signal.js
+	@p='gtype-signal.js'; \
+	b='gtype-signal.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -513,6 +925,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -592,17 +1007,20 @@ uninstall-am:
 .MAKE: check-am install-am install-strip
 
 .PHONY: all all-am check check-TESTS 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-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	clean-libtool cscopelist-am ctags-am 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-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \
 	uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # 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/tests/javascript/modules.js b/tests/javascript/modules.js
index cfc4f5a..1a7d737 100755
--- a/tests/javascript/modules.js
+++ b/tests/javascript/modules.js
@@ -2,7 +2,7 @@
 
 testsuite = imports.testsuite
 
-input = Seed.spawn("/usr/bin/env seed modules-noasserts.js");
+input = Seed.spawn(Seed.argv[0] + " modules-noasserts.js");
 
 testsuite.assert(input.stdout == "Hello Seed Module World\n")
 
diff --git a/tests/javascript/signals/Makefile.in b/tests/javascript/signals/Makefile.in
index 316149b..cf28dcd 100644
--- a/tests/javascript/signals/Makefile.in
+++ b/tests/javascript/signals/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,21 +88,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tests/javascript/signals
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -73,8 +120,212 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+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__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -138,6 +389,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -151,6 +404,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -174,8 +428,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -187,6 +450,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -281,6 +545,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -314,6 +579,7 @@ TESTS = \
 all: all-am
 
 .SUFFIXES:
+.SUFFIXES: .log .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -326,7 +592,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/javascript/signals/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu tests/javascript/signals/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -350,105 +615,224 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+signal-connect.js.log: signal-connect.js
+	@p='signal-connect.js'; \
+	b='signal-connect.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal-disconnect.js.log: signal-disconnect.js
+	@p='signal-disconnect.js'; \
+	b='signal-disconnect.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal-exception.js.log: signal-exception.js
+	@p='signal-exception.js'; \
+	b='signal-exception.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal-expects.js.log: signal-expects.js
+	@p='signal-expects.js'; \
+	b='signal-expects.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal-invalid.js.log: signal-invalid.js
+	@p='signal-invalid.js'; \
+	b='signal-invalid.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal.js.log: signal.js
+	@p='signal.js'; \
+	b='signal.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal-nofunc.js.log: signal-nofunc.js
+	@p='signal-nofunc.js'; \
+	b='signal-nofunc.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+signal-userdata.js.log: signal-userdata.js
+	@p='signal-userdata.js'; \
+	b='signal-userdata.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -505,6 +889,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -584,17 +971,20 @@ uninstall-am:
 .MAKE: check-am install-am install-strip
 
 .PHONY: all all-am check check-TESTS 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-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	clean-libtool cscopelist-am ctags-am 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-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \
 	uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # 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/tests/javascript/sqlite.js b/tests/javascript/sqlite.js
index 0d02392..7bc53a3 100755
--- a/tests/javascript/sqlite.js
+++ b/tests/javascript/sqlite.js
@@ -1,5 +1,9 @@
 #!/usr/bin/env seed
 
+// this may not be the real build location... - but push it on the stack 
+imports.searchPath.unshift('../../modules/sqlite/.libs');
+
+
 testsuite = imports.testsuite
 Gio = imports.gi.Gio
 sqlite = imports.sqlite
diff --git a/tests/javascript/structs/Makefile.in b/tests/javascript/structs/Makefile.in
index 68788a7..d9def14 100644
--- a/tests/javascript/structs/Makefile.in
+++ b/tests/javascript/structs/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.15 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.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,21 +88,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = tests/javascript/structs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/intltool.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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 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_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -73,8 +120,212 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+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__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -138,6 +389,8 @@ GDK_LIBS = @GDK_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNOME_JS_CFLAGS = @GNOME_JS_CFLAGS@
@@ -151,6 +404,7 @@ GREP = @GREP@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -174,8 +428,17 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -187,6 +450,7 @@ LIBXSS_LIBS = @LIBXSS_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -281,6 +545,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -314,6 +579,7 @@ TESTS = \
 all: all-am
 
 .SUFFIXES:
+.SUFFIXES: .log .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -326,7 +592,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/javascript/structs/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu tests/javascript/structs/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -350,105 +615,224 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+struct-functions.js.log: struct-functions.js
+	@p='struct-functions.js'; \
+	b='struct-functions.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-set-member.js.log: struct-set-member.js
+	@p='struct-set-member.js'; \
+	b='struct-set-member.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-constructor.js.log: struct-constructor.js
+	@p='struct-constructor.js'; \
+	b='struct-constructor.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-nested-set.js.log: struct-nested-set.js
+	@p='struct-nested-set.js'; \
+	b='struct-nested-set.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-null.js.log: struct-null.js
+	@p='struct-null.js'; \
+	b='struct-null.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-union-enumerate.js.log: struct-union-enumerate.js
+	@p='struct-union-enumerate.js'; \
+	b='struct-union-enumerate.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-enumerate.js.log: struct-enumerate.js
+	@p='struct-enumerate.js'; \
+	b='struct-enumerate.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+struct-offsets.js.log: struct-offsets.js
+	@p='struct-offsets.js'; \
+	b='struct-offsets.js'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -505,6 +889,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -584,17 +971,20 @@ uninstall-am:
 .MAKE: check-am install-am install-strip
 
 .PHONY: all all-am check check-TESTS 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-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	clean-libtool cscopelist-am ctags-am 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-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \
 	uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # 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.