r16190 - in /desktop/unstable/pygobject/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jun 7 13:20:21 UTC 2008


Author: joss
Date: Sat Jun  7 13:20:21 2008
New Revision: 16190

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16190
Log:
* Switch to quilt; build-depend on quilt.
* New upstream release.
  + Refresh patches.
* 03_maintainer_mode.patch: add AM_MAINTAINER_MODE.
* 61_wakeupfd-fix.patch: do not use the wakeupfd in non-threaded 
  applications, as it is not initialized.

Added:
    desktop/unstable/pygobject/debian/patches/03_maintainer_mode.patch
    desktop/unstable/pygobject/debian/patches/series
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/control
    desktop/unstable/pygobject/debian/control.in
    desktop/unstable/pygobject/debian/patches/01_pkgconfig-private.patch
    desktop/unstable/pygobject/debian/patches/02_ffi-use-pkgconfig.patch
    desktop/unstable/pygobject/debian/patches/60_use-python-config-for-includes.patch
    desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch
    desktop/unstable/pygobject/debian/patches/90_autofoo.patch
    desktop/unstable/pygobject/debian/rules

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog (original)
+++ desktop/unstable/pygobject/debian/changelog Sat Jun  7 13:20:21 2008
@@ -1,3 +1,14 @@
+pygobject (2.14.2-1) unstable; urgency=low
+
+  * Switch to quilt; build-depend on quilt.
+  * New upstream release.
+    + Refresh patches.
+  * 03_maintainer_mode.patch: add AM_MAINTAINER_MODE.
+  * 61_wakeupfd-fix.patch: do not use the wakeupfd in non-threaded 
+    applications, as it is not initialized.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 07 Jun 2008 15:05:11 +0200
+
 pygobject (2.14.1-8) unstable; urgency=low
 
   * Revert last upload, the pygobject patch was fine and the bug lies in 

Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control (original)
+++ desktop/unstable/pygobject/debian/control Sat Jun  7 13:20:21 2008
@@ -7,6 +7,7 @@
                python-support (>= 0.4),
                gnome-pkg-tools (>= 0.10),
                cdbs,
+               quilt,
                python2.5-dev (>= 2.5.2-5),
                python-all-dev (>= 2.3.5),
                libglib2.0-dev (>= 2.8.0),

Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in (original)
+++ desktop/unstable/pygobject/debian/control.in Sat Jun  7 13:20:21 2008
@@ -7,6 +7,7 @@
                python-support (>= 0.4),
                gnome-pkg-tools (>= 0.10),
                cdbs,
+               quilt,
                python2.5-dev (>= 2.5.2-5),
                python-all-dev (>= 2.3.5),
                libglib2.0-dev (>= 2.8.0),

Modified: desktop/unstable/pygobject/debian/patches/01_pkgconfig-private.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/01_pkgconfig-private.patch?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/01_pkgconfig-private.patch (original)
+++ desktop/unstable/pygobject/debian/patches/01_pkgconfig-private.patch Sat Jun  7 13:20:21 2008
@@ -1,5 +1,5 @@
---- pygobject-2.0.pc.in.orig	2008-03-24 23:08:38.496678562 +0100
-+++ pygobject-2.0.pc.in	2008-03-24 23:57:17.900679259 +0100
+--- a/pygobject-2.0.pc.in.orig	2008-03-24 23:08:38.496678562 +0100
++++ b/pygobject-2.0.pc.in	2008-03-24 23:57:17.900679259 +0100
 @@ -15,6 +15,6 @@
  Name: PyGObject
  Description: Python bindings for GObject

Modified: desktop/unstable/pygobject/debian/patches/02_ffi-use-pkgconfig.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/02_ffi-use-pkgconfig.patch?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/02_ffi-use-pkgconfig.patch (original)
+++ desktop/unstable/pygobject/debian/patches/02_ffi-use-pkgconfig.patch Sat Jun  7 13:20:21 2008
@@ -1,6 +1,8 @@
---- configure.ac.orig	2008-03-25 00:20:15.300650330 +0100
-+++ configure.ac	2008-03-25 00:22:13.024650481 +0100
-@@ -65,6 +65,8 @@
+Index: pygobject-2.14.2/configure.ac
+===================================================================
+--- pygobject-2.14.2.orig/configure.ac	2008-05-23 18:51:11.000000000 +0200
++++ pygobject-2.14.2/configure.ac	2008-06-07 13:49:51.690646019 +0200
+@@ -65,6 +65,8 @@ m4_define([_LT_AC_TAGCONFIG],[])
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
  
@@ -9,27 +11,60 @@
  AM_PATH_PYTHON(2.3.5)
  
  AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-@@ -144,15 +146,9 @@
+@@ -144,38 +146,10 @@ AC_SUBST([pygobject_CODEGEN_DEFINES])
  AS_AC_EXPAND(DATADIR, $datadir)
  
  dnl libffi
 -AC_MSG_CHECKING(for ffi.h)
--AC_TRY_CPP([#include <ffi.h>], pygobject_ffi_h=yes, pygobject_ffi_h=no)
--if test $pygobject_ffi_h = yes; then
--   AC_DEFINE(HAVE_FFI_H,1,[Have ffi.h include file])
--   FFI_LIBS="-lffi"
+-AC_ARG_WITH(libffi,
+-  AC_HELP_STRING([--without-ffi], [Disable libffi support]),
+-  with_ffi=$withval,
+-  with_ffi=auto)
+-if test x"$with_ffi" = xno ; then
+-  pygobject_ffi_h=disabled
+-else
+-  AC_TRY_CPP([#include <ffi.h>], pygobject_ffi_h=yes, pygobject_ffi_h=no)
+-  if test $pygobject_ffi_h = yes; then
+-    AC_DEFINE(HAVE_FFI_H,1,[Have ffi.h include file])
+-    save_LIBS=$LIBS
+-    if test x"$with_ffi" = xyes || test x"$with_ffi" = xauto; then
+-      other_LIBS=
+-    else
+-      other_LIBS=$with_ffi
+-    fi
+-    AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
+-    if test x$"ac_cv_search_ffi_call" = x"none required" ; then
+-      FFI_LIBS=$other_LIBS
+-    else
+-      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
+-    fi
+-    LIBS=$save_LIBS
+-  fi
 -fi
+-if test x"$with_ffi" != xauto && test x"$pygobject_ffi_h" != xyes ; then
+-  AC_MSG_ERROR([libffi requested, but ffi.h not found])
+-fi
+-AC_MSG_RESULT([$pygobject_ffi_h])
+-AM_CONDITIONAL(HAVE_LIBFFI, test "$pygobject_ffi_h" = "yes")
 +PKG_CHECK_MODULES(FFI, libffi, [enable_ffi=yes], [enable_ffi=no])
- AC_MSG_RESULT([$pygobject_ffi_h])
--AM_CONDITIONAL(HAVE_LIBFFI, test "$pygobject_ffi_h" = "yes")
--AC_SUBST(FFI_LIBS)
 +AM_CONDITIONAL(HAVE_LIBFFI, test "$enable_ffi" = "yes")
+ AC_SUBST(FFI_LIBS)
++AC_SUBST(FFI_CFLAGS)
  
  dnl add required cflags ...
  if test "x$GCC" = "xyes"; then
---- gobject/Makefile.am.orig	2008-03-25 00:20:24.508651015 +0100
-+++ gobject/Makefile.am	2008-03-25 00:21:38.236681331 +0100
-@@ -33,7 +33,7 @@
+@@ -206,5 +180,5 @@ AC_CONFIG_FILES(
+ AC_OUTPUT
+ 
+ echo
+-echo "libffi support: $pygobject_ffi_h"
++echo "libffi support: $enable_ffi"
+ echo
+Index: pygobject-2.14.2/gobject/Makefile.am
+===================================================================
+--- pygobject-2.14.2.orig/gobject/Makefile.am	2008-05-23 18:42:18.000000000 +0200
++++ pygobject-2.14.2/gobject/Makefile.am	2008-06-07 13:47:12.690505428 +0200
+@@ -33,7 +33,7 @@ noinst_PROGRAMS = generate-constants
  CLEANFILES = constants.py
  EXTRA_DIST = constants.py.in
  

Added: desktop/unstable/pygobject/debian/patches/03_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/03_maintainer_mode.patch?rev=16190&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/03_maintainer_mode.patch (added)
+++ desktop/unstable/pygobject/debian/patches/03_maintainer_mode.patch Sat Jun  7 13:20:21 2008
@@ -1,0 +1,12 @@
+Index: pygobject-2.14.2/configure.ac
+===================================================================
+--- pygobject-2.14.2.orig/configure.ac	2008-06-07 14:06:28.131010994 +0200
++++ pygobject-2.14.2/configure.ac	2008-06-07 14:06:35.211005448 +0200
+@@ -25,6 +25,7 @@ AC_CONFIG_SRCDIR([gobject/gobjectmodule.
+ AM_CONFIG_HEADER(config.h)
+ 
+ AM_INIT_AUTOMAKE
++AM_MAINTAINER_MODE
+ 
+ dnl put the ACLOCAL flags in the makefile
+ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"

Modified: desktop/unstable/pygobject/debian/patches/60_use-python-config-for-includes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/60_use-python-config-for-includes.patch?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/60_use-python-config-for-includes.patch (original)
+++ desktop/unstable/pygobject/debian/patches/60_use-python-config-for-includes.patch Sat Jun  7 13:20:21 2008
@@ -1,11 +1,11 @@
 GNOME #448173, Debian #468130; use python-config to set PYTHON_INCLUDES; fixes
 support for -dbg package
 
- 
-diff -Nur pygobject-2.14.1/configure.ac pygobject-2.14.1.new/configure.ac
---- pygobject-2.14.1/configure.ac	2008-01-03 12:20:10.000000000 +0100
-+++ pygobject-2.14.1.new/configure.ac	2008-02-27 16:52:35.000000000 +0100
-@@ -71,7 +71,11 @@
+Index: pygobject-2.14.2/configure.ac
+===================================================================
+--- pygobject-2.14.2.orig/configure.ac	2008-06-07 14:06:35.211005448 +0200
++++ pygobject-2.14.2/configure.ac	2008-06-07 14:06:41.314510224 +0200
+@@ -74,7 +74,11 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(c
  
  AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
@@ -17,142 +17,3 @@
  old_CPPFLAGS=$CPPFLAGS
  CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
  AC_TRY_COMPILE([#include <Python.h>],
-diff -Nur pygobject-2.14.1/m4/as-ac-expand.m4 pygobject-2.14.1.new/m4/as-ac-expand.m4
---- pygobject-2.14.1/m4/as-ac-expand.m4	1970-01-01 01:00:00.000000000 +0100
-+++ pygobject-2.14.1.new/m4/as-ac-expand.m4	2007-06-21 11:55:57.000000000 +0200
-@@ -0,0 +1,40 @@
-+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-+dnl
-+dnl example
-+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-+
-+AC_DEFUN([AS_AC_EXPAND],
-+[
-+  EXP_VAR=[$1]
-+  FROM_VAR=[$2]
-+
-+  dnl first expand prefix and exec_prefix if necessary
-+  prefix_save=$prefix
-+  exec_prefix_save=$exec_prefix
-+
-+  dnl if no prefix given, then use /usr/local, the default prefix
-+  if test "x$prefix" = "xNONE"; then
-+    prefix=$ac_default_prefix
-+  fi
-+  dnl if no exec_prefix given, then use prefix
-+  if test "x$exec_prefix" = "xNONE"; then
-+    exec_prefix=$prefix
-+  fi
-+
-+  full_var="$FROM_VAR"
-+  dnl loop until it doesn't change anymore
-+  while true; do
-+    new_full_var="`eval echo $full_var`"
-+    if test "x$new_full_var"="x$full_var"; then break; fi
-+    full_var=$new_full_var
-+  done
-+
-+  dnl clean up
-+  full_var=$new_full_var
-+  AC_SUBST([$1], "$full_var")
-+
-+  dnl restore prefix and exec_prefix
-+  prefix=$prefix_save
-+  exec_prefix=$exec_prefix_save
-+])
-diff -Nur pygobject-2.14.1/m4/jhflags.m4 pygobject-2.14.1.new/m4/jhflags.m4
---- pygobject-2.14.1/m4/jhflags.m4	1970-01-01 01:00:00.000000000 +0100
-+++ pygobject-2.14.1.new/m4/jhflags.m4	2007-06-21 11:55:57.000000000 +0200
-@@ -0,0 +1,21 @@
-+dnl
-+dnl JH_ADD_CFLAG(FLAG)
-+dnl checks whether the C compiler supports the given flag, and if so, adds
-+dnl it to $CFLAGS.  If the flag is already present in the list, then the
-+dnl check is not performed.
-+AC_DEFUN([JH_ADD_CFLAG],
-+[
-+case " $CFLAGS " in
-+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
-+  ;;
-+*)
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS $1"
-+  AC_MSG_CHECKING([whether [$]CC understands $1])
-+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
-+  AC_MSG_RESULT($jh_has_option)
-+  if test $jh_has_option = no; then
-+    CFLAGS="$save_CFLAGS"
-+  fi
-+  ;;
-+esac])
-diff -Nur pygobject-2.14.1/m4/python.m4 pygobject-2.14.1.new/m4/python.m4
---- pygobject-2.14.1/m4/python.m4	1970-01-01 01:00:00.000000000 +0100
-+++ pygobject-2.14.1.new/m4/python.m4	2007-06-21 11:55:57.000000000 +0200
-@@ -0,0 +1,66 @@
-+## this one is commonly used with AM_PATH_PYTHONDIR ...
-+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-+dnl Check if a module containing a given symbol is visible to python.
-+AC_DEFUN([AM_CHECK_PYMOD],
-+[AC_REQUIRE([AM_PATH_PYTHON])
-+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-+ifelse([$2],[], [prog="
-+import sys
-+try:
-+        import $1
-+except ImportError:
-+        sys.exit(1)
-+except:
-+        sys.exit(0)
-+sys.exit(0)"], [prog="
-+import $1
-+$1.$2"])
-+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-+  then
-+    eval "py_cv_mod_$py_mod_var=yes"
-+  else
-+    eval "py_cv_mod_$py_mod_var=no"
-+  fi
-+])
-+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-+if test "x$py_val" != xno; then
-+  AC_MSG_RESULT(yes)
-+  ifelse([$3], [],, [$3
-+])dnl
-+else
-+  AC_MSG_RESULT(no)
-+  ifelse([$4], [],, [$4
-+])dnl
-+fi
-+])
-+
-+dnl a macro to check for ability to create python extensions
-+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-+dnl function also defines PYTHON_INCLUDES
-+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-+[AC_REQUIRE([AM_PATH_PYTHON])
-+AC_MSG_CHECKING(for headers required to compile python extensions)
-+dnl deduce PYTHON_INCLUDES
-+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+if test -x "$PYTHON-config"; then
-+PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
-+else
-+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+if test "$py_prefix" != "$py_exec_prefix"; then
-+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+fi
-+fi
-+AC_SUBST(PYTHON_INCLUDES)
-+dnl check if the headers exist:
-+save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-+AC_TRY_CPP([#include <Python.h>],dnl
-+[AC_MSG_RESULT(found)
-+$1],dnl
-+[AC_MSG_RESULT(not found)
-+$2])
-+CPPFLAGS="$save_CPPFLAGS"
-+])

Modified: desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch (original)
+++ desktop/unstable/pygobject/debian/patches/61_wakeupfd-fix.patch Sat Jun  7 13:20:21 2008
@@ -1,7 +1,9 @@
 From the fix to the initial SETWAKEUPFD support in GNOME #481569.
 
---- pygobject-2.14.1/gobject/pygmainloop.c	2008-01-03 12:09:19.000000000 +0100
-+++ pygobject-2.14.1.new/gobject/pygmainloop.c	2008-05-16 14:13:41.000000000 +0200
+Index: pygobject-2.14.2/gobject/pygmainloop.c
+===================================================================
+--- pygobject-2.14.2.orig/gobject/pygmainloop.c	2008-06-07 14:06:05.826506163 +0200
++++ pygobject-2.14.2/gobject/pygmainloop.c	2008-06-07 15:06:05.219010028 +0200
 @@ -24,6 +24,7 @@
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
@@ -10,7 +12,7 @@
  
  #include "pygobject-private.h"
  #include "pythread.h"
-@@ -112,7 +113,10 @@
+@@ -112,7 +113,10 @@ static gboolean
  pyg_signal_watch_prepare(GSource *source,
  			 int     *timeout)
  {
@@ -21,7 +23,7 @@
  
      /* Python only invokes signal handlers from the main thread,
       * so if a thread other than the main thread receives the signal
-@@ -146,6 +150,11 @@
+@@ -146,6 +150,11 @@ pyg_signal_watch_prepare(GSource *source
      real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
      g_source_add_poll(source, &real_source->fd);
  
@@ -33,7 +35,7 @@
      PySignal_SetWakeupFd(real_source->fds[1]);
  
  #else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-@@ -166,10 +175,19 @@
+@@ -166,10 +175,20 @@ pyg_signal_watch_check(GSource *source)
      PyGILState_STATE state;
      GMainLoop *main_loop;
  
@@ -47,7 +49,8 @@
      main_loop = pyg_get_current_main_loop();
  
 +#ifdef HAVE_PYSIGNAL_SETWAKEUPFD
-+    read(real_source->fds[0], &buf, 1);
++    if (real_source->fds[0])
++        read(real_source->fds[0], &buf, 1);
 +#endif
 +
      if (PyErr_CheckSignals() == -1 && main_loop != NULL) {

Modified: desktop/unstable/pygobject/debian/patches/90_autofoo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/90_autofoo.patch?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/90_autofoo.patch (original)
+++ desktop/unstable/pygobject/debian/patches/90_autofoo.patch Sat Jun  7 13:20:21 2008
@@ -1,17 +1,23 @@
-diff -pruN pygobject-2.14.1.orig/aclocal.m4 pygobject-2.14.1/aclocal.m4
---- pygobject-2.14.1.orig/aclocal.m4	2008-01-03 12:20:18.000000000 +0100
-+++ pygobject-2.14.1/aclocal.m4	2008-03-25 00:40:17.320654417 +0100
+aclocal-1.10 -I m4
+automake-1.10
+autoconf
+
+Index: pygobject-2.14.2/aclocal.m4
+===================================================================
+--- pygobject-2.14.2.orig/aclocal.m4	2008-06-07 13:52:51.659004916 +0200
++++ pygobject-2.14.2/aclocal.m4	2008-06-07 14:07:26.518504098 +0200
 @@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
  
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 +# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -11,12 +11,20 @@
+@@ -11,6 +11,14 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -26,541 +32,47 @@
  # Configure paths for GLIB
  # Owen Taylor     1997-2001
  
- dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
--dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
--dnl gthread is specified in MODULES, pass to pkg-config
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-+dnl gthread, or gio is specified in MODULES, pass to pkg-config
- dnl
- AC_DEFUN([AM_PATH_GLIB_2_0],
- [dnl 
-@@ -41,6 +49,9 @@ AC_ARG_ENABLE(glibtest, [  --disable-gli
-          gthread) 
-              pkg_config_args="$pkg_config_args gthread-2.0"
-          ;;
-+         gio*) 
-+             pkg_config_args="$pkg_config_args $module-2.0"
-+         ;;
-       esac
-   done
- 
-@@ -222,7 +233,7 @@ main ()
+@@ -225,7 +233,7 @@ main ()
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
--# serial 51 Debian 1.5.24-2ubuntu1 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -310,7 +321,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
--
- AC_LIBTOOL_SYS_MAX_CMD_LEN
- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- AC_LIBTOOL_OBJDIR
-@@ -412,6 +422,8 @@ file_magic*)
-   ;;
- esac
- 
-+_LT_REQUIRED_DARWIN_CHECKS
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- enable_win32_dll=yes, enable_win32_dll=no)
-@@ -491,9 +503,80 @@ 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 conftest*
-+$rm -r conftest*
- ])# _LT_LINKER_BOILERPLATE
- 
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+    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.
-+   echo "int foo(void){return 1;}" > conftest.c
-+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+     -dynamiclib ${wl}-single_module conftest.c
-+   if test -f libconftest.dylib; then
-+     lt_cv_apple_cc_single_mod=yes
-+     rm -rf libconftest.dylib*
-+   fi
-+   rm conftest.c
-+      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"
-+    ])
-+    case $host_os in
-+    rhapsody* | darwin1.[[0123]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*)
-+      # 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" != ":"; then
-+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+])
- 
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
-@@ -818,7 +901,11 @@ sparc*-*solaris*)
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
-       yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)    LD="${LD-ld} -64" ;;
-+      *)
-+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-       esac
-       ;;
-     esac
-@@ -911,7 +998,7 @@ AC_CACHE_CHECK([$1], [$2],
-        $2=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- ])
- 
-@@ -1182,7 +1269,7 @@ else
-     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="-dld"],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- 	[AC_CHECK_FUNC([dlopen],
- 	      [lt_cv_dlopen="dlopen"],
- 	  [AC_CHECK_LIB([dl], [dlopen],
-@@ -1190,7 +1277,7 @@ else
- 	    [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="-dld"])
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- 	      ])
- 	    ])
- 	  ])
-@@ -1507,7 +1594,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[[4-9]]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -2040,6 +2127,13 @@ esac
- AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- 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"
-@@ -2539,7 +2633,7 @@ lt_cv_deplibs_check_method='unknown'
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[[4-9]]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -2975,7 +3069,7 @@ aix3*)
-   fi
-   ;;
- 
--aix4* | aix5*)
-+aix[[4-9]]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -3032,6 +3126,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
- _LT_AC_TAGVAR(predeps, $1)=
- _LT_AC_TAGVAR(postdeps, $1)=
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
- 
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -3141,7 +3236,7 @@ case $host_os in
-     # FIXME: insert proper C++ library support
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;
--  aix4* | aix5*)
-+  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.
-@@ -3154,7 +3249,7 @@ case $host_os in
-       # 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]].*|aix5*)
-+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- 	for ld_flag in $LDFLAGS; do
- 	  case $ld_flag in
- 	  *-brtl*)
-@@ -3300,51 +3395,23 @@ case $host_os in
-     fi
-   ;;
-       darwin* | rhapsody*)
--        case $host_os in
--        rhapsody* | darwin1.[[012]])
--         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[[012]])
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--        esac
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--    if test "$GXX" = yes ; then
--      lt_int_apple_cc_single_mod=no
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+      if test "$GXX" = yes ; then
-       output_verbose_link_cmd='echo'
--      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
--       lt_int_apple_cc_single_mod=yes
-+      _LT_AC_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_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+      _LT_AC_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_AC_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}"
-+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+        _LT_AC_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_AC_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
--      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      else
--          _LT_AC_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'
--        fi
--        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          else
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          fi
--            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       else
-       case $cc_basename in
-         xlc*)
-@@ -3595,7 +3662,7 @@ case $host_os in
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      pgCC*)
-+      pgCC* | pgcpp*)
-         # Portland Group C++ compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-   	_LT_AC_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'
-@@ -4030,7 +4097,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
- # compiler output when linking a shared library.
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
- 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
-@@ -4155,6 +4223,11 @@ fi
- 
- $rm -f confest.$objext
- 
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
-@@ -4211,7 +4284,6 @@ solaris*)
-   ;;
- esac
- ])
--
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -4296,7 +4368,7 @@ aix3*)
-     postinstall_cmds='$RANLIB $lib'
-   fi
-   ;;
--aix4* | aix5*)
-+aix[[4-9]]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -4473,6 +4545,7 @@ if test -f "$ltmain"; then
-     _LT_AC_TAGVAR(predeps, $1) \
-     _LT_AC_TAGVAR(postdeps, $1) \
-     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-     _LT_AC_TAGVAR(archive_cmds, $1) \
-     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-     _LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4535,7 +4608,7 @@ ifelse([$1], [],
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -4772,6 +4845,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
- # shared library.
- postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -5121,7 +5198,7 @@ EOF
-     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-     cat conftest.$ac_ext >&5
-   fi
--  rm -f conftest* conftst*
-+  rm -rf conftest* conftst*
- 
-   # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
-@@ -5178,7 +5255,8 @@ AC_MSG_CHECKING([for $compiler option to
-       # 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
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
-     darwin* | rhapsody*)
-       # PIC is the default on this platform
-@@ -5215,7 +5293,7 @@ AC_MSG_CHECKING([for $compiler option to
-     esac
-   else
-     case $host_os in
--      aix4* | aix5*)
-+      aix[[4-9]]*)
- 	# All AIX code is PIC.
- 	if test "$host_cpu" = ia64; then
- 	  # AIX 5 now supports IA64 processor
-@@ -5311,7 +5389,7 @@ AC_MSG_CHECKING([for $compiler option to
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
--	  pgCC*)
-+	  pgCC* | pgcpp*)
- 	    # Portland Group C++ compiler.
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5462,7 +5540,8 @@ AC_MSG_CHECKING([for $compiler option to
-       # 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
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -5532,7 +5611,8 @@ AC_MSG_CHECKING([for $compiler option to
-     mingw* | cygwin* | pw32* | os2*)
-       # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
- 
-     hpux9* | hpux10* | hpux11*)
-@@ -5669,7 +5749,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
- #
- if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
--    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-      "" | " "*) ;;
-@@ -5693,7 +5773,7 @@ esac
- #
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
--  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-   $lt_tmp_static_flag,
-   [],
-   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5709,7 +5789,7 @@ AC_MSG_CHECKING([whether the $compiler l
- ifelse([$1],[CXX],[
-   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
--  aix4* | aix5*)
-+  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
-     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5731,6 +5811,7 @@ ifelse([$1],[CXX],[
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   esac
-+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ],[
-   runpath_var=
-   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5761,12 +5842,14 @@ ifelse([$1],[CXX],[
-   # 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_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+  _LT_AC_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=
-   # Just being paranoid about ensuring that cc_basename is set.
-   _LT_CC_BASENAME([$compiler])
-@@ -5816,7 +5899,7 @@ ifelse([$1],[CXX],[
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[[3-9]]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6036,7 +6119,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    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.
-@@ -6056,7 +6139,7 @@ _LT_EOF
- 	# 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]].*|aix5*)
-+	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
-@@ -6216,11 +6299,10 @@ _LT_EOF
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-     if test "$GCC" = yes ; then
-     	output_verbose_link_cmd='echo'
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        _LT_AC_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_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+        _LT_AC_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_AC_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}"
-     else
-       case $cc_basename in
-         xlc*)
-@@ -6959,7 +7041,7 @@ else
+@@ -7033,55 +7041,49 @@ else
  fi[]dnl
  ])# PKG_CHECK_MODULES
  
--# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+-#                                                        -*- Autoconf -*-
+-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 +# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -6969,14 +7051,31 @@ fi[]dnl
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # AM_AUTOMAKE_VERSION(VERSION)
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
 +# (This private macro should not be called outside this file.)
 +AC_DEFUN([AM_AUTOMAKE_VERSION],
 +[am__api_version='1.10'
@@ -583,32 +95,75 @@
 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.6])])
+-	 [AM_AUTOMAKE_VERSION([1.8.5])])
+-
+-# AM_AUX_DIR_EXPAND
 +[AM_AUTOMAKE_VERSION([1.10.1])dnl
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
  
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -7033,14 +7132,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
- 
- # AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+@@ -7128,26 +7130,16 @@ AC_PREREQ([2.50])dnl
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+ 
+-# AM_CONDITIONAL                                              -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++# AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 7
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 6
 +# serial 8
  
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
  # -------------------------------------
-@@ -7049,8 +7148,10 @@ AC_DEFUN([AM_CONDITIONAL],
+@@ -7156,8 +7148,10 @@ AC_DEFUN([AM_CONDITIONAL],
  [AC_PREREQ(2.52)dnl
   ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
  	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
@@ -621,25 +176,54 @@
  if $2; then
    $1_TRUE=
    $1_FALSE='#'
-@@ -7064,15 +7165,14 @@ AC_CONFIG_COMMANDS_PRE(
- Usually this means the macro was only invoked conditionally.]])
+@@ -7167,30 +7161,18 @@ else
+ fi
+ AC_CONFIG_COMMANDS_PRE(
+ [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+-  AC_MSG_ERROR([conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.])
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
  fi])])
  
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# serial 7						-*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
  # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 8
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
 +# serial 9
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
-@@ -7100,6 +7200,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
+@@ -7199,7 +7181,6 @@ fi])])
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+ 
+-
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -7219,6 +7200,7 @@ 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'],
@@ -647,7 +231,7 @@
         [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                     [depcc="$$1"   am_compiler_list=])
  
-@@ -7165,6 +7266,7 @@ AC_CACHE_CHECK([dependency style of $dep
+@@ -7284,6 +7266,7 @@ AC_CACHE_CHECK([dependency style of $dep
         depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
         $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
           >/dev/null 2>conftest.err &&
@@ -655,7 +239,7 @@
         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -7217,7 +7319,8 @@ if test "x$enable_dependency_tracking" !
+@@ -7336,29 +7319,20 @@ if test "x$enable_dependency_tracking" !
    AMDEPBACKSLASH='\'
  fi
  AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
@@ -664,8 +248,38 @@
 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
  ])
  
- # Generate code to set up dependency tracking.              -*- Autoconf -*-
-@@ -7242,8 +7345,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
+-# Generate code to set up dependency tracking.   -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# Generate code to set up dependency tracking.              -*- Autoconf -*-
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-#serial 2
++#serial 3
+ 
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+@@ -7371,33 +7345,28 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
    # some people rename them; so instead we look at the file content.
    # Grep'ing the first line is not enough: some people post-process
    # each Makefile.in and add a new line on top of each file to say so.
@@ -677,25 +291,115 @@
      dirpart=`AS_DIRNAME("$mf")`
    else
      continue
-@@ -7302,14 +7406,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
- 
- # Do all the work for Automake.                             -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   fi
+-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+-  # Extract the definition of DEP_FILES from the Makefile without
+-  # running `make'.
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
+   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+   test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+   # When using ansi2knr, U may be empty or an underscore; expand it
+   U=`sed -n 's/^U = //p' < "$mf"`
+-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+-  # We invoke sed twice because it is the simplest approach to
+-  # changing $(DEPDIR) to its actual value in the expansion.
+-  for file in `sed -n '
+-    /^DEP_FILES = .*\\\\$/ {
+-      s/^DEP_FILES = //
+-      :loop
+-	s/\\\\$//
+-	p
+-	n
+-	/\\\\$/ b loop
+-      p
+-    }
+-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+@@ -7423,54 +7392,31 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
+      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+ 
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 7
++# serial 8
+ 
+ # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ 
+-# Do all the work for Automake.                            -*- Autoconf -*-
+-
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things.  But this isn't really a big deal.
+-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 -# Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++# Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 +# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 12
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
 +# serial 13
  
- # 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.
-@@ -7326,16 +7430,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
+-# serial 11
++# This macro actually does too much.  Some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+@@ -7484,16 +7430,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
  # arguments mandatory, and then we can depend on a new Autoconf
  # release and drop the old call support.
  AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -721,7 +425,7 @@
  fi
  
  # test whether we have cygpath
-@@ -7355,6 +7463,9 @@ m4_ifval([$2],
+@@ -7513,6 +7463,9 @@ m4_ifval([$2],
   AC_SUBST([PACKAGE], [$1])dnl
   AC_SUBST([VERSION], [$2])],
  [_AM_SET_OPTIONS([$1])dnl
@@ -731,7 +435,26 @@
   AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
   AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
  
-@@ -7390,6 +7501,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+@@ -7528,7 +7481,6 @@ 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(AMTAR, tar)
+ AM_PROG_INSTALL_SH
+ AM_PROG_INSTALL_STRIP
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+@@ -7537,7 +7489,9 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
+ _AM_IF_OPTION([no-dependencies],,
+ [AC_PROVIDE_IFELSE([AC_PROG_CC],
+                   [_AM_DEPENDENCIES(CC)],
+@@ -7547,6 +7501,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                    [_AM_DEPENDENCIES(CXX)],
                    [define([AC_PROG_CXX],
                            defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
@@ -742,7 +465,7 @@
  ])
  ])
  
-@@ -7403,16 +7518,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+@@ -7560,62 +7518,39 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
  # our stamp files there.
  AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
  [# Compute $1's index in $config_headers.
@@ -759,36 +482,165 @@
  done
 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- 
- # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
- #
-@@ -7425,7 +7541,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1
++
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # AM_PROG_INSTALL_SH
+ # ------------------
  # Define $install_sh.
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
  AC_DEFUN([AM_PROG_INSTALL_SH],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
 +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
  AC_SUBST(install_sh)])
  
- # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-@@ -7503,14 +7619,14 @@ rm -f confinc confmf
- 
- # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+-#                                                          -*- Autoconf -*-
+-# Copyright (C) 2003  Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 1
++# serial 2
+ 
+ # Check whether the underlying file-system supports filenames
+ # with a leading dot.  For instance MS-DOS doesn't.
+@@ -7630,26 +7565,44 @@ fi
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+ 
+-# Check to see how 'make' treats includes.	-*- Autoconf -*-
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
+ 
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# 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.
++# serial 4
+ 
+-# 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.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
+ 
+-# 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.
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+ 
+-# serial 2
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
+ 
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -7693,27 +7646,16 @@ AC_MSG_RESULT([$_am_result])
+ rm -f confinc confmf
+ ])
+ 
+-#  -*- Autoconf -*-
+-
+-
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 4
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
 +# serial 5
  
  # AM_MISSING_PROG(NAME, PROGRAM)
  # ------------------------------
-@@ -7526,6 +7642,7 @@ AC_SUBST($1)])
+@@ -7729,6 +7671,7 @@ AC_SUBST($1)])
  # If it does, set am_missing_run to use it, otherwise, to nothing.
  AC_DEFUN([AM_MISSING_HAS_RUN],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -796,21 +648,37 @@
  test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
  # Use eval to expand $SHELL
  if eval "$MISSING --run true"; then
-@@ -7536,7 +7653,7 @@ else
+@@ -7739,92 +7682,41 @@ else
  fi
  ])
  
--# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 +# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7544,60 +7661,23 @@ fi
- 
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
  # AM_PROG_MKDIR_P
  # ---------------
 -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
+-
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
+-
 -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 -# created by `make install' are always world readable, even if the
 -# installer happens to have an overly restrictive umask (e.g. 077).
@@ -832,21 +700,13 @@
 +# Check for `mkdir -p'.
  AC_DEFUN([AM_PROG_MKDIR_P],
 -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
+-  # Keeping the `.' argument allows $(mkdir_p) to be used without
+-  # argument.  Indeed, we sometimes output rules like
 -  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
+-  # where $(somedir) is conditionally defined.
+-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+-  # expensive solution, as it forces Make to start a sub-shell.)
+-  mkdir_p='mkdir -p -- .'
 -else
 -  # On NextStep and OpenStep, the `mkdir' command does not
 -  # recognize any option.  It will interpret all options as
@@ -864,6 +724,10 @@
 -  fi
 -fi
 -AC_SUBST([mkdir_p])])
+-
+-# Helper functions for option handling.                    -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 +[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,
@@ -880,9 +744,208 @@
 +esac
 +])
  
- # Helper functions for option handling.                     -*- Autoconf -*-
- 
-@@ -7890,9 +7970,21 @@ dnl Don't test for $cross_compiling = ye
+-# 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.
++# Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# serial 3
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -7849,64 +7741,50 @@ AC_DEFUN([_AM_SET_OPTIONS],
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-
++# ---------------------------------------------------------------------------
+ # Adds support for distributing Python modules and packages.  To
+ # install modules, copy them to $(pythondir), using the python_PYTHON
+ # automake variable.  To install a package with the same name as the
+ # automake package, install to $(pkgpythondir), or use the
+ # pkgpython_PYTHON automake variable.
+-
++#
+ # The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
+ # locations to install python extension modules (shared libraries).
+ # Another macro is required to find the appropriate flags to compile
+ # extension modules.
+-
++#
+ # If your package is configured with a different prefix to python,
+ # users will have to add the install directory to the PYTHONPATH
+ # environment variable, or create a .pth file (see the python
+ # documentation for details).
+-
++#
+ # If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
+ # cause an error if the version of python installed on the system
+ # doesn't meet the requirement.  MINIMUM-VERSION should consist of
+ # numbers and dots only.
+-
+ AC_DEFUN([AM_PATH_PYTHON],
+  [
+   dnl Find a Python interpreter.  Python versions prior to 1.5 are not
+   dnl supported because the default installation locations changed from
+   dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+   dnl in 1.5.
+-  m4_define([_AM_PYTHON_INTERPRETER_LIST],
+-            [python python2 python2.4 python2.3 python2.2 dnl
++  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
++                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+ 
+   m4_if([$1],[],[
+     dnl No version check is needed.
+     # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      PYTHON=:
+-      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
++      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
+     fi
+     am_display_PYTHON=python
+   ], [
+@@ -8027,22 +7905,11 @@ for i in xrange(0, 4): minverhex = (minv
+ sys.exit(sys.hexversion < minverhex)"
+   AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
+ 
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.     -*- Autoconf -*-
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+ # AM_RUN_LOG(COMMAND)
+ # -------------------
+@@ -8055,28 +7922,16 @@ AC_DEFUN([AM_RUN_LOG],
+    echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    (exit $ac_status); }])
+ 
+-#
+-# Check to make sure that the build environment is sane.
+-#
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 4
+ 
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -8119,25 +7974,14 @@ Check your system clock])
+ fi
+ AC_MSG_RESULT(yes)])
+ 
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
++# AM_PROG_INSTALL_STRIP
++# ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries.  This is especially
+ # annoying in cross-compiling environments, where the build's strip
+@@ -8155,135 +7999,117 @@ dnl Don't test for $cross_compiling = ye
  if test "$cross_compiling" != no; then
    AC_CHECK_TOOL([STRIP], [strip], :)
  fi
@@ -890,40 +953,32 @@
 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
+-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+-dnl
+-dnl example
+-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
 +# Copyright (C) 2006  Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
-+
+ 
+-AC_DEFUN([AS_AC_EXPAND],
+-[
+-  EXP_VAR=[$1]
+-  FROM_VAR=[$2]
 +# _AM_SUBST_NOTMAKE(VARIABLE)
 +# ---------------------------
 +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 +# This macro is traced by Automake.
 +AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
- # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-@@ -7989,132 +8081,6 @@ AC_SUBST([am__tar])
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
--dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
--dnl
--dnl example
--dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
--dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
--
--AC_DEFUN([AS_AC_EXPAND],
--[
--  EXP_VAR=[$1]
--  FROM_VAR=[$2]
--
+ 
 -  dnl first expand prefix and exec_prefix if necessary
 -  prefix_save=$prefix
 -  exec_prefix_save=$exec_prefix
--
++# Check how to create a tarball.                            -*- Autoconf -*-
+ 
 -  dnl if no prefix given, then use /usr/local, the default prefix
 -  if test "x$prefix" = "xNONE"; then
 -    prefix=$ac_default_prefix
@@ -932,7 +987,12 @@
 -  if test "x$exec_prefix" = "xNONE"; then
 -    exec_prefix=$prefix
 -  fi
--
++# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+ 
 -  full_var="$FROM_VAR"
 -  dnl loop until it doesn't change anymore
 -  while true; do
@@ -940,7 +1000,8 @@
 -    if test "x$new_full_var"="x$full_var"; then break; fi
 -    full_var=$new_full_var
 -  done
--
++# serial 2
+ 
 -  dnl clean up
 -  full_var=$new_full_var
 -  AC_SUBST([$1], "$full_var")
@@ -949,7 +1010,69 @@
 -  prefix=$prefix_save
 -  exec_prefix=$exec_prefix_save
 -])
--
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++#     tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++#     $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++  case $_am_tool in
++  gnutar)
++    for _am_tar in tar gnutar gtar;
++    do
++      AM_RUN_LOG([$_am_tar --version]) && break
++    done
++    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++    am__untar="$_am_tar -xf -"
++    ;;
++  plaintar)
++    # Must skip GNU tar: if it does not support --format= it doesn't create
++    # ustar tarball either.
++    (tar --version) >/dev/null 2>&1 && continue
++    am__tar='tar chf - "$$tardir"'
++    am__tar_='tar chf - "$tardir"'
++    am__untar='tar xf -'
++    ;;
++  pax)
++    am__tar='pax -L -x $1 -w "$$tardir"'
++    am__tar_='pax -L -x $1 -w "$tardir"'
++    am__untar='pax -r'
++    ;;
++  cpio)
++    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++    am__untar='cpio -i -H $1 -d'
++    ;;
++  none)
++    am__tar=false
++    am__tar_=false
++    am__untar=false
++    ;;
++  esac
+ 
 -dnl
 -dnl JH_ADD_CFLAG(FLAG)
 -dnl checks whether the C compiler supports the given flag, and if so, adds
@@ -971,7 +1094,10 @@
 -  fi
 -  ;;
 -esac])
--
++  # If the value was cached, stop now.  We just wanted to have am__tar
++  # and am__untar set.
++  test -n "${am_cv_prog_tar_$1}" && break
+ 
 -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
 -dnl Check if a module containing a given symbol is visible to python.
 -AC_DEFUN([AM_CHECK_PYMOD],
@@ -995,7 +1121,16 @@
 -    eval "py_cv_mod_$py_mod_var=yes"
 -  else
 -    eval "py_cv_mod_$py_mod_var=no"
--  fi
++  # 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])
++    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+   fi
 -])
 -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
 -if test "x$py_val" != xno; then
@@ -1037,13 +1172,22 @@
 -$2])
 -CPPFLAGS="$save_CPPFLAGS"
 -])
--
++done
++rm -rf conftest.dir
+ 
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
++
 +m4_include([m4/as-ac-expand.m4])
 +m4_include([m4/jhflags.m4])
 +m4_include([m4/python.m4])
-diff -pruN pygobject-2.14.1.orig/configure pygobject-2.14.1/configure
---- pygobject-2.14.1.orig/configure	2008-01-03 12:20:20.000000000 +0100
-+++ pygobject-2.14.1/configure	2008-03-25 00:40:23.344649524 +0100
+Index: pygobject-2.14.2/configure
+===================================================================
+--- pygobject-2.14.2.orig/configure	2008-06-07 13:52:51.631005757 +0200
++++ pygobject-2.14.2/configure	2008-06-07 14:07:42.154503995 +0200
 @@ -809,6 +809,7 @@ PYGOBJECT_MICRO_VERSION
  INSTALL_PROGRAM
  INSTALL_SCRIPT
@@ -1052,14 +1196,28 @@
  CYGPATH_W
  PACKAGE
  VERSION
-@@ -862,11 +863,14 @@ LN_S
- ECHO
- AR
- RANLIB
-+DSYMUTIL
-+NMEDIT
- DLLTOOL
- AS
+@@ -817,7 +818,6 @@ AUTOCONF
+ AUTOMAKE
+ AUTOHEADER
+ MAKEINFO
+-AMTAR
+ install_sh
+ STRIP
+ INSTALL_STRIP_PROGRAM
+@@ -825,6 +825,12 @@ mkdir_p
+ AWK
+ SET_MAKE
+ am__leading_dot
++AMTAR
++am__tar
++am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
+ build
+ build_cpu
+ build_vendor
+@@ -867,6 +873,7 @@ AS
  OBJDUMP
  CPP
  LIBTOOL
@@ -1067,7 +1225,7 @@
  PYTHON
  PYTHON_VERSION
  PYTHON_PREFIX
-@@ -882,7 +886,6 @@ XSLTPROC
+@@ -882,7 +889,6 @@ XSLTPROC
  ENABLE_DOCS_TRUE
  ENABLE_DOCS_FALSE
  THREADING_CFLAGS
@@ -1075,7 +1233,7 @@
  GLIB_CFLAGS
  GLIB_LIBS
  GLIB_GENMARSHAL
-@@ -890,9 +893,10 @@ GOBJECT_QUERY
+@@ -890,9 +896,10 @@ GOBJECT_QUERY
  GLIB_MKENUMS
  pygobject_CODEGEN_DEFINES
  DATADIR
@@ -1087,7 +1245,7 @@
  LIBOBJS
  LTLIBOBJS'
  ac_subst_files=''
-@@ -905,7 +909,9 @@ LDFLAGS
+@@ -905,7 +912,9 @@ LDFLAGS
  LIBS
  CPPFLAGS
  CPP
@@ -1098,7 +1256,24 @@
  
  
  # Initialize some variables set by options.
-@@ -1513,6 +1519,8 @@ Some influential environment variables:
+@@ -1485,6 +1494,8 @@ if test -n "$ac_init_help"; then
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
+   --enable-static[=PKGS]  build static libraries [default=no]
+   --enable-shared[=PKGS]  build shared libraries [default=yes]
+   --enable-fast-install[=PKGS]
+@@ -1502,7 +1513,6 @@ Optional Packages:
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-pic              try to use only PIC/non-PIC objects [default=use
+                           both]
+-  --without-ffi           Disable libffi support
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -1514,6 +1524,8 @@ Some influential environment variables:
                you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
    PKG_CONFIG  path to pkg-config utility
@@ -1107,36 +1282,28 @@
  
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-@@ -1974,7 +1982,8 @@ PYGOBJECT_MICRO_VERSION=1
+@@ -1975,7 +1987,8 @@ PYGOBJECT_MICRO_VERSION=2
  ac_config_headers="$ac_config_headers config.h"
  
  
--am__api_version="1.9"
+-am__api_version="1.8"
 +am__api_version='1.10'
 +
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
    if test -f "$ac_dir/install-sh"; then
-@@ -2157,38 +2166,53 @@ else
+@@ -2158,30 +2171,53 @@ else
  echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
 -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
+-  # Keeping the `.' argument allows $(mkdir_p) to be used without
+-  # argument.  Indeed, we sometimes output rules like
 -  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
+-  # where $(somedir) is conditionally defined.
+-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+-  # expensive solution, as it forces Make to start a sub-shell.)
+-  mkdir_p='mkdir -p -- .'
 -else
 -  # On NextStep and OpenStep, the `mkdir' command does not
 -  # recognize any option.  It will interpret all options as
@@ -1200,7 +1367,7 @@
  
  for ac_prog in gawk mawk nawk awk
  do
-@@ -2271,12 +2295,16 @@ else
+@@ -2264,12 +2300,16 @@ else
  fi
  rmdir .tst 2>/dev/null
  
@@ -1221,16 +1388,19 @@
  fi
  
  # test whether we have cygpath
-@@ -2319,7 +2347,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+@@ -2312,10 +2352,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
 +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
  
  # Installed binaries are usually stripped using `strip' when the user
  # run `make install-strip'.  However `strip' might not be the right
-@@ -2423,7 +2451,7 @@ else
+@@ -2419,11 +2456,40 @@ else
  fi
  
  fi
@@ -1239,7 +1409,40 @@
  
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
-@@ -2535,9 +2563,7 @@ case "$host" in
++# Always define AMTAR for backward compatibility.
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++
++
++
++
++
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi
+ 
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
++   if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
+ 
+ 
+ 
+@@ -2524,9 +2590,7 @@ case "$host" in
  esac
  { echo "$as_me:$LINENO: result: $platform_win32" >&5
  echo "${ECHO_T}$platform_win32" >&6; }
@@ -1250,7 +1453,7 @@
    PLATFORM_WIN32_TRUE=
    PLATFORM_WIN32_FALSE='#'
  else
-@@ -2558,9 +2584,7 @@ case "$host" in
+@@ -2547,9 +2611,7 @@ case "$host" in
  esac
  { echo "$as_me:$LINENO: result: $os_win32" >&5
  echo "${ECHO_T}$os_win32" >&6; }
@@ -1261,7 +1464,7 @@
    OS_WIN32_TRUE=
    OS_WIN32_FALSE='#'
  else
-@@ -2700,9 +2724,7 @@ if test "x$enable_dependency_tracking" !
+@@ -2689,9 +2751,7 @@ if test "x$enable_dependency_tracking" !
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
  fi
@@ -1272,7 +1475,7 @@
    AMDEP_TRUE=
    AMDEP_FALSE='#'
  else
-@@ -2711,7 +2733,6 @@ else
+@@ -2700,7 +2760,6 @@ else
  fi
  
  
@@ -1280,7 +1483,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3698,6 +3719,7 @@ else
+@@ -3687,6 +3746,7 @@ else
         depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
         $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
           >/dev/null 2>conftest.err &&
@@ -1288,7 +1491,7 @@
         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -3727,9 +3749,7 @@ fi
+@@ -3716,9 +3776,7 @@ fi
  echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
@@ -1299,660 +1502,76 @@
    test "x$enable_dependency_tracking" != xno \
    && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
    am__fastdepCC_TRUE=
-@@ -4177,7 +4197,7 @@ lt_cv_deplibs_check_method='unknown'
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -4393,7 +4413,7 @@ ia64-*-hpux*)
+@@ -4382,7 +4440,7 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4396 "configure"' > conftest.$ac_ext
-+  echo '#line 4416 "configure"' > conftest.$ac_ext
+-  echo '#line 4385 "configure"' > conftest.$ac_ext
++  echo '#line 4443 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -4565,7 +4585,11 @@ sparc*-*solaris*)
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
-       yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)    LD="${LD-ld} -64" ;;
-+      *)
-+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-       esac
-       ;;
-     esac
-@@ -5490,7 +5514,6 @@ done
- 
- 
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--
- # find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -5805,7 +5828,7 @@ EOF
-     echo "$progname: failed program was:" >&5
-     cat conftest.$ac_ext >&5
-   fi
--  rm -f conftest* conftst*
-+  rm -rf conftest* conftst*
- 
-   # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
-@@ -6365,6 +6388,318 @@ fi
-   ;;
- esac
- 
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  ac_ct_DSYMUTIL=$DSYMUTIL
-+  # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_DSYMUTIL"; then
-+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_DSYMUTIL" = x; then
-+    DSYMUTIL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DSYMUTIL=$ac_ct_DSYMUTIL
-+  fi
-+else
-+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NMEDIT"; then
-+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+  ac_ct_NMEDIT=$NMEDIT
-+  # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_NMEDIT"; then
-+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_NMEDIT" = x; then
-+    NMEDIT=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    NMEDIT=$ac_ct_NMEDIT
-+  fi
-+else
-+  NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+
-+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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.
-+   echo "int foo(void){return 1;}" > conftest.c
-+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+     -dynamiclib ${wl}-single_module conftest.c
-+   if test -f libconftest.dylib; then
-+     lt_cv_apple_cc_single_mod=yes
-+     rm -rf libconftest.dylib*
-+   fi
-+   rm conftest.c
-+      fi
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  lt_cv_ld_exported_symbols_list=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	lt_cv_ld_exported_symbols_list=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+    case $host_os in
-+    rhapsody* | darwin1.[0123])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*)
-+      # 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" != ":"; then
-+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+
-+
- enable_dlopen=no
- enable_win32_dll=yes
- 
-@@ -6430,7 +6765,7 @@ 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 conftest*
-+$rm -r conftest*
- 
- 
- 
-@@ -6458,11 +6793,11 @@ else
+@@ -6762,11 +6820,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6461: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:6796: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:6765: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:6823: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:6465: \$? = $ac_status" >&5
-+   echo "$as_me:6800: \$? = $ac_status" >&5
+-   echo "$as_me:6769: \$? = $ac_status" >&5
++   echo "$as_me:6827: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -6732,10 +7067,10 @@ if test -n "$lt_prog_compiler_pic"; then
- 
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_pic_works=no
-+  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"
-@@ -6748,27 +7083,27 @@ else
+@@ -7052,11 +7110,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6751: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7086: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7055: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7113: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:6755: \$? = $ac_status" >&5
-+   echo "$as_me:7090: \$? = $ac_status" >&5
+-   echo "$as_me:7059: \$? = $ac_status" >&5
++   echo "$as_me:7117: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works=yes
-+       lt_cv_prog_compiler_pic_works=yes
-      fi
-    fi
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
- 
--if test x"$lt_prog_compiler_pic_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-      "" | " "*) ;;
-      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -6795,10 +7130,10 @@ esac
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_static_works=no
-+  lt_cv_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-    echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -6811,20 +7146,20 @@ else
-        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works=yes
-+         lt_cv_prog_compiler_static_works=yes
-        fi
-      else
--       lt_prog_compiler_static_works=yes
-+       lt_cv_prog_compiler_static_works=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
- 
--if test x"$lt_prog_compiler_static_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-     :
- else
-     lt_prog_compiler_static=
-@@ -6852,11 +7187,11 @@ else
+@@ -7156,11 +7214,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6855: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7190: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7159: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7217: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:6859: \$? = $ac_status" >&5
-+   echo "$as_me:7194: \$? = $ac_status" >&5
+-   echo "$as_me:7163: \$? = $ac_status" >&5
++   echo "$as_me:7221: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -6936,12 +7271,13 @@ echo $ECHO_N "checking whether the $comp
-   # 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_"
-+  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
-   # 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.
-   extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-@@ -7000,7 +7336,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[3-9]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	ld_shlibs=no
-@@ -7220,7 +7556,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    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.
-@@ -7240,7 +7576,7 @@ _LT_EOF
- 	# 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].*|aix5*)
-+	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
-@@ -7512,11 +7848,10 @@ if test -z "$aix_libpath"; then aix_libp
-       link_all_deplibs=yes
-     if test "$GCC" = yes ; then
-     	output_verbose_link_cmd='echo'
--        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        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
-       case $cc_basename in
-         xlc*)
-@@ -8036,7 +8371,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -8570,6 +8905,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- 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"
-@@ -8889,7 +9239,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-   { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -9165,7 +9515,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
--  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
- 
-@@ -9214,7 +9564,7 @@ else
+@@ -9533,7 +9591,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9217 "configure"
-+#line 9567 "configure"
+-#line 9536 "configure"
++#line 9594 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -9314,7 +9664,7 @@ else
+@@ -9633,7 +9691,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9317 "configure"
-+#line 9667 "configure"
+-#line 9636 "configure"
++#line 9694 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -9441,7 +9791,7 @@ aix3*)
-   fi
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -9497,6 +9847,7 @@ if test -f "$ltmain"; then
-     predeps \
-     postdeps \
-     compiler_lib_search_path \
-+    compiler_lib_search_dirs \
-     archive_cmds \
-     archive_expsym_cmds \
-     postinstall_cmds \
-@@ -9557,7 +9908,7 @@ echo "$as_me: creating $ofile" >&6;}
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -9793,6 +10144,10 @@ predeps=$lt_predeps
- # shared library.
- postdeps=$lt_postdeps
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -9969,6 +10324,127 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -10293,6 +10351,127 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  
  
@@ -2080,7 +1699,16 @@
  
  
          if test -n "$PYTHON"; then
-@@ -10215,7 +10691,11 @@ CPPFLAGS="$save_CPPFLAGS"
+@@ -10329,7 +10508,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
++	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
+@@ -10539,7 +10718,11 @@ CPPFLAGS="$save_CPPFLAGS"
  { echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5
  echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
@@ -2092,7 +1720,7 @@
  old_CPPFLAGS=$CPPFLAGS
  CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
  cat >conftest.$ac_ext <<_ACEOF
-@@ -10335,9 +10815,7 @@ fi
+@@ -10659,9 +10842,7 @@ fi
  
            fi
  
@@ -2103,23 +1731,27 @@
    ENABLE_DOCS_TRUE=
    ENABLE_DOCS_FALSE='#'
  else
-@@ -10425,6 +10903,9 @@ fi
-          gthread)
-              pkg_config_args="$pkg_config_args gthread-2.0"
-          ;;
-+         gio*)
-+             pkg_config_args="$pkg_config_args $module-2.0"
-+         ;;
-       esac
-   done
- 
-@@ -10842,54 +11323,80 @@ pygobject_CODEGEN_DEFINES=""
+@@ -11169,169 +11350,78 @@ pygobject_CODEGEN_DEFINES=""
    exec_prefix=$exec_prefix_save
  
  
 -{ echo "$as_me:$LINENO: checking for ffi.h" >&5
 -echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
+ 
+-# Check whether --with-libffi was given.
+-if test "${with_libffi+set}" = set; then
+-  withval=$with_libffi; with_ffi=$withval
+-else
+-  with_ffi=auto
+-fi
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for FFI" >&5
++echo $ECHO_N "checking for FFI... $ECHO_C" >&6; }
+ 
+-if test x"$with_ffi" = xno ; then
+-  pygobject_ffi_h=disabled
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -2134,11 +1766,6 @@
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for FFI" >&5
-+echo $ECHO_N "checking for FFI... $ECHO_C" >&6; }
-+
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$FFI_CFLAGS"; then
 +        pkg_cv_FFI_CFLAGS="$FFI_CFLAGS"
@@ -2164,9 +1791,64 @@
 -
 -  pygobject_ffi_h=no
 +  pkg_failed=yes
-+fi
-+    fi
-+else
+ fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-  if test $pygobject_ffi_h = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FFI_H 1
+-_ACEOF
+-
+-    save_LIBS=$LIBS
+-    if test x"$with_ffi" = xyes || test x"$with_ffi" = xauto; then
+-      other_LIBS=
+-    else
+-      other_LIBS=$with_ffi
+     fi
+-    { echo "$as_me:$LINENO: checking for library containing ffi_call" >&5
+-echo $ECHO_N "checking for library containing ffi_call... $ECHO_C" >&6; }
+-if test "${ac_cv_search_ffi_call+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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 ffi_call ();
+-int
+-main ()
+-{
+-return ffi_call ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' ffi; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib $other_LIBS $ac_func_search_save_LIBS"
+-  fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 +	pkg_failed=untried
 +fi
 +if test -n "$PKG_CONFIG"; then
@@ -2176,33 +1858,61 @@
 +        if test -n "$PKG_CONFIG" && \
 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi\"") >&5
 +  ($PKG_CONFIG --exists --print-errors "libffi") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_search_ffi_call=$ac_res
 +  (exit $ac_status); }; then
 +  pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null`
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
 +  pkg_failed=yes
-+fi
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_ffi_call+set}" = set; then
+-  break
+-fi
+-done
+-if test "${ac_cv_search_ffi_call+set}" = set; then
+-  :
 +    fi
-+else
+ else
+-  ac_cv_search_ffi_call=no
 +	pkg_failed=untried
  fi
- 
--rm -f conftest.err conftest.$ac_ext
--if test $pygobject_ffi_h = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FFI_H 1
--_ACEOF
- 
--   FFI_LIBS="-lffi"
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_ffi_call" >&5
+-echo "${ECHO_T}$ac_cv_search_ffi_call" >&6; }
+-ac_res=$ac_cv_search_ffi_call
+-if test "$ac_res" != no; then
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
++
++
 +if test $pkg_failed = yes; then
 +
 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 +        _pkg_short_errors_supported=yes
-+else
+ else
+-  { { echo "$as_me:$LINENO: error: libffi not found" >&5
+-echo "$as_me: error: libffi not found" >&2;}
+-   { (exit 1); exit 1; }; }
 +        _pkg_short_errors_supported=no
-+fi
+ fi
 +        if test $_pkg_short_errors_supported = yes; then
 +	        FFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libffi"`
 +        else
@@ -2210,7 +1920,19 @@
 +        fi
 +	# Put the nasty error message in config.log where it belongs
 +	echo "$FFI_PKG_ERRORS" >&5
-+
+ 
+-    if test x$"ac_cv_search_ffi_call" = x"none required" ; then
+-      FFI_LIBS=$other_LIBS
+-    else
+-      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
+-    fi
+-    LIBS=$save_LIBS
+-  fi
+-fi
+-if test x"$with_ffi" != xauto && test x"$pygobject_ffi_h" != xyes ; then
+-  { { echo "$as_me:$LINENO: error: libffi requested, but ffi.h not found" >&5
+-echo "$as_me: error: libffi requested, but ffi.h not found" >&2;}
+-   { (exit 1); exit 1; }; }
 +	{ echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +                enable_ffi=no
@@ -2223,8 +1945,8 @@
 +echo "${ECHO_T}yes" >&6; }
 +	enable_ffi=yes
  fi
- { echo "$as_me:$LINENO: result: $pygobject_ffi_h" >&5
- echo "${ECHO_T}$pygobject_ffi_h" >&6; }
+-{ echo "$as_me:$LINENO: result: $pygobject_ffi_h" >&5
+-echo "${ECHO_T}$pygobject_ffi_h" >&6; }
 -
 -
 -if test "$pygobject_ffi_h" = "yes"; then
@@ -2232,15 +1954,29 @@
    HAVE_LIBFFI_TRUE=
    HAVE_LIBFFI_FALSE='#'
  else
-@@ -10898,7 +11405,6 @@ else
- fi
- 
- 
--
+@@ -11341,6 +11431,7 @@ fi
+ 
+ 
+ 
++
  if test "x$GCC" = "xyes"; then
  
  case " $CFLAGS " in
-@@ -11585,6 +12091,7 @@ gives unlimited permission to copy, dist
+@@ -11621,6 +11712,13 @@ LIBOBJS=$ac_libobjs
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -12027,6 +12125,7 @@ gives unlimited permission to copy, dist
  ac_pwd='$ac_pwd'
  srcdir='$srcdir'
  INSTALL='$INSTALL'
@@ -2248,7 +1984,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -11805,6 +12312,7 @@ PYGOBJECT_MICRO_VERSION!$PYGOBJECT_MICRO
+@@ -12247,6 +12346,7 @@ PYGOBJECT_MICRO_VERSION!$PYGOBJECT_MICRO
  INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
  INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
  INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -2256,18 +1992,47 @@
  CYGPATH_W!$CYGPATH_W$ac_delim
  PACKAGE!$PACKAGE$ac_delim
  VERSION!$VERSION$ac_delim
-@@ -11857,7 +12365,6 @@ EGREP!$EGREP$ac_delim
- LN_S!$LN_S$ac_delim
- ECHO!$ECHO$ac_delim
- AR!$AR$ac_delim
+@@ -12255,7 +12355,6 @@ AUTOCONF!$AUTOCONF$ac_delim
+ AUTOMAKE!$AUTOMAKE$ac_delim
+ AUTOHEADER!$AUTOHEADER$ac_delim
+ MAKEINFO!$MAKEINFO$ac_delim
+-AMTAR!$AMTAR$ac_delim
+ install_sh!$install_sh$ac_delim
+ STRIP!$STRIP$ac_delim
+ INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+@@ -12263,6 +12362,12 @@ mkdir_p!$mkdir_p$ac_delim
+ AWK!$AWK$ac_delim
+ SET_MAKE!$SET_MAKE$ac_delim
+ am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
+ build!$build$ac_delim
+ build_cpu!$build_cpu$ac_delim
+ build_vendor!$build_vendor$ac_delim
+@@ -12294,12 +12399,6 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE
+ SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+-LN_S!$LN_S$ac_delim
+-ECHO!$ECHO$ac_delim
+-AR!$AR$ac_delim
 -RANLIB!$RANLIB$ac_delim
+-DSYMUTIL!$DSYMUTIL$ac_delim
+-NMEDIT!$NMEDIT$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -11899,11 +12406,15 @@ _ACEOF
+@@ -12341,11 +12440,18 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
 +RANLIB!$RANLIB$ac_delim
 +DSYMUTIL!$DSYMUTIL$ac_delim
 +NMEDIT!$NMEDIT$ac_delim
@@ -2280,7 +2045,7 @@
  PYTHON!$PYTHON$ac_delim
  PYTHON_VERSION!$PYTHON_VERSION$ac_delim
  PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
-@@ -11919,7 +12430,6 @@ XSLTPROC!$XSLTPROC$ac_delim
+@@ -12361,7 +12467,6 @@ XSLTPROC!$XSLTPROC$ac_delim
  ENABLE_DOCS_TRUE!$ENABLE_DOCS_TRUE$ac_delim
  ENABLE_DOCS_FALSE!$ENABLE_DOCS_FALSE$ac_delim
  THREADING_CFLAGS!$THREADING_CFLAGS$ac_delim
@@ -2288,7 +2053,7 @@
  GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
  GLIB_LIBS!$GLIB_LIBS$ac_delim
  GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
-@@ -11927,14 +12437,15 @@ GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim
+@@ -12369,14 +12474,15 @@ GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim
  GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
  pygobject_CODEGEN_DEFINES!$pygobject_CODEGEN_DEFINES$ac_delim
  DATADIR!$DATADIR$ac_delim
@@ -2302,11 +2067,11 @@
  _ACEOF
  
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -12161,6 +12672,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -12603,6 +12709,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
    [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
    *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
    esac
@@ -2318,7 +2083,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -12214,6 +12730,7 @@ s&@builddir@&$ac_builddir&;t t
+@@ -12656,6 +12767,7 @@ s&@builddir@&$ac_builddir&;t t
  s&@abs_builddir@&$ac_abs_builddir&;t t
  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  s&@INSTALL@&$ac_INSTALL&;t t
@@ -2326,7 +2091,7 @@
  $ac_datarootdir_hack
  " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
  
-@@ -12329,21 +12846,22 @@ echo "$as_me: $ac_file is unchanged" >&6
+@@ -12771,21 +12883,22 @@ echo "$as_me: $ac_file is unchanged" >&6
    fi
    rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
@@ -2356,7 +2121,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -12378,8 +12896,9 @@ echo "$as_me: executing $ac_file command
+@@ -12820,8 +12933,9 @@ echo "$as_me: executing $ac_file command
    # some people rename them; so instead we look at the file content.
    # Grep'ing the first line is not enough: some people post-process
    # each Makefile.in and add a new line on top of each file to say so.
@@ -2368,16 +2133,63 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
-diff -pruN pygobject-2.14.1.orig/docs/Makefile.in pygobject-2.14.1/docs/Makefile.in
---- pygobject-2.14.1.orig/docs/Makefile.in	2008-01-03 12:20:21.000000000 +0100
-+++ pygobject-2.14.1/docs/Makefile.in	2008-03-25 00:40:20.404676575 +0100
+@@ -12848,27 +12962,21 @@ echo X"$mf" |
+   else
+     continue
+   fi
+-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+-  # Extract the definition of DEP_FILES from the Makefile without
+-  # running `make'.
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
+   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+   test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+   # When using ansi2knr, U may be empty or an underscore; expand it
+   U=`sed -n 's/^U = //p' < "$mf"`
+-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+-  # We invoke sed twice because it is the simplest approach to
+-  # changing $(DEPDIR) to its actual value in the expansion.
+-  for file in `sed -n '
+-    /^DEP_FILES = .*\\\\$/ {
+-      s/^DEP_FILES = //
+-      :loop
+-	s/\\\\$//
+-	p
+-	n
+-	/\\\\$/ b loop
+-      p
+-    }
+-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+@@ -12975,5 +13083,5 @@ fi
+ 
+ 
+ echo
+-echo "libffi support: $pygobject_ffi_h"
++echo "libffi support: $enable_ffi"
+ echo
+Index: pygobject-2.14.2/docs/Makefile.in
+===================================================================
+--- pygobject-2.14.2.orig/docs/Makefile.in	2008-06-07 13:52:51.611006288 +0200
++++ pygobject-2.14.2/docs/Makefile.in	2008-06-07 14:07:36.099005181 +0200
 @@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
@@ -2398,7 +2210,12 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -39,7 +35,9 @@ host_triplet = @host@
+@@ -34,18 +30,27 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
  subdir = docs
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -2408,8 +2225,22 @@
 +	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -60,8 +58,6 @@ DATA = $(CSS_DATA) $(XSL_DATA)
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
++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 = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(CSSdir)" "$(DESTDIR)$(XSLdir)"
+ CSSDATA_INSTALL = $(INSTALL_DATA)
+ XSLDATA_INSTALL = $(INSTALL_DATA)
+@@ -53,8 +58,6 @@ DATA = $(CSS_DATA) $(XSL_DATA)
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -2418,13 +2249,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AS = @AS@
-@@ -79,14 +75,14 @@ DATADIR = @DATADIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
+@@ -78,9 +81,8 @@ ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
  EGREP = @EGREP@
@@ -2435,7 +2260,7 @@
  FFI_LIBS = @FFI_LIBS@
  GLIB_CFLAGS = @GLIB_CFLAGS@
  GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-@@ -94,8 +90,7 @@ GLIB_LIBS = @GLIB_LIBS@
+@@ -88,8 +90,7 @@ GLIB_LIBS = @GLIB_LIBS@
  GLIB_MKENUMS = @GLIB_MKENUMS@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
@@ -2445,12 +2270,14 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -107,10 +102,10 @@ LIBTOOL = @LIBTOOL@
+@@ -100,12 +101,12 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
 +MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
+ NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
 -OS_WIN32_FALSE = @OS_WIN32_FALSE@
@@ -2458,7 +2285,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -120,8 +115,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -115,8 +116,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
  PLATFORM = @PLATFORM@
@@ -2467,7 +2294,7 @@
  PYGOBJECT_MAJOR_VERSION = @PYGOBJECT_MAJOR_VERSION@
  PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@
  PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@
-@@ -139,9 +132,11 @@ STRIP = @STRIP@
+@@ -134,18 +133,23 @@ STRIP = @STRIP@
  THREADING_CFLAGS = @THREADING_CFLAGS@
  VERSION = @VERSION@
  XSLTPROC = @XSLTPROC@
@@ -2481,7 +2308,11 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -153,6 +148,7 @@ build_alias = @build_alias@
++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@
@@ -2489,7 +2320,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -185,8 +181,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
+@@ -178,8 +182,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
  pythondir = @pythondir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -2501,7 +2332,28 @@
  REF_VERSION = $(PYGOBJECT_MAJOR_VERSION).$(PYGOBJECT_MINOR_VERSION)
  FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION)
  BUILDDIR = $(top_builddir)/docs
-@@ -284,13 +283,9 @@ mostlyclean-libtool:
+@@ -242,7 +249,7 @@ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -267,9 +274,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -277,16 +284,12 @@ mostlyclean-libtool:
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -2515,8 +2367,19 @@
 +	test -z "$(CSSdir)" || $(MKDIR_P) "$(DESTDIR)$(CSSdir)"
  	@list='$(CSS_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -307,7 +302,7 @@ uninstall-CSSDATA:
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " $(CSSDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(CSSdir)/$$f'"; \
+ 	  $(CSSDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(CSSdir)/$$f"; \
+ 	done
+@@ -294,16 +297,16 @@ install-CSSDATA: $(CSS_DATA)
+ uninstall-CSSDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(CSS_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " rm -f '$(DESTDIR)$(CSSdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(CSSdir)/$$f"; \
  	done
  install-XSLDATA: $(XSL_DATA)
  	@$(NORMAL_INSTALL)
@@ -2524,8 +2387,21 @@
 +	test -z "$(XSLdir)" || $(MKDIR_P) "$(DESTDIR)$(XSLdir)"
  	@list='$(XSL_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -330,23 +325,21 @@ CTAGS:
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " $(XSLDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(XSLdir)/$$f'"; \
+ 	  $(XSLDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(XSLdir)/$$f"; \
+ 	done
+@@ -311,7 +314,7 @@ install-XSLDATA: $(XSL_DATA)
+ uninstall-XSLDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(XSL_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " rm -f '$(DESTDIR)$(XSLdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(XSLdir)/$$f"; \
+ 	done
+@@ -323,23 +326,21 @@ CTAGS:
  
  
  distdir: $(DISTFILES)
@@ -2562,7 +2438,7 @@
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
-@@ -363,7 +356,7 @@ check: $(BUILT_SOURCES)
+@@ -356,7 +357,7 @@ check: $(BUILT_SOURCES)
  all-am: Makefile $(DATA)
  installdirs:
  	for dir in "$(DESTDIR)$(CSSdir)" "$(DESTDIR)$(XSLdir)"; do \
@@ -2571,7 +2447,16 @@
  	done
  install: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -398,7 +391,7 @@ clean-am: clean-generic clean-libtool mo
+@@ -379,7 +380,7 @@ clean-generic:
+ 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -391,7 +392,7 @@ clean-am: clean-generic clean-libtool mo
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -2580,7 +2465,7 @@
  
  dvi: dvi-am
  
-@@ -412,12 +405,20 @@ info-am:
+@@ -405,12 +406,20 @@ info-am:
  
  install-data-am: install-CSSDATA install-XSLDATA install-data-local
  
@@ -2601,7 +2486,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -436,20 +437,23 @@ ps: ps-am
+@@ -429,20 +438,23 @@ ps: ps-am
  
  ps-am:
  
@@ -2630,16 +2515,17 @@
  
  
  install-data-local:
-diff -pruN pygobject-2.14.1.orig/examples/Makefile.in pygobject-2.14.1/examples/Makefile.in
---- pygobject-2.14.1.orig/examples/Makefile.in	2008-01-03 12:20:21.000000000 +0100
-+++ pygobject-2.14.1/examples/Makefile.in	2008-03-25 00:40:20.524682184 +0100
+Index: pygobject-2.14.2/examples/Makefile.in
+===================================================================
+--- pygobject-2.14.2.orig/examples/Makefile.in	2008-06-07 13:52:51.575010372 +0200
++++ pygobject-2.14.2/examples/Makefile.in	2008-06-07 14:07:36.155004478 +0200
 @@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
@@ -2660,7 +2546,12 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -38,7 +34,9 @@ host_triplet = @host@
+@@ -33,14 +29,17 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
  subdir = examples
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -2670,8 +2561,12 @@
 +	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -49,8 +47,6 @@ DIST_SOURCES =
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+@@ -48,8 +47,6 @@ DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -2680,13 +2575,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AS = @AS@
-@@ -68,14 +64,14 @@ DATADIR = @DATADIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
+@@ -73,9 +70,8 @@ ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
  EGREP = @EGREP@
@@ -2707,12 +2596,14 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -96,10 +91,10 @@ LIBTOOL = @LIBTOOL@
+@@ -95,12 +90,12 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
 +MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
+ NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
 -OS_WIN32_FALSE = @OS_WIN32_FALSE@
@@ -2720,7 +2611,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -109,8 +104,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -110,8 +105,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
  PLATFORM = @PLATFORM@
@@ -2729,7 +2620,7 @@
  PYGOBJECT_MAJOR_VERSION = @PYGOBJECT_MAJOR_VERSION@
  PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@
  PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@
-@@ -128,9 +121,11 @@ STRIP = @STRIP@
+@@ -129,18 +122,23 @@ STRIP = @STRIP@
  THREADING_CFLAGS = @THREADING_CFLAGS@
  VERSION = @VERSION@
  XSLTPROC = @XSLTPROC@
@@ -2743,7 +2634,11 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -142,6 +137,7 @@ build_alias = @build_alias@
++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@
@@ -2751,7 +2646,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -174,8 +170,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
+@@ -173,13 +171,16 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
  pythondir = @pythondir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -2763,7 +2658,25 @@
  EXTRA_DIST = properties.py signal.py option.py
  all: all-am
  
-@@ -215,10 +214,6 @@ mostlyclean-libtool:
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -204,9 +205,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -214,10 +215,6 @@ mostlyclean-libtool:
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -2774,7 +2687,7 @@
  tags: TAGS
  TAGS:
  
-@@ -227,22 +222,21 @@ CTAGS:
+@@ -226,22 +223,21 @@ CTAGS:
  
  
  distdir: $(DISTFILES)
@@ -2810,7 +2723,16 @@
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
-@@ -287,7 +281,7 @@ clean-am: clean-generic clean-libtool mo
+@@ -275,7 +271,7 @@ mostlyclean-generic:
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -286,7 +282,7 @@ clean-am: clean-generic clean-libtool mo
  
  distclean: distclean-am
  	-rm -f Makefile
@@ -2819,7 +2741,7 @@
  
  dvi: dvi-am
  
-@@ -301,12 +295,20 @@ info-am:
+@@ -300,12 +296,20 @@ info-am:
  
  install-data-am:
  
@@ -2840,7 +2762,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -325,17 +327,20 @@ ps: ps-am
+@@ -324,17 +328,20 @@ ps: ps-am
  
  ps-am:
  
@@ -2866,24 +2788,27 @@
  
  # 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 -pruN pygobject-2.14.1.orig/gobject/Makefile.in pygobject-2.14.1/gobject/Makefile.in
---- pygobject-2.14.1.orig/gobject/Makefile.in	2008-01-03 12:20:22.000000000 +0100
-+++ pygobject-2.14.1/gobject/Makefile.in	2008-03-25 00:40:20.876649558 +0100
+Index: pygobject-2.14.2/gobject/Makefile.in
+===================================================================
+--- pygobject-2.14.2.orig/gobject/Makefile.in	2008-06-07 13:52:51.535007033 +0200
++++ pygobject-2.14.2/gobject/Makefile.in	2008-06-07 14:07:36.370504283 +0200
 @@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -16,14 +16,10 @@
- 
- 
- 
+@@ -16,16 +16,10 @@
+ 
+ 
+ 
+-SOURCES = $(_gobject_la_SOURCES) generate-constants.c
+-
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -2895,7 +2820,15 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -45,7 +41,9 @@ subdir = gobject
+@@ -37,6 +31,7 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
+ @PLATFORM_WIN32_TRUE at am__append_1 = -no-undefined
+ noinst_PROGRAMS = generate-constants$(EXEEXT)
+@@ -46,13 +41,23 @@ subdir = gobject
  DIST_COMMON = $(pkginclude_HEADERS) $(pygobject_PYTHON) \
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -2905,8 +2838,24 @@
 +	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -78,22 +76,30 @@ am__gobject_la_OBJECTS = _gobject_la-gob
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pkgincludedir)"
++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 = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(pygobjectdir)" \
++	"$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pygobjectdir)" \
++	"$(DESTDIR)$(pkgincludedir)"
+ pygobjectLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pygobject_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -71,38 +76,30 @@ am__gobject_la_OBJECTS = _gobject_la-gob
  	_gobject_la-pygtype.lo _gobject_la-pygoptioncontext.lo \
  	_gobject_la-pygoptiongroup.lo $(am__objects_1)
  _gobject_la_OBJECTS = $(am__gobject_la_OBJECTS)
@@ -2926,16 +2875,32 @@
 +DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/_gobject_la-ffi-marshaller.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-gobjectmodule.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygboxed.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygenum.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygflags.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygiochannel.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygmaincontext.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygmainloop.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygobject.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygoptioncontext.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygoptiongroup.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygparamspec.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygpointer.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygsource.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/_gobject_la-pygtype.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/generate_constants-generate-constants.Po
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -2943,7 +2908,7 @@
  SOURCES = $(_gobject_la_SOURCES) generate-constants.c
  DIST_SOURCES = $(am___gobject_la_SOURCES_DIST) generate-constants.c
  nodist_pygobjectPYTHON_INSTALL = $(INSTALL_DATA)
-@@ -107,8 +113,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
+@@ -116,8 +113,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -2952,13 +2917,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AS = @AS@
-@@ -126,14 +130,14 @@ DATADIR = @DATADIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
+@@ -141,9 +136,8 @@ ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
  EGREP = @EGREP@
@@ -2969,7 +2928,7 @@
  FFI_LIBS = @FFI_LIBS@
  GLIB_CFLAGS = @GLIB_CFLAGS@
  GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-@@ -141,8 +145,7 @@ GLIB_LIBS = @GLIB_LIBS@
+@@ -151,8 +145,7 @@ GLIB_LIBS = @GLIB_LIBS@
  GLIB_MKENUMS = @GLIB_MKENUMS@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
@@ -2979,12 +2938,14 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -154,10 +157,10 @@ LIBTOOL = @LIBTOOL@
+@@ -163,12 +156,12 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
 +MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
+ NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
 -OS_WIN32_FALSE = @OS_WIN32_FALSE@
@@ -2992,7 +2953,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -167,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -178,8 +171,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
  PLATFORM = @PLATFORM@
@@ -3001,7 +2962,7 @@
  PYGOBJECT_MAJOR_VERSION = @PYGOBJECT_MAJOR_VERSION@
  PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@
  PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@
-@@ -186,9 +187,11 @@ STRIP = @STRIP@
+@@ -197,18 +188,23 @@ STRIP = @STRIP@
  THREADING_CFLAGS = @THREADING_CFLAGS@
  VERSION = @VERSION@
  XSLTPROC = @XSLTPROC@
@@ -3015,7 +2976,11 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -200,6 +203,7 @@ build_alias = @build_alias@
++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@
@@ -3023,7 +2988,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -232,8 +236,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
+@@ -241,8 +237,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
  pythondir = @pythondir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -3035,7 +3000,7 @@
  AUTOMAKE_OPTIONS = 1.7
  PLATFORM_VERSION = 2.0
  INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
-@@ -252,7 +259,7 @@ common_ldflags = -module -avoid-version 
+@@ -261,33 +260,20 @@ common_ldflags = -module -avoid-version 
  generate_constants_CFLAGS = $(GLIB_CFLAGS)
  CLEANFILES = constants.py
  EXTRA_DIST = constants.py.in
@@ -3043,8 +3008,48 @@
 +_gobject_la_CFLAGS = $(GLIB_CFLAGS) $(FFI_CFLAGS) $(am__append_3)
  _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
  _gobject_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
- _gobject_la_SOURCES = gobjectmodule.c pygboxed.c pygenum.c pygflags.c \
-@@ -296,21 +303,21 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+-_gobject_la_SOURCES = \
+-	gobjectmodule.c \
+-	pygboxed.c \
+-	pygenum.c \
+-	pygflags.c \
+-	pygobject.c \
+-	pygobject.h \
+-	pygobject-private.h \
+-	pygmaincontext.c \
+-	pygmainloop.c \
+-	pygparamspec.c \
+-	pygpointer.c \
+-	pygiochannel.c \
+-	pygsource.c \
+-	pygtype.c \
+-	pygoptioncontext.c \
+-	pygoptiongroup.c\
+-$(am__append_2)
++_gobject_la_SOURCES = gobjectmodule.c pygboxed.c pygenum.c pygflags.c \
++	pygobject.c pygobject.h pygobject-private.h pygmaincontext.c \
++	pygmainloop.c pygparamspec.c pygpointer.c pygiochannel.c \
++	pygsource.c pygtype.c pygoptioncontext.c pygoptiongroup.c \
++	$(am__append_2)
+ _gobject_la_DEPENDENCIES = constants.py
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -312,27 +298,27 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pygobjectLTLIBRARIES: $(pygobject_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
@@ -3052,9 +3057,10 @@
 +	test -z "$(pygobjectdir)" || $(MKDIR_P) "$(DESTDIR)$(pygobjectdir)"
  	@list='$(pygobject_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
 -	    echo " $(LIBTOOL) --mode=install $(pygobjectLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pygobjectdir)/$$f'"; \
 -	    $(LIBTOOL) --mode=install $(pygobjectLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pygobjectdir)/$$f"; \
++	    f=$(am__strip_dir) \
 +	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pygobjectLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pygobjectdir)/$$f'"; \
 +	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pygobjectLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pygobjectdir)/$$f"; \
  	  else :; fi; \
@@ -3062,17 +3068,17 @@
  
  uninstall-pygobjectLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(pygobject_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(pygobject_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
+ 	@list='$(pygobject_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
 -	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pygobjectdir)/$$p'"; \
 -	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pygobjectdir)/$$p"; \
++	  p=$(am__strip_dir) \
 +	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pygobjectdir)/$$p'"; \
 +	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pygobjectdir)/$$p"; \
  	done
  
  clean-pygobjectLTLIBRARIES:
-@@ -322,7 +329,7 @@ clean-pygobjectLTLIBRARIES:
+@@ -344,7 +330,7 @@ clean-pygobjectLTLIBRARIES:
  	  rm -f "$${dir}/so_locations"; \
  	done
  _gobject.la: $(_gobject_la_OBJECTS) $(_gobject_la_DEPENDENCIES) 
@@ -3081,7 +3087,7 @@
  
  clean-noinstPROGRAMS:
  	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -332,7 +339,7 @@ clean-noinstPROGRAMS:
+@@ -354,7 +340,7 @@ clean-noinstPROGRAMS:
  	done
  generate-constants$(EXEEXT): $(generate_constants_OBJECTS) $(generate_constants_DEPENDENCIES) 
  	@rm -f generate-constants$(EXEEXT)
@@ -3090,7 +3096,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -358,141 +365,141 @@ distclean-compile:
+@@ -380,474 +366,212 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/generate_constants-generate-constants.Po at am__quote@
  
  .c.o:
@@ -3099,7 +3105,9 @@
 + at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -3108,7 +3116,9 @@
 + at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -3117,157 +3127,429 @@
 + at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
  
+-_gobject_la-gobjectmodule.o: gobjectmodule.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-gobjectmodule.o -MD -MP -MF "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" -c -o _gobject_la-gobjectmodule.o `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" "$(DEPDIR)/_gobject_la-gobjectmodule.Po"; else rm -f "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gobjectmodule.c' object='_gobject_la-gobjectmodule.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-gobjectmodule.Po' tmpdepfile='$(DEPDIR)/_gobject_la-gobjectmodule.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-gobjectmodule.o `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c
+-
+-_gobject_la-gobjectmodule.obj: gobjectmodule.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-gobjectmodule.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" -c -o _gobject_la-gobjectmodule.obj `if test -f 'gobjectmodule.c'; then $(CYGPATH_W) 'gobjectmodule.c'; else $(CYGPATH_W) '$(srcdir)/gobjectmodule.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" "$(DEPDIR)/_gobject_la-gobjectmodule.Po"; else rm -f "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gobjectmodule.c' object='_gobject_la-gobjectmodule.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-gobjectmodule.Po' tmpdepfile='$(DEPDIR)/_gobject_la-gobjectmodule.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-gobjectmodule.obj `if test -f 'gobjectmodule.c'; then $(CYGPATH_W) 'gobjectmodule.c'; else $(CYGPATH_W) '$(srcdir)/gobjectmodule.c'; fi`
+-
  _gobject_la-gobjectmodule.lo: gobjectmodule.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-gobjectmodule.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" -c -o _gobject_la-gobjectmodule.lo `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-gobjectmodule.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" -c -o _gobject_la-gobjectmodule.lo `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo" "$(DEPDIR)/_gobject_la-gobjectmodule.Plo"; else rm -f "$(DEPDIR)/_gobject_la-gobjectmodule.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-gobjectmodule.lo -MD -MP -MF $(DEPDIR)/_gobject_la-gobjectmodule.Tpo -c -o _gobject_la-gobjectmodule.lo `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-gobjectmodule.Tpo $(DEPDIR)/_gobject_la-gobjectmodule.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gobjectmodule.c' object='_gobject_la-gobjectmodule.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-gobjectmodule.lo `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-gobjectmodule.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-gobjectmodule.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-gobjectmodule.lo `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c
+-
+-_gobject_la-pygboxed.o: pygboxed.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygboxed.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygboxed.Tpo" -c -o _gobject_la-pygboxed.o `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygboxed.Tpo" "$(DEPDIR)/_gobject_la-pygboxed.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygboxed.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygboxed.c' object='_gobject_la-pygboxed.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygboxed.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygboxed.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygboxed.o `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c
+-
+-_gobject_la-pygboxed.obj: pygboxed.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygboxed.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygboxed.Tpo" -c -o _gobject_la-pygboxed.obj `if test -f 'pygboxed.c'; then $(CYGPATH_W) 'pygboxed.c'; else $(CYGPATH_W) '$(srcdir)/pygboxed.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygboxed.Tpo" "$(DEPDIR)/_gobject_la-pygboxed.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygboxed.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygboxed.c' object='_gobject_la-pygboxed.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygboxed.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygboxed.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygboxed.obj `if test -f 'pygboxed.c'; then $(CYGPATH_W) 'pygboxed.c'; else $(CYGPATH_W) '$(srcdir)/pygboxed.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-gobjectmodule.lo `test -f 'gobjectmodule.c' || echo '$(srcdir)/'`gobjectmodule.c
  
  _gobject_la-pygboxed.lo: pygboxed.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygboxed.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygboxed.Tpo" -c -o _gobject_la-pygboxed.lo `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygboxed.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygboxed.Tpo" -c -o _gobject_la-pygboxed.lo `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygboxed.Tpo" "$(DEPDIR)/_gobject_la-pygboxed.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygboxed.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygboxed.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygboxed.Tpo -c -o _gobject_la-pygboxed.lo `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygboxed.Tpo $(DEPDIR)/_gobject_la-pygboxed.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygboxed.c' object='_gobject_la-pygboxed.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygboxed.lo `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygboxed.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygboxed.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygboxed.lo `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c
+-
+-_gobject_la-pygenum.o: pygenum.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygenum.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygenum.Tpo" -c -o _gobject_la-pygenum.o `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygenum.Tpo" "$(DEPDIR)/_gobject_la-pygenum.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygenum.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygenum.c' object='_gobject_la-pygenum.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygenum.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygenum.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygenum.o `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c
+-
+-_gobject_la-pygenum.obj: pygenum.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygenum.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygenum.Tpo" -c -o _gobject_la-pygenum.obj `if test -f 'pygenum.c'; then $(CYGPATH_W) 'pygenum.c'; else $(CYGPATH_W) '$(srcdir)/pygenum.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygenum.Tpo" "$(DEPDIR)/_gobject_la-pygenum.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygenum.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygenum.c' object='_gobject_la-pygenum.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygenum.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygenum.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygenum.obj `if test -f 'pygenum.c'; then $(CYGPATH_W) 'pygenum.c'; else $(CYGPATH_W) '$(srcdir)/pygenum.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygboxed.lo `test -f 'pygboxed.c' || echo '$(srcdir)/'`pygboxed.c
  
  _gobject_la-pygenum.lo: pygenum.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygenum.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygenum.Tpo" -c -o _gobject_la-pygenum.lo `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygenum.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygenum.Tpo" -c -o _gobject_la-pygenum.lo `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygenum.Tpo" "$(DEPDIR)/_gobject_la-pygenum.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygenum.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygenum.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygenum.Tpo -c -o _gobject_la-pygenum.lo `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygenum.Tpo $(DEPDIR)/_gobject_la-pygenum.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygenum.c' object='_gobject_la-pygenum.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygenum.lo `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygenum.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygenum.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygenum.lo `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c
+-
+-_gobject_la-pygflags.o: pygflags.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygflags.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygflags.Tpo" -c -o _gobject_la-pygflags.o `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygflags.Tpo" "$(DEPDIR)/_gobject_la-pygflags.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygflags.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygflags.c' object='_gobject_la-pygflags.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygflags.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygflags.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygflags.o `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c
+-
+-_gobject_la-pygflags.obj: pygflags.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygflags.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygflags.Tpo" -c -o _gobject_la-pygflags.obj `if test -f 'pygflags.c'; then $(CYGPATH_W) 'pygflags.c'; else $(CYGPATH_W) '$(srcdir)/pygflags.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygflags.Tpo" "$(DEPDIR)/_gobject_la-pygflags.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygflags.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygflags.c' object='_gobject_la-pygflags.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygflags.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygflags.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygflags.obj `if test -f 'pygflags.c'; then $(CYGPATH_W) 'pygflags.c'; else $(CYGPATH_W) '$(srcdir)/pygflags.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygenum.lo `test -f 'pygenum.c' || echo '$(srcdir)/'`pygenum.c
  
  _gobject_la-pygflags.lo: pygflags.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygflags.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygflags.Tpo" -c -o _gobject_la-pygflags.lo `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygflags.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygflags.Tpo" -c -o _gobject_la-pygflags.lo `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygflags.Tpo" "$(DEPDIR)/_gobject_la-pygflags.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygflags.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygflags.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygflags.Tpo -c -o _gobject_la-pygflags.lo `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygflags.Tpo $(DEPDIR)/_gobject_la-pygflags.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygflags.c' object='_gobject_la-pygflags.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygflags.lo `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygflags.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygflags.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygflags.lo `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c
+-
+-_gobject_la-pygobject.o: pygobject.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygobject.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygobject.Tpo" -c -o _gobject_la-pygobject.o `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygobject.Tpo" "$(DEPDIR)/_gobject_la-pygobject.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygobject.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygobject.c' object='_gobject_la-pygobject.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygobject.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygobject.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygobject.o `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c
+-
+-_gobject_la-pygobject.obj: pygobject.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygobject.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygobject.Tpo" -c -o _gobject_la-pygobject.obj `if test -f 'pygobject.c'; then $(CYGPATH_W) 'pygobject.c'; else $(CYGPATH_W) '$(srcdir)/pygobject.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygobject.Tpo" "$(DEPDIR)/_gobject_la-pygobject.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygobject.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygobject.c' object='_gobject_la-pygobject.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygobject.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygobject.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygobject.obj `if test -f 'pygobject.c'; then $(CYGPATH_W) 'pygobject.c'; else $(CYGPATH_W) '$(srcdir)/pygobject.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygflags.lo `test -f 'pygflags.c' || echo '$(srcdir)/'`pygflags.c
  
  _gobject_la-pygobject.lo: pygobject.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygobject.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygobject.Tpo" -c -o _gobject_la-pygobject.lo `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygobject.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygobject.Tpo" -c -o _gobject_la-pygobject.lo `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygobject.Tpo" "$(DEPDIR)/_gobject_la-pygobject.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygobject.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygobject.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygobject.Tpo -c -o _gobject_la-pygobject.lo `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygobject.Tpo $(DEPDIR)/_gobject_la-pygobject.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygobject.c' object='_gobject_la-pygobject.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygobject.lo `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygobject.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygobject.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygobject.lo `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c
+-
+-_gobject_la-pygmaincontext.o: pygmaincontext.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmaincontext.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" -c -o _gobject_la-pygmaincontext.o `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" "$(DEPDIR)/_gobject_la-pygmaincontext.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygmaincontext.c' object='_gobject_la-pygmaincontext.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygmaincontext.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygmaincontext.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmaincontext.o `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
+-
+-_gobject_la-pygmaincontext.obj: pygmaincontext.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmaincontext.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" -c -o _gobject_la-pygmaincontext.obj `if test -f 'pygmaincontext.c'; then $(CYGPATH_W) 'pygmaincontext.c'; else $(CYGPATH_W) '$(srcdir)/pygmaincontext.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" "$(DEPDIR)/_gobject_la-pygmaincontext.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygmaincontext.c' object='_gobject_la-pygmaincontext.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygmaincontext.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygmaincontext.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmaincontext.obj `if test -f 'pygmaincontext.c'; then $(CYGPATH_W) 'pygmaincontext.c'; else $(CYGPATH_W) '$(srcdir)/pygmaincontext.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygobject.lo `test -f 'pygobject.c' || echo '$(srcdir)/'`pygobject.c
  
  _gobject_la-pygmaincontext.lo: pygmaincontext.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmaincontext.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" -c -o _gobject_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmaincontext.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" -c -o _gobject_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo" "$(DEPDIR)/_gobject_la-pygmaincontext.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygmaincontext.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmaincontext.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygmaincontext.Tpo -c -o _gobject_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygmaincontext.Tpo $(DEPDIR)/_gobject_la-pygmaincontext.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygmaincontext.c' object='_gobject_la-pygmaincontext.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygmaincontext.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygmaincontext.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
+-
+-_gobject_la-pygmainloop.o: pygmainloop.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmainloop.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" -c -o _gobject_la-pygmainloop.o `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" "$(DEPDIR)/_gobject_la-pygmainloop.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygmainloop.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygmainloop.c' object='_gobject_la-pygmainloop.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygmainloop.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygmainloop.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmainloop.o `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
+-
+-_gobject_la-pygmainloop.obj: pygmainloop.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmainloop.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" -c -o _gobject_la-pygmainloop.obj `if test -f 'pygmainloop.c'; then $(CYGPATH_W) 'pygmainloop.c'; else $(CYGPATH_W) '$(srcdir)/pygmainloop.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" "$(DEPDIR)/_gobject_la-pygmainloop.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygmainloop.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygmainloop.c' object='_gobject_la-pygmainloop.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygmainloop.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygmainloop.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmainloop.obj `if test -f 'pygmainloop.c'; then $(CYGPATH_W) 'pygmainloop.c'; else $(CYGPATH_W) '$(srcdir)/pygmainloop.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmaincontext.lo `test -f 'pygmaincontext.c' || echo '$(srcdir)/'`pygmaincontext.c
  
  _gobject_la-pygmainloop.lo: pygmainloop.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmainloop.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" -c -o _gobject_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmainloop.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" -c -o _gobject_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygmainloop.Tpo" "$(DEPDIR)/_gobject_la-pygmainloop.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygmainloop.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygmainloop.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygmainloop.Tpo -c -o _gobject_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygmainloop.Tpo $(DEPDIR)/_gobject_la-pygmainloop.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygmainloop.c' object='_gobject_la-pygmainloop.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygmainloop.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygmainloop.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
+-
+-_gobject_la-pygparamspec.o: pygparamspec.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygparamspec.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" -c -o _gobject_la-pygparamspec.o `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" "$(DEPDIR)/_gobject_la-pygparamspec.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygparamspec.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygparamspec.c' object='_gobject_la-pygparamspec.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygparamspec.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygparamspec.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygparamspec.o `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c
+-
+-_gobject_la-pygparamspec.obj: pygparamspec.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygparamspec.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" -c -o _gobject_la-pygparamspec.obj `if test -f 'pygparamspec.c'; then $(CYGPATH_W) 'pygparamspec.c'; else $(CYGPATH_W) '$(srcdir)/pygparamspec.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" "$(DEPDIR)/_gobject_la-pygparamspec.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygparamspec.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygparamspec.c' object='_gobject_la-pygparamspec.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygparamspec.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygparamspec.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygparamspec.obj `if test -f 'pygparamspec.c'; then $(CYGPATH_W) 'pygparamspec.c'; else $(CYGPATH_W) '$(srcdir)/pygparamspec.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygmainloop.lo `test -f 'pygmainloop.c' || echo '$(srcdir)/'`pygmainloop.c
  
  _gobject_la-pygparamspec.lo: pygparamspec.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygparamspec.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" -c -o _gobject_la-pygparamspec.lo `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygparamspec.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" -c -o _gobject_la-pygparamspec.lo `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygparamspec.Tpo" "$(DEPDIR)/_gobject_la-pygparamspec.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygparamspec.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygparamspec.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygparamspec.Tpo -c -o _gobject_la-pygparamspec.lo `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygparamspec.Tpo $(DEPDIR)/_gobject_la-pygparamspec.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygparamspec.c' object='_gobject_la-pygparamspec.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygparamspec.lo `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygparamspec.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygparamspec.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygparamspec.lo `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c
+-
+-_gobject_la-pygpointer.o: pygpointer.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygpointer.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygpointer.Tpo" -c -o _gobject_la-pygpointer.o `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygpointer.Tpo" "$(DEPDIR)/_gobject_la-pygpointer.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygpointer.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygpointer.c' object='_gobject_la-pygpointer.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygpointer.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygpointer.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygpointer.o `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c
+-
+-_gobject_la-pygpointer.obj: pygpointer.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygpointer.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygpointer.Tpo" -c -o _gobject_la-pygpointer.obj `if test -f 'pygpointer.c'; then $(CYGPATH_W) 'pygpointer.c'; else $(CYGPATH_W) '$(srcdir)/pygpointer.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygpointer.Tpo" "$(DEPDIR)/_gobject_la-pygpointer.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygpointer.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygpointer.c' object='_gobject_la-pygpointer.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygpointer.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygpointer.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygpointer.obj `if test -f 'pygpointer.c'; then $(CYGPATH_W) 'pygpointer.c'; else $(CYGPATH_W) '$(srcdir)/pygpointer.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygparamspec.lo `test -f 'pygparamspec.c' || echo '$(srcdir)/'`pygparamspec.c
  
  _gobject_la-pygpointer.lo: pygpointer.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygpointer.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygpointer.Tpo" -c -o _gobject_la-pygpointer.lo `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygpointer.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygpointer.Tpo" -c -o _gobject_la-pygpointer.lo `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygpointer.Tpo" "$(DEPDIR)/_gobject_la-pygpointer.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygpointer.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygpointer.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygpointer.Tpo -c -o _gobject_la-pygpointer.lo `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygpointer.Tpo $(DEPDIR)/_gobject_la-pygpointer.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygpointer.c' object='_gobject_la-pygpointer.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygpointer.lo `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygpointer.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygpointer.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygpointer.lo `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c
+-
+-_gobject_la-pygiochannel.o: pygiochannel.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygiochannel.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" -c -o _gobject_la-pygiochannel.o `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" "$(DEPDIR)/_gobject_la-pygiochannel.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygiochannel.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygiochannel.c' object='_gobject_la-pygiochannel.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygiochannel.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygiochannel.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygiochannel.o `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
+-
+-_gobject_la-pygiochannel.obj: pygiochannel.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygiochannel.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" -c -o _gobject_la-pygiochannel.obj `if test -f 'pygiochannel.c'; then $(CYGPATH_W) 'pygiochannel.c'; else $(CYGPATH_W) '$(srcdir)/pygiochannel.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" "$(DEPDIR)/_gobject_la-pygiochannel.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygiochannel.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygiochannel.c' object='_gobject_la-pygiochannel.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygiochannel.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygiochannel.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygiochannel.obj `if test -f 'pygiochannel.c'; then $(CYGPATH_W) 'pygiochannel.c'; else $(CYGPATH_W) '$(srcdir)/pygiochannel.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygpointer.lo `test -f 'pygpointer.c' || echo '$(srcdir)/'`pygpointer.c
  
  _gobject_la-pygiochannel.lo: pygiochannel.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygiochannel.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" -c -o _gobject_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygiochannel.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" -c -o _gobject_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygiochannel.Tpo" "$(DEPDIR)/_gobject_la-pygiochannel.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygiochannel.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygiochannel.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygiochannel.Tpo -c -o _gobject_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygiochannel.Tpo $(DEPDIR)/_gobject_la-pygiochannel.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygiochannel.c' object='_gobject_la-pygiochannel.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygiochannel.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygiochannel.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
+-
+-_gobject_la-pygsource.o: pygsource.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygsource.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygsource.Tpo" -c -o _gobject_la-pygsource.o `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygsource.Tpo" "$(DEPDIR)/_gobject_la-pygsource.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygsource.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygsource.c' object='_gobject_la-pygsource.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygsource.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygsource.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygsource.o `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c
+-
+-_gobject_la-pygsource.obj: pygsource.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygsource.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygsource.Tpo" -c -o _gobject_la-pygsource.obj `if test -f 'pygsource.c'; then $(CYGPATH_W) 'pygsource.c'; else $(CYGPATH_W) '$(srcdir)/pygsource.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygsource.Tpo" "$(DEPDIR)/_gobject_la-pygsource.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygsource.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygsource.c' object='_gobject_la-pygsource.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygsource.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygsource.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygsource.obj `if test -f 'pygsource.c'; then $(CYGPATH_W) 'pygsource.c'; else $(CYGPATH_W) '$(srcdir)/pygsource.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygiochannel.lo `test -f 'pygiochannel.c' || echo '$(srcdir)/'`pygiochannel.c
  
  _gobject_la-pygsource.lo: pygsource.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygsource.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygsource.Tpo" -c -o _gobject_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygsource.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygsource.Tpo" -c -o _gobject_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygsource.Tpo" "$(DEPDIR)/_gobject_la-pygsource.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygsource.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygsource.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygsource.Tpo -c -o _gobject_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygsource.Tpo $(DEPDIR)/_gobject_la-pygsource.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygsource.c' object='_gobject_la-pygsource.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygsource.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygsource.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c
+-
+-_gobject_la-pygtype.o: pygtype.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygtype.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygtype.Tpo" -c -o _gobject_la-pygtype.o `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygtype.Tpo" "$(DEPDIR)/_gobject_la-pygtype.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygtype.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtype.c' object='_gobject_la-pygtype.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygtype.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygtype.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygtype.o `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c
+-
+-_gobject_la-pygtype.obj: pygtype.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygtype.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygtype.Tpo" -c -o _gobject_la-pygtype.obj `if test -f 'pygtype.c'; then $(CYGPATH_W) 'pygtype.c'; else $(CYGPATH_W) '$(srcdir)/pygtype.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygtype.Tpo" "$(DEPDIR)/_gobject_la-pygtype.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygtype.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtype.c' object='_gobject_la-pygtype.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygtype.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygtype.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygtype.obj `if test -f 'pygtype.c'; then $(CYGPATH_W) 'pygtype.c'; else $(CYGPATH_W) '$(srcdir)/pygtype.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygsource.lo `test -f 'pygsource.c' || echo '$(srcdir)/'`pygsource.c
  
  _gobject_la-pygtype.lo: pygtype.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygtype.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygtype.Tpo" -c -o _gobject_la-pygtype.lo `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygtype.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygtype.Tpo" -c -o _gobject_la-pygtype.lo `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygtype.Tpo" "$(DEPDIR)/_gobject_la-pygtype.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygtype.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygtype.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygtype.Tpo -c -o _gobject_la-pygtype.lo `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygtype.Tpo $(DEPDIR)/_gobject_la-pygtype.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtype.c' object='_gobject_la-pygtype.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygtype.lo `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygtype.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygtype.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygtype.lo `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c
+-
+-_gobject_la-pygoptioncontext.o: pygoptioncontext.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptioncontext.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" -c -o _gobject_la-pygoptioncontext.o `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" "$(DEPDIR)/_gobject_la-pygoptioncontext.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygoptioncontext.c' object='_gobject_la-pygoptioncontext.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygoptioncontext.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygoptioncontext.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptioncontext.o `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c
+-
+-_gobject_la-pygoptioncontext.obj: pygoptioncontext.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptioncontext.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" -c -o _gobject_la-pygoptioncontext.obj `if test -f 'pygoptioncontext.c'; then $(CYGPATH_W) 'pygoptioncontext.c'; else $(CYGPATH_W) '$(srcdir)/pygoptioncontext.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" "$(DEPDIR)/_gobject_la-pygoptioncontext.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygoptioncontext.c' object='_gobject_la-pygoptioncontext.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygoptioncontext.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygoptioncontext.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptioncontext.obj `if test -f 'pygoptioncontext.c'; then $(CYGPATH_W) 'pygoptioncontext.c'; else $(CYGPATH_W) '$(srcdir)/pygoptioncontext.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygtype.lo `test -f 'pygtype.c' || echo '$(srcdir)/'`pygtype.c
  
  _gobject_la-pygoptioncontext.lo: pygoptioncontext.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptioncontext.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" -c -o _gobject_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptioncontext.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" -c -o _gobject_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo" "$(DEPDIR)/_gobject_la-pygoptioncontext.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygoptioncontext.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptioncontext.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygoptioncontext.Tpo -c -o _gobject_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygoptioncontext.Tpo $(DEPDIR)/_gobject_la-pygoptioncontext.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygoptioncontext.c' object='_gobject_la-pygoptioncontext.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygoptioncontext.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygoptioncontext.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c
+-
+-_gobject_la-pygoptiongroup.o: pygoptiongroup.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptiongroup.o -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" -c -o _gobject_la-pygoptiongroup.o `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" "$(DEPDIR)/_gobject_la-pygoptiongroup.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygoptiongroup.c' object='_gobject_la-pygoptiongroup.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygoptiongroup.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygoptiongroup.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptiongroup.o `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c
+-
+-_gobject_la-pygoptiongroup.obj: pygoptiongroup.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptiongroup.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" -c -o _gobject_la-pygoptiongroup.obj `if test -f 'pygoptiongroup.c'; then $(CYGPATH_W) 'pygoptiongroup.c'; else $(CYGPATH_W) '$(srcdir)/pygoptiongroup.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" "$(DEPDIR)/_gobject_la-pygoptiongroup.Po"; else rm -f "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygoptiongroup.c' object='_gobject_la-pygoptiongroup.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygoptiongroup.Po' tmpdepfile='$(DEPDIR)/_gobject_la-pygoptiongroup.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptiongroup.obj `if test -f 'pygoptiongroup.c'; then $(CYGPATH_W) 'pygoptiongroup.c'; else $(CYGPATH_W) '$(srcdir)/pygoptiongroup.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptioncontext.lo `test -f 'pygoptioncontext.c' || echo '$(srcdir)/'`pygoptioncontext.c
  
  _gobject_la-pygoptiongroup.lo: pygoptiongroup.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptiongroup.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" -c -o _gobject_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptiongroup.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" -c -o _gobject_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo" "$(DEPDIR)/_gobject_la-pygoptiongroup.Plo"; else rm -f "$(DEPDIR)/_gobject_la-pygoptiongroup.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-pygoptiongroup.lo -MD -MP -MF $(DEPDIR)/_gobject_la-pygoptiongroup.Tpo -c -o _gobject_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-pygoptiongroup.Tpo $(DEPDIR)/_gobject_la-pygoptiongroup.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygoptiongroup.c' object='_gobject_la-pygoptiongroup.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-pygoptiongroup.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-pygoptiongroup.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c
+-
+-_gobject_la-ffi-marshaller.o: ffi-marshaller.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-ffi-marshaller.o -MD -MP -MF "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" -c -o _gobject_la-ffi-marshaller.o `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" "$(DEPDIR)/_gobject_la-ffi-marshaller.Po"; else rm -f "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ffi-marshaller.c' object='_gobject_la-ffi-marshaller.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-ffi-marshaller.Po' tmpdepfile='$(DEPDIR)/_gobject_la-ffi-marshaller.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-ffi-marshaller.o `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c
+-
+-_gobject_la-ffi-marshaller.obj: ffi-marshaller.c
+- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-ffi-marshaller.obj -MD -MP -MF "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" -c -o _gobject_la-ffi-marshaller.obj `if test -f 'ffi-marshaller.c'; then $(CYGPATH_W) 'ffi-marshaller.c'; else $(CYGPATH_W) '$(srcdir)/ffi-marshaller.c'; fi`; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" "$(DEPDIR)/_gobject_la-ffi-marshaller.Po"; else rm -f "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ffi-marshaller.c' object='_gobject_la-ffi-marshaller.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-ffi-marshaller.Po' tmpdepfile='$(DEPDIR)/_gobject_la-ffi-marshaller.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-ffi-marshaller.obj `if test -f 'ffi-marshaller.c'; then $(CYGPATH_W) 'ffi-marshaller.c'; else $(CYGPATH_W) '$(srcdir)/ffi-marshaller.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-pygoptiongroup.lo `test -f 'pygoptiongroup.c' || echo '$(srcdir)/'`pygoptiongroup.c
  
  _gobject_la-ffi-marshaller.lo: ffi-marshaller.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-ffi-marshaller.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" -c -o _gobject_la-ffi-marshaller.lo `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c; \
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-ffi-marshaller.lo -MD -MP -MF "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" -c -o _gobject_la-ffi-marshaller.lo `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c; \
 - at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo" "$(DEPDIR)/_gobject_la-ffi-marshaller.Plo"; else rm -f "$(DEPDIR)/_gobject_la-ffi-marshaller.Tpo"; exit 1; fi
 + at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -MT _gobject_la-ffi-marshaller.lo -MD -MP -MF $(DEPDIR)/_gobject_la-ffi-marshaller.Tpo -c -o _gobject_la-ffi-marshaller.lo `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/_gobject_la-ffi-marshaller.Tpo $(DEPDIR)/_gobject_la-ffi-marshaller.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ffi-marshaller.c' object='_gobject_la-ffi-marshaller.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-ffi-marshaller.lo `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gobject_la-ffi-marshaller.Plo' tmpdepfile='$(DEPDIR)/_gobject_la-ffi-marshaller.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-ffi-marshaller.lo `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 + at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gobject_la_CFLAGS) $(CFLAGS) -c -o _gobject_la-ffi-marshaller.lo `test -f 'ffi-marshaller.c' || echo '$(srcdir)/'`ffi-marshaller.c
  
  generate_constants-generate-constants.o: generate-constants.c
@@ -3276,7 +3558,9 @@
 + at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(generate_constants_CFLAGS) $(CFLAGS) -MT generate_constants-generate-constants.o -MD -MP -MF $(DEPDIR)/generate_constants-generate-constants.Tpo -c -o generate_constants-generate-constants.o `test -f 'generate-constants.c' || echo '$(srcdir)/'`generate-constants.c
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/generate_constants-generate-constants.Tpo $(DEPDIR)/generate_constants-generate-constants.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-constants.c' object='generate_constants-generate-constants.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/generate_constants-generate-constants.Po' tmpdepfile='$(DEPDIR)/generate_constants-generate-constants.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(generate_constants_CFLAGS) $(CFLAGS) -c -o generate_constants-generate-constants.o `test -f 'generate-constants.c' || echo '$(srcdir)/'`generate-constants.c
  
  generate_constants-generate-constants.obj: generate-constants.c
@@ -3285,9 +3569,21 @@
 + at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(generate_constants_CFLAGS) $(CFLAGS) -MT generate_constants-generate-constants.obj -MD -MP -MF $(DEPDIR)/generate_constants-generate-constants.Tpo -c -o generate_constants-generate-constants.obj `if test -f 'generate-constants.c'; then $(CYGPATH_W) 'generate-constants.c'; else $(CYGPATH_W) '$(srcdir)/generate-constants.c'; fi`
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/generate_constants-generate-constants.Tpo $(DEPDIR)/generate_constants-generate-constants.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-constants.c' object='generate_constants-generate-constants.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/generate_constants-generate-constants.Po' tmpdepfile='$(DEPDIR)/generate_constants-generate-constants.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(generate_constants_CFLAGS) $(CFLAGS) -c -o generate_constants-generate-constants.obj `if test -f 'generate-constants.c'; then $(CYGPATH_W) 'generate-constants.c'; else $(CYGPATH_W) '$(srcdir)/generate-constants.c'; fi`
-@@ -502,13 +509,9 @@ mostlyclean-libtool:
+ 
+-generate_constants-generate-constants.lo: generate-constants.c
+- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(generate_constants_CFLAGS) $(CFLAGS) -MT generate_constants-generate-constants.lo -MD -MP -MF "$(DEPDIR)/generate_constants-generate-constants.Tpo" -c -o generate_constants-generate-constants.lo `test -f 'generate-constants.c' || echo '$(srcdir)/'`generate-constants.c; \
+- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/generate_constants-generate-constants.Tpo" "$(DEPDIR)/generate_constants-generate-constants.Plo"; else rm -f "$(DEPDIR)/generate_constants-generate-constants.Tpo"; exit 1; fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-constants.c' object='generate_constants-generate-constants.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/generate_constants-generate-constants.Plo' tmpdepfile='$(DEPDIR)/generate_constants-generate-constants.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(generate_constants_CFLAGS) $(CFLAGS) -c -o generate_constants-generate-constants.lo `test -f 'generate-constants.c' || echo '$(srcdir)/'`generate-constants.c
+-
+ mostlyclean-libtool:
+ 	-rm -f *.lo
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -3302,7 +3598,37 @@
  	@list='$(nodist_pygobject_PYTHON)'; dlist=''; for p in $$list; do\
  	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
  	  if test -f $$b$$p; then \
-@@ -536,7 +539,7 @@ uninstall-nodist_pygobjectPYTHON:
+-	    d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	    dlist="$$dlist $$d"; \
+-	    echo " $(nodist_pygobjectPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pygobjectdir)/$$d'"; \
+-	    $(nodist_pygobjectPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pygobjectdir)/$$d"; \
++	    f=$(am__strip_dir) \
++	    dlist="$$dlist $$f"; \
++	    echo " $(nodist_pygobjectPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pygobjectdir)/$$f'"; \
++	    $(nodist_pygobjectPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pygobjectdir)/$$f"; \
+ 	  else :; fi; \
+ 	done; \
+-	test -z "$$dlist" || \
+-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pygobjectdir)" $$dlist
++	if test -n "$$dlist"; then \
++	  if test -z "$(DESTDIR)"; then \
++	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pygobjectdir)" $$dlist; \
++	  else \
++	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pygobjectdir)" $$dlist; \
++	  fi; \
++	else :; fi
+ 
+ uninstall-nodist_pygobjectPYTHON:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(nodist_pygobject_PYTHON)'; dlist=''; for p in $$list; do\
+-	  d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	  rm -f "$(DESTDIR)$(pygobjectdir)/$$d"; \
+-	  rm -f "$(DESTDIR)$(pygobjectdir)/$${d}c"; \
+-	  rm -f "$(DESTDIR)$(pygobjectdir)/$${d}o"; \
++	  f=$(am__strip_dir) \
++	  rm -f "$(DESTDIR)$(pygobjectdir)/$$f"; \
++	  rm -f "$(DESTDIR)$(pygobjectdir)/$${f}c"; \
++	  rm -f "$(DESTDIR)$(pygobjectdir)/$${f}o"; \
  	done
  install-pygobjectPYTHON: $(pygobject_PYTHON)
  	@$(NORMAL_INSTALL)
@@ -3311,7 +3637,37 @@
  	@list='$(pygobject_PYTHON)'; dlist=''; for p in $$list; do\
  	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
  	  if test -f $$b$$p; then \
-@@ -564,7 +567,7 @@ uninstall-pygobjectPYTHON:
+-	    d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	    dlist="$$dlist $$d"; \
+-	    echo " $(pygobjectPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pygobjectdir)/$$d'"; \
+-	    $(pygobjectPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pygobjectdir)/$$d"; \
++	    f=$(am__strip_dir) \
++	    dlist="$$dlist $$f"; \
++	    echo " $(pygobjectPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pygobjectdir)/$$f'"; \
++	    $(pygobjectPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pygobjectdir)/$$f"; \
+ 	  else :; fi; \
+ 	done; \
+-	test -z "$$dlist" || \
+-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pygobjectdir)" $$dlist
++	if test -n "$$dlist"; then \
++	  if test -z "$(DESTDIR)"; then \
++	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pygobjectdir)" $$dlist; \
++	  else \
++	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pygobjectdir)" $$dlist; \
++	  fi; \
++	else :; fi
+ 
+ uninstall-pygobjectPYTHON:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(pygobject_PYTHON)'; dlist=''; for p in $$list; do\
+-	  d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	  rm -f "$(DESTDIR)$(pygobjectdir)/$$d"; \
+-	  rm -f "$(DESTDIR)$(pygobjectdir)/$${d}c"; \
+-	  rm -f "$(DESTDIR)$(pygobjectdir)/$${d}o"; \
++	  f=$(am__strip_dir) \
++	  rm -f "$(DESTDIR)$(pygobjectdir)/$$f"; \
++	  rm -f "$(DESTDIR)$(pygobjectdir)/$${f}c"; \
++	  rm -f "$(DESTDIR)$(pygobjectdir)/$${f}o"; \
  	done
  install-pkgincludeHEADERS: $(pkginclude_HEADERS)
  	@$(NORMAL_INSTALL)
@@ -3319,8 +3675,21 @@
 +	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
  	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -585,8 +588,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
+ 	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ 	done
+@@ -855,7 +579,7 @@ install-pkgincludeHEADERS: $(pkginclude_
+ uninstall-pkgincludeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ 	done
+@@ -865,8 +589,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -3331,7 +3700,7 @@
  	mkid -fID $$unique
  tags: TAGS
  
-@@ -598,8 +601,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+@@ -878,8 +602,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -3342,7 +3711,7 @@
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
  	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -609,13 +612,12 @@ ctags: CTAGS
+@@ -889,13 +613,12 @@ ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
@@ -3358,7 +3727,7 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-@@ -629,22 +631,21 @@ distclean-tags:
+@@ -909,22 +632,21 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -3394,7 +3763,7 @@
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
-@@ -660,7 +661,7 @@ check: check-am
+@@ -940,7 +662,7 @@ check: check-am
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
  installdirs:
  	for dir in "$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pygobjectdir)" "$(DESTDIR)$(pkgincludedir)"; do \
@@ -3403,7 +3772,16 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -696,7 +697,7 @@ distclean: distclean-am
+@@ -962,7 +684,7 @@ clean-generic:
+ 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -976,7 +698,7 @@ distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -3412,7 +3790,7 @@
  
  dvi: dvi-am
  
-@@ -712,12 +713,20 @@ install-data-am: install-nodist_pygobjec
+@@ -992,12 +714,20 @@ install-data-am: install-nodist_pygobjec
  	install-pkgincludeHEADERS install-pygobjectLTLIBRARIES \
  	install-pygobjectPYTHON
  
@@ -3433,7 +3811,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -738,25 +747,29 @@ ps: ps-am
+@@ -1018,25 +748,29 @@ ps: ps-am
  
  ps-am:
  
@@ -3469,16 +3847,17 @@
  
  
  constants.py: generate-constants$(EXEEXT) constants.py.in
-diff -pruN pygobject-2.14.1.orig/Makefile.in pygobject-2.14.1/Makefile.in
---- pygobject-2.14.1.orig/Makefile.in	2008-01-03 12:20:22.000000000 +0100
-+++ pygobject-2.14.1/Makefile.in	2008-03-25 00:40:21.248649459 +0100
+Index: pygobject-2.14.2/Makefile.in
+===================================================================
+--- pygobject-2.14.2.orig/Makefile.in	2008-06-07 13:52:51.511009919 +0200
++++ pygobject-2.14.2/Makefile.in	2008-06-07 14:07:36.571005464 +0200
 @@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
@@ -3499,15 +3878,18 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -38,6 +34,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
+@@ -35,8 +31,10 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
  host_triplet = @host@
  @PLATFORM_WIN32_TRUE at am__append_1 = -no-undefined
 +subdir = .
  DIST_COMMON = README $(am__configure_deps) $(noinst_PYTHON) \
  	$(pkgpyexec_PYTHON) $(pyexec_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/PKG-INFO.in \
-@@ -48,13 +45,14 @@ DIST_COMMON = README $(am__configure_dep
+@@ -47,18 +45,27 @@ DIST_COMMON = README $(am__configure_dep
  	$(top_srcdir)/docs/xsl/fixxref.py.in AUTHORS COPYING ChangeLog \
  	INSTALL NEWS compile config.guess config.sub depcomp \
  	install-sh ltmain.sh missing py-compile
@@ -3521,11 +3903,26 @@
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 - configure.lineno configure.status.lineno
+-mkinstalldirs = $(mkdir_p)
 + configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = pygobject-2.0.pc pygobject-2.0-uninstalled.pc \
-@@ -75,15 +73,18 @@ SOURCES =
+ 	docs/reference/entities.docbook docs/xsl/fixxref.py PKG-INFO
+-am__installdirs = "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pkgconfigdir)"
++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 = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" \
++	"$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" \
++	"$(DESTDIR)$(pkgconfigdir)"
+ pkgpyexecLTLIBRARIES_INSTALL = $(INSTALL)
+ pyexecLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) $(pyexec_LTLIBRARIES)
+@@ -66,15 +73,18 @@ SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  	html-recursive info-recursive install-data-recursive \
@@ -3548,7 +3945,7 @@
  ETAGS = etags
  CTAGS = ctags
  DIST_SUBDIRS = $(SUBDIRS)
-@@ -100,8 +101,6 @@ distuninstallcheck_listfiles = find . -t
+@@ -91,8 +101,6 @@ distuninstallcheck_listfiles = find . -t
  distcleancheck_listfiles = find . -type f -print
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -3557,13 +3954,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AS = @AS@
-@@ -119,14 +118,14 @@ DATADIR = @DATADIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
+@@ -116,9 +124,8 @@ ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
  EGREP = @EGREP@
@@ -3574,7 +3965,7 @@
  FFI_LIBS = @FFI_LIBS@
  GLIB_CFLAGS = @GLIB_CFLAGS@
  GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-@@ -134,8 +133,7 @@ GLIB_LIBS = @GLIB_LIBS@
+@@ -126,8 +133,7 @@ GLIB_LIBS = @GLIB_LIBS@
  GLIB_MKENUMS = @GLIB_MKENUMS@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
@@ -3584,12 +3975,14 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -147,10 +145,10 @@ LIBTOOL = @LIBTOOL@
+@@ -138,12 +144,12 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
 +MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
+ NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
 -OS_WIN32_FALSE = @OS_WIN32_FALSE@
@@ -3597,7 +3990,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -160,8 +158,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -153,8 +159,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
  PLATFORM = @PLATFORM@
@@ -3606,7 +3999,7 @@
  PYGOBJECT_MAJOR_VERSION = @PYGOBJECT_MAJOR_VERSION@
  PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@
  PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@
-@@ -179,9 +175,11 @@ STRIP = @STRIP@
+@@ -172,18 +176,23 @@ STRIP = @STRIP@
  THREADING_CFLAGS = @THREADING_CFLAGS@
  VERSION = @VERSION@
  XSLTPROC = @XSLTPROC@
@@ -3620,7 +4013,11 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -193,6 +191,7 @@ build_alias = @build_alias@
++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@
@@ -3628,7 +4025,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -227,8 +226,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
+@@ -218,8 +227,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
  pythondir = @pythondir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -3640,7 +4037,26 @@
  AUTOMAKE_OPTIONS = 1.7
  SUBDIRS = docs gobject examples tests
  PLATFORM_VERSION = 2.0
-@@ -301,7 +303,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+@@ -260,7 +272,7 @@ all: config.h
+ .SUFFIXES:
+ am--refresh:
+ 	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -287,21 +299,21 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
  config.h: stamp-h1
  	@if test ! -f $@; then \
  	  rm -f stamp-h1; \
@@ -3649,7 +4065,14 @@
  	else :; fi
  
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -326,21 +328,21 @@ PKG-INFO: $(top_builddir)/config.status 
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h1
+ 	touch $@
+@@ -320,21 +332,21 @@ PKG-INFO: $(top_builddir)/config.status 
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
@@ -3657,9 +4080,10 @@
 +	test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)"
  	@list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
 -	    echo " $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \
 -	    $(LIBTOOL) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \
++	    f=$(am__strip_dir) \
 +	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \
 +	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgpyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \
  	  else :; fi; \
@@ -3667,17 +4091,17 @@
  
  uninstall-pkgpyexecLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
+ 	@list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
 -	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \
 -	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \
++	  p=$(am__strip_dir) \
 +	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$p'"; \
 +	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$p"; \
  	done
  
  clean-pkgpyexecLTLIBRARIES:
-@@ -353,21 +355,21 @@ clean-pkgpyexecLTLIBRARIES:
+@@ -347,21 +359,21 @@ clean-pkgpyexecLTLIBRARIES:
  	done
  install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
@@ -3685,9 +4109,10 @@
 +	test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
  	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
+-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
 -	    echo " $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
 -	    $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
++	    f=$(am__strip_dir) \
 +	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
 +	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
  	  else :; fi; \
@@ -3695,17 +4120,17 @@
  
  uninstall-pyexecLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
+ 	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
 -	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \
 -	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \
++	  p=$(am__strip_dir) \
 +	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \
 +	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \
  	done
  
  clean-pyexecLTLIBRARIES:
-@@ -387,10 +389,9 @@ clean-libtool:
+@@ -381,59 +393,68 @@ clean-libtool:
  
  distclean-libtool:
  	-rm -f libtool
@@ -3717,7 +4142,37 @@
  	@list='$(pkgpyexec_PYTHON)'; dlist=''; for p in $$list; do\
  	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
  	  if test -f $$b$$p; then \
-@@ -418,7 +419,7 @@ uninstall-pkgpyexecPYTHON:
+-	    d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	    dlist="$$dlist $$d"; \
+-	    echo " $(pkgpyexecPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpyexecdir)/$$d'"; \
+-	    $(pkgpyexecPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpyexecdir)/$$d"; \
++	    f=$(am__strip_dir) \
++	    dlist="$$dlist $$f"; \
++	    echo " $(pkgpyexecPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \
++	    $(pkgpyexecPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpyexecdir)/$$f"; \
+ 	  else :; fi; \
+ 	done; \
+-	test -z "$$dlist" || \
+-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpyexecdir)" $$dlist
++	if test -n "$$dlist"; then \
++	  if test -z "$(DESTDIR)"; then \
++	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pkgpyexecdir)" $$dlist; \
++	  else \
++	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pkgpyexecdir)" $$dlist; \
++	  fi; \
++	else :; fi
+ 
+ uninstall-pkgpyexecPYTHON:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(pkgpyexec_PYTHON)'; dlist=''; for p in $$list; do\
+-	  d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	  rm -f "$(DESTDIR)$(pkgpyexecdir)/$$d"; \
+-	  rm -f "$(DESTDIR)$(pkgpyexecdir)/$${d}c"; \
+-	  rm -f "$(DESTDIR)$(pkgpyexecdir)/$${d}o"; \
++	  f=$(am__strip_dir) \
++	  rm -f "$(DESTDIR)$(pkgpyexecdir)/$$f"; \
++	  rm -f "$(DESTDIR)$(pkgpyexecdir)/$${f}c"; \
++	  rm -f "$(DESTDIR)$(pkgpyexecdir)/$${f}o"; \
  	done
  install-pyexecPYTHON: $(pyexec_PYTHON)
  	@$(NORMAL_INSTALL)
@@ -3726,7 +4181,37 @@
  	@list='$(pyexec_PYTHON)'; dlist=''; for p in $$list; do\
  	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
  	  if test -f $$b$$p; then \
-@@ -446,7 +447,7 @@ uninstall-pyexecPYTHON:
+-	    d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	    dlist="$$dlist $$d"; \
+-	    echo " $(pyexecPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pyexecdir)/$$d'"; \
+-	    $(pyexecPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pyexecdir)/$$d"; \
++	    f=$(am__strip_dir) \
++	    dlist="$$dlist $$f"; \
++	    echo " $(pyexecPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
++	    $(pyexecPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
+ 	  else :; fi; \
+ 	done; \
+-	test -z "$$dlist" || \
+-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pyexecdir)" $$dlist
++	if test -n "$$dlist"; then \
++	  if test -z "$(DESTDIR)"; then \
++	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
++	  else \
++	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \
++	  fi; \
++	else :; fi
+ 
+ uninstall-pyexecPYTHON:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(pyexec_PYTHON)'; dlist=''; for p in $$list; do\
+-	  d=`echo $$p | sed -e 's,^.*/,,'`; \
+-	  rm -f "$(DESTDIR)$(pyexecdir)/$$d"; \
+-	  rm -f "$(DESTDIR)$(pyexecdir)/$${d}c"; \
+-	  rm -f "$(DESTDIR)$(pyexecdir)/$${d}o"; \
++	  f=$(am__strip_dir) \
++	  rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \
++	  rm -f "$(DESTDIR)$(pyexecdir)/$${f}c"; \
++	  rm -f "$(DESTDIR)$(pyexecdir)/$${f}o"; \
  	done
  install-pkgconfigDATA: $(pkgconfig_DATA)
  	@$(NORMAL_INSTALL)
@@ -3734,18 +4219,70 @@
 +	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
  	@list='$(pkgconfig_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -493,8 +494,7 @@ $(RECURSIVE_TARGETS):
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
+@@ -441,7 +462,7 @@ install-pkgconfigDATA: $(pkgconfig_DATA)
+ uninstall-pkgconfigDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
++	  f=$(am__strip_dir) \
+ 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
+@@ -453,7 +474,13 @@ uninstall-pkgconfigDATA:
+ #     (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):
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -465,15 +492,20 @@ $(RECURSIVE_TARGETS):
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
  	fi; test -z "$$fail"
  
 -mostlyclean-recursive clean-recursive distclean-recursive \
 -maintainer-clean-recursive:
+-	@set fnord $$MAKEFLAGS; amf=$$2; \
 +$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -538,8 +538,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
++	@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)' ;; \
+@@ -494,7 +526,7 @@ maintainer-clean-recursive:
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -510,8 +542,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -3756,7 +4293,7 @@
  	mkid -fID $$unique
  tags: TAGS
  
-@@ -564,8 +564,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -536,8 +568,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -3767,7 +4304,7 @@
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
  	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -575,13 +575,12 @@ ctags: CTAGS
+@@ -547,13 +579,12 @@ ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
@@ -3783,12 +4320,12 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-@@ -596,24 +595,22 @@ distclean-tags:
+@@ -568,24 +599,22 @@ distclean-tags:
  
  distdir: $(DISTFILES)
  	$(am__remove_distdir)
 -	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/. $(distdir)/docs/reference $(distdir)/docs/xsl
+-	$(mkdir_p) $(distdir)/. $(distdir)/docs/reference $(distdir)/docs/xsl $(distdir)/m4
 -	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 -	list='$(DISTFILES)'; for file in $$list; do \
@@ -3822,25 +4359,31 @@
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
-@@ -627,7 +624,7 @@ distdir: $(DISTFILES)
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+@@ -596,15 +625,19 @@ distdir: $(DISTFILES)
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
 +	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -635,6 +632,8 @@ distdir: $(DISTFILES)
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ 	    (cd $$subdir && \
  	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
 +		am__remove_distdir=: \
 +		am__skip_length_check=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -642,7 +641,7 @@ distdir: $(DISTFILES)
+@@ -612,18 +645,22 @@ distdir: $(DISTFILES)
  	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -3848,28 +4391,52 @@
 +	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
  	|| chmod -R a+r $(distdir)
  dist-gzip: distdir
- 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -652,6 +651,10 @@ dist-bzip2: distdir
- 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
  
+ dist-bzip2: distdir
+-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
++	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++	$(am__remove_distdir)
++
 +dist-lzma: distdir
 +	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+	$(am__remove_distdir)
-+
+ 	$(am__remove_distdir)
+ 
  dist-tarZ: distdir
- 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
++	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
-@@ -678,6 +681,8 @@ distcheck: dist
- 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ 
+ dist-shar: distdir
+@@ -636,7 +673,7 @@ dist-zip: distdir
+ 	$(am__remove_distdir)
+ 
+ dist dist-all: distdir
+-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+ 
+ # This target untars the dist file and tries a VPATH configuration.  Then
+@@ -645,11 +682,13 @@ dist dist-all: distdir
+ distcheck: dist
+ 	case '$(DIST_ARCHIVES)' in \
+ 	*.tar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
  	*.tar.bz2*) \
- 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
++	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 +	*.tar.lzma*) \
 +	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
  	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
++	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
-@@ -717,7 +722,7 @@ distcheck: dist
+ 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ 	*.zip*) \
+@@ -687,7 +726,7 @@ distcheck: dist
  	$(am__remove_distdir)
  	@(echo "$(distdir) archives ready for distribution: "; \
  	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -3878,7 +4445,7 @@
  distuninstallcheck:
  	@cd $(distuninstallcheck_dir) \
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -742,7 +747,7 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) 
+@@ -712,7 +751,7 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) 
  installdirs: installdirs-recursive
  installdirs-am:
  	for dir in "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
@@ -3887,7 +4454,16 @@
  	done
  install: install-recursive
  install-exec: install-exec-recursive
-@@ -792,14 +797,22 @@ info-am:
+@@ -734,7 +773,7 @@ clean-generic:
+ 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -762,14 +801,22 @@ info-am:
  
  install-data-am: install-data-local install-pkgconfigDATA
  
@@ -3910,7 +4486,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -820,35 +833,35 @@ ps: ps-recursive
+@@ -790,35 +837,35 @@ ps: ps-recursive
  
  ps-am:
  
@@ -3971,24 +4547,27 @@
  
  
  # install pth file.
-diff -pruN pygobject-2.14.1.orig/tests/Makefile.in pygobject-2.14.1/tests/Makefile.in
---- pygobject-2.14.1.orig/tests/Makefile.in	2008-01-03 12:20:22.000000000 +0100
-+++ pygobject-2.14.1/tests/Makefile.in	2008-03-25 00:40:21.040649439 +0100
+Index: pygobject-2.14.2/tests/Makefile.in
+===================================================================
+--- pygobject-2.14.2.orig/tests/Makefile.in	2008-06-07 13:52:51.491013872 +0200
++++ pygobject-2.14.2/tests/Makefile.in	2008-06-07 14:07:36.450504116 +0200
 @@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
+@@ -14,17 +14,11 @@
  
  @SET_MAKE@
  
+-SOURCES = $(testhelper_la_SOURCES)
+-
 -srcdir = @srcdir@
 -top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -4001,7 +4580,12 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -39,7 +35,9 @@ host_triplet = @host@
+@@ -36,14 +30,17 @@ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
  subdir = tests
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -4011,8 +4595,12 @@
 +	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -51,17 +49,21 @@ testhelper_la_DEPENDENCIES = $(am__DEPEN
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+@@ -52,20 +49,21 @@ testhelper_la_DEPENDENCIES = $(am__DEPEN
  am_testhelper_la_OBJECTS = testhelpermodule.lo test-thread.lo \
  	test-unknown.lo
  testhelper_la_OBJECTS = $(am_testhelper_la_OBJECTS)
@@ -4023,16 +4611,19 @@
 +DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/test-thread.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/test-unknown.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/testhelpermodule.Plo
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 -	$(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -4040,7 +4631,7 @@
  SOURCES = $(testhelper_la_SOURCES)
  DIST_SOURCES = $(testhelper_la_SOURCES)
  ETAGS = etags
-@@ -69,8 +71,6 @@ CTAGS = ctags
+@@ -73,8 +71,6 @@ CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -4049,13 +4640,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AS = @AS@
-@@ -88,14 +88,14 @@ DATADIR = @DATADIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
+@@ -98,9 +94,8 @@ ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
  ECHO_T = @ECHO_T@
  EGREP = @EGREP@
@@ -4066,7 +4651,7 @@
  FFI_LIBS = @FFI_LIBS@
  GLIB_CFLAGS = @GLIB_CFLAGS@
  GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-@@ -103,8 +103,7 @@ GLIB_LIBS = @GLIB_LIBS@
+@@ -108,8 +103,7 @@ GLIB_LIBS = @GLIB_LIBS@
  GLIB_MKENUMS = @GLIB_MKENUMS@
  GOBJECT_QUERY = @GOBJECT_QUERY@
  GREP = @GREP@
@@ -4076,12 +4661,14 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -116,10 +115,10 @@ LIBTOOL = @LIBTOOL@
+@@ -120,12 +114,12 @@ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
 +MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
+ NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
 -OS_WIN32_FALSE = @OS_WIN32_FALSE@
@@ -4089,7 +4676,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -129,8 +128,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -135,8 +129,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
  PLATFORM = @PLATFORM@
@@ -4098,7 +4685,7 @@
  PYGOBJECT_MAJOR_VERSION = @PYGOBJECT_MAJOR_VERSION@
  PYGOBJECT_MICRO_VERSION = @PYGOBJECT_MICRO_VERSION@
  PYGOBJECT_MINOR_VERSION = @PYGOBJECT_MINOR_VERSION@
-@@ -148,9 +145,11 @@ STRIP = @STRIP@
+@@ -154,18 +146,23 @@ STRIP = @STRIP@
  THREADING_CFLAGS = @THREADING_CFLAGS@
  VERSION = @VERSION@
  XSLTPROC = @XSLTPROC@
@@ -4112,7 +4699,11 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -162,6 +161,7 @@ build_alias = @build_alias@
++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@
@@ -4120,7 +4711,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -194,8 +194,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
+@@ -198,8 +195,11 @@ pygobject_CODEGEN_DEFINES = @pygobject_C
  pythondir = @pythondir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -4132,7 +4723,28 @@
  INCLUDES = \
  	$(PYTHON_INCLUDES) \
  	$(GLIB_CFLAGS) \
-@@ -285,22 +288,22 @@ distclean-compile:
+@@ -239,7 +239,7 @@ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -264,9 +264,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+@@ -289,27 +289,24 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testhelpermodule.Plo at am__quote@
  
  .c.o:
@@ -4141,7 +4753,9 @@
 + at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
@@ -4150,7 +4764,9 @@
 + at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -4159,9 +4775,13 @@
 + at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 + at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -311,17 +314,13 @@ mostlyclean-libtool:
+ 
+ mostlyclean-libtool:
+@@ -318,17 +315,13 @@ mostlyclean-libtool:
  clean-libtool:
  	-rm -rf .libs _libs
  
@@ -4181,7 +4801,7 @@
  	mkid -fID $$unique
  tags: TAGS
  
-@@ -333,8 +332,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+@@ -340,8 +333,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -4192,7 +4812,7 @@
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
  	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -344,13 +343,12 @@ ctags: CTAGS
+@@ -351,13 +344,12 @@ ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
  	tags=; \
@@ -4208,7 +4828,7 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-@@ -364,22 +362,21 @@ distclean-tags:
+@@ -371,22 +363,21 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -4244,7 +4864,16 @@
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
-@@ -428,7 +425,7 @@ distclean: distclean-am
+@@ -421,7 +412,7 @@ mostlyclean-generic:
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -435,7 +426,7 @@ distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -4253,7 +4882,7 @@
  
  dvi: dvi-am
  
-@@ -442,12 +439,20 @@ info-am:
+@@ -449,12 +440,20 @@ info-am:
  
  install-data-am:
  
@@ -4274,7 +4903,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -468,19 +473,23 @@ ps: ps-am
+@@ -475,19 +474,23 @@ ps: ps-am
  
  ps-am:
  

Added: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=16190&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series (added)
+++ desktop/unstable/pygobject/debian/patches/series Sat Jun  7 13:20:21 2008
@@ -1,0 +1,6 @@
+01_pkgconfig-private.patch
+02_ffi-use-pkgconfig.patch
+03_maintainer_mode.patch
+60_use-python-config-for-includes.patch
+61_wakeupfd-fix.patch
+90_autofoo.patch

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=16190&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules (original)
+++ desktop/unstable/pygobject/debian/rules Sat Jun  7 13:20:21 2008
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
@@ -20,7 +20,7 @@
 
 PYVERS := $(shell pyversions -vs)
 
-build-%/configure-stamp:
+build-%/configure-stamp: apply-patches
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && \
@@ -28,7 +28,7 @@
 			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
-dbg-build-%/configure-stamp:
+dbg-build-%/configure-stamp: apply-patches
 	dh_testdir
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && \
@@ -47,7 +47,7 @@
 	$(MAKE) -C dbg-build-$*
 	touch $@
 
-build: apply-patches $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
+build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
 
 install-clean:
 	dh_testdir




More information about the pkg-gnome-commits mailing list