r13394 - in /desktop/unstable/gtkmm2.4/debian: changelog control control.in patches/70_relibtoolize.patch patches/99_relibtoolize.patch

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Mon Nov 5 15:52:11 UTC 2007


Author: manphiz-guest
Date: Mon Nov  5 15:52:11 2007
New Revision: 13394

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13394
Log:
* New upstream version.
* debian/control, debian/control.in
  + Add Vcs-Browser and Vcs-Svn entries.
* debian/patches
  + Rename 99_relibtoolize.patch to 70_relibtoolize.patch for consistency,
    and renew it for new version.

Added:
    desktop/unstable/gtkmm2.4/debian/patches/70_relibtoolize.patch
      - copied, changed from r13386, desktop/unstable/gtkmm2.4/debian/patches/99_relibtoolize.patch
Removed:
    desktop/unstable/gtkmm2.4/debian/patches/99_relibtoolize.patch
Modified:
    desktop/unstable/gtkmm2.4/debian/changelog
    desktop/unstable/gtkmm2.4/debian/control
    desktop/unstable/gtkmm2.4/debian/control.in

Modified: desktop/unstable/gtkmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/changelog?rev=13394&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/changelog (original)
+++ desktop/unstable/gtkmm2.4/debian/changelog Mon Nov  5 15:52:11 2007
@@ -1,3 +1,14 @@
+gtkmm2.4 (1:2.12.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/control, debian/control.in
+    + Add Vcs-Browser and Vcs-Svn entries.
+  * debian/patches
+    + Rename 99_relibtoolize.patch to 70_relibtoolize.patch for consistency,
+      and renew it for new version.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Mon, 05 Nov 2007 23:08:04 +0800
+
 gtkmm2.4 (1:2.12.1-1) unstable; urgency=low
 
   * New upstream version. Closes: #443395

Modified: desktop/unstable/gtkmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control?rev=13394&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control (original)
+++ desktop/unstable/gtkmm2.4/debian/control Mon Nov  5 15:52:11 2007
@@ -3,6 +3,9 @@
 Priority: optional
 Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Homepage: http://www.gtkmm.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gtkmm2.4
 Build-Depends: cdbs,
                debhelper (>= 5),
                doc-base,

Modified: desktop/unstable/gtkmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control.in?rev=13394&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control.in (original)
+++ desktop/unstable/gtkmm2.4/debian/control.in Mon Nov  5 15:52:11 2007
@@ -3,6 +3,9 @@
 Priority: optional
 Maintainer: Deng Xiyue <manphiz-guest at users.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
+Homepage: http://www.gtkmm.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gtkmm2.4
 Build-Depends: cdbs,
                debhelper (>= 5),
                doc-base,

Copied: desktop/unstable/gtkmm2.4/debian/patches/70_relibtoolize.patch (from r13386, desktop/unstable/gtkmm2.4/debian/patches/99_relibtoolize.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/patches/70_relibtoolize.patch?rev=13394&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/patches/99_relibtoolize.patch (original)
+++ desktop/unstable/gtkmm2.4/debian/patches/70_relibtoolize.patch Mon Nov  5 15:52:11 2007
@@ -1,14 +1,7 @@
-diff -Naur gtkmm-2.12.1.orig/aclocal.m4 gtkmm-2.12.1/aclocal.m4
---- gtkmm-2.12.1.orig/aclocal.m4	2007-10-05 16:14:03.000000000 +0800
-+++ gtkmm-2.12.1/aclocal.m4	2007-10-16 20:04:23.000000000 +0800
-@@ -11,3698 +11,4061 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--m4_if(m4_PACKAGE_VERSION, [2.60],,
--[m4_fatal([this file was generated for autoconf 2.60.
-+m4_if(m4_PACKAGE_VERSION, [2.61],,
-+[m4_fatal([this file was generated for autoconf 2.61.
+diff -Naur gtkmm-2.12.2.orig/aclocal.m4 gtkmm-2.12.2/aclocal.m4
+--- gtkmm-2.12.2.orig/aclocal.m4	2007-11-05 17:08:29.000000000 +0800
++++ gtkmm-2.12.2/aclocal.m4	2007-11-05 20:58:34.000000000 +0800
+@@ -16,3693 +16,4056 @@
  You have another version of autoconf.  If you want to use that,
  you should regenerate the build system entirely.], [63])])
  
@@ -14301,9 +14294,9 @@
  
  m4_include([scripts/docgen.m4])
  m4_include([scripts/macros.m4])
-diff -Naur gtkmm-2.12.1.orig/atk/atkmm/Makefile.in gtkmm-2.12.1/atk/atkmm/Makefile.in
---- gtkmm-2.12.1.orig/atk/atkmm/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/atk/atkmm/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/atk/atkmm/Makefile.in gtkmm-2.12.2/atk/atkmm/Makefile.in
+--- gtkmm-2.12.2.orig/atk/atkmm/Makefile.in	2007-11-05 17:08:39.000000000 +0800
++++ gtkmm-2.12.2/atk/atkmm/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -204,6 +204,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -14312,9 +14305,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/atk/atkmm/private/Makefile.in gtkmm-2.12.1/atk/atkmm/private/Makefile.in
---- gtkmm-2.12.1.orig/atk/atkmm/private/Makefile.in	2007-10-05 16:14:09.000000000 +0800
-+++ gtkmm-2.12.1/atk/atkmm/private/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/atk/atkmm/private/Makefile.in gtkmm-2.12.2/atk/atkmm/private/Makefile.in
+--- gtkmm-2.12.2.orig/atk/atkmm/private/Makefile.in	2007-11-05 17:08:39.000000000 +0800
++++ gtkmm-2.12.2/atk/atkmm/private/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -150,6 +150,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -14323,9 +14316,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/atk/Makefile.in gtkmm-2.12.1/atk/Makefile.in
---- gtkmm-2.12.1.orig/atk/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/atk/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/atk/Makefile.in gtkmm-2.12.2/atk/Makefile.in
+--- gtkmm-2.12.2.orig/atk/Makefile.in	2007-11-05 17:08:39.000000000 +0800
++++ gtkmm-2.12.2/atk/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -14334,9 +14327,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/atk/src/Makefile.in gtkmm-2.12.1/atk/src/Makefile.in
---- gtkmm-2.12.1.orig/atk/src/Makefile.in	2007-10-05 16:14:09.000000000 +0800
-+++ gtkmm-2.12.1/atk/src/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/atk/src/Makefile.in gtkmm-2.12.2/atk/src/Makefile.in
+--- gtkmm-2.12.2.orig/atk/src/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/atk/src/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -14345,189 +14338,10 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/configure gtkmm-2.12.1/configure
---- gtkmm-2.12.1.orig/configure	2007-10-05 16:14:31.000000000 +0800
-+++ gtkmm-2.12.1/configure	2007-10-16 20:05:38.000000000 +0800
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gtkmm 2.12.1.
-+# Generated by GNU Autoconf 2.61 for gtkmm 2.12.1.
- #
- # Report bugs to <gtkmm-list at gnome.org>.
- #
-@@ -12,7 +12,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -21,10 +22,13 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
- 
- 
- # PATH needs CR
-@@ -217,7 +221,7 @@
- else
-   as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-@@ -235,7 +239,6 @@
- 	 # Try only shells that exist, to save several forks.
- 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
--# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -244,10 +247,12 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
- 
- :
- _ASEOF
-@@ -255,7 +260,6 @@
-   CONFIG_SHELL=$as_shell
- 	       as_have_required=yes
- 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
--# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -264,10 +268,12 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
- 
- :
- (as_func_return () {
-@@ -514,19 +520,28 @@
-   as_mkdir_p=false
- fi
- 
--# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
--# systems may use methods other than mode bits to determine executability.
--cat >conf$$.file <<_ASEOF
--#! /bin/sh
--exit 0
--_ASEOF
--chmod +x conf$$.file
--if test -x conf$$.file >/dev/null 2>&1; then
--  as_executable_p="test -x"
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
- else
--  as_executable_p=:
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
- fi
--rm -f conf$$.file
-+as_executable_p=$as_test_x
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -721,36 +736,36 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- #  include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- #  include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
--#if HAVE_STDINT_H
-+#ifdef HAVE_STDINT_H
- # include <stdint.h>
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
- 
-@@ -851,6 +866,7 @@
+diff -Naur gtkmm-2.12.2.orig/configure gtkmm-2.12.2/configure
+--- gtkmm-2.12.2.orig/configure	2007-11-05 17:09:13.000000000 +0800
++++ gtkmm-2.12.2/configure	2007-11-05 20:58:55.000000000 +0800
+@@ -866,6 +866,7 @@
  PLATFORM_WIN32_FALSE
  OS_WIN32_TRUE
  OS_WIN32_FALSE
@@ -14535,469 +14349,7 @@
  GREP
  EGREP
  LN_S
-@@ -906,6 +922,7 @@
- CC
- CFLAGS
- LDFLAGS
-+LIBS
- CPPFLAGS
- CPP
- CXX
-@@ -1030,10 +1047,10 @@
-   -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     eval enable_$ac_feature=no ;;
- 
-   -docdir | --docdir | --docdi | --doc | --do)
-@@ -1049,10 +1066,10 @@
-   -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     eval enable_$ac_feature=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1246,19 +1263,19 @@
-   -with-* | --with-*)
-     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     eval with_$ac_package=\$ac_optarg ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/-/_/g'`
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     eval with_$ac_package=no ;;
- 
-   --x)
-@@ -1540,6 +1557,7 @@
-   CFLAGS      C compiler flags
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-@@ -1632,7 +1650,7 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- gtkmm configure 2.12.1
--generated by GNU Autoconf 2.60
-+generated by GNU Autoconf 2.61
- 
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1646,7 +1664,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by gtkmm $as_me 2.12.1, which was
--generated by GNU Autoconf 2.60.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2118,7 +2136,7 @@
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- 	  if test $ac_prog = install &&
- 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
-@@ -2246,7 +2264,7 @@
-   test -z "$as_dir" && as_dir=.
-   for ac_prog in mkdir gmkdir; do
- 	 for ac_exec_ext in '' $ac_executable_extensions; do
--	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 	     'mkdir (GNU coreutils) '* | \
- 	     'mkdir (coreutils) '* | \
-@@ -2299,7 +2317,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2438,7 +2456,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2478,7 +2496,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2676,7 +2694,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2716,7 +2734,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2773,7 +2791,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2814,7 +2832,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -2872,7 +2890,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2916,7 +2934,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3057,7 +3075,7 @@
- # in a Makefile.  We should not override ac_cv_exeext if it was cached,
- # so that the user can short-circuit this test for compilers unknown to
- # Autoconf.
--for ac_file in $ac_files
-+for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
-@@ -3085,6 +3103,12 @@
- test "$ac_cv_exeext" = no && ac_cv_exeext=
- 
- else
-+  ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-@@ -3096,8 +3120,6 @@
- fi
- 
- ac_exeext=$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
-@@ -3275,27 +3297,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3350,27 +3355,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3405,27 +3393,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3461,27 +3432,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3597,27 +3551,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3876,17 +3813,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3920,17 +3850,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
-@@ -3995,17 +3918,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -4039,17 +3955,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
-@@ -4327,12 +4236,13 @@
+@@ -4235,12 +4236,13 @@
    test -z "$as_dir" && as_dir=.
    for lt_ac_prog in sed gsed; do
      for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15012,7 +14364,7 @@
  lt_ac_max=0
  lt_ac_count=0
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4367,6 +4277,7 @@
+@@ -4275,6 +4277,7 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -15020,25 +14372,7 @@
  { echo "$as_me:$LINENO: result: $SED" >&5
  echo "${ECHO_T}$SED" >&6; }
  
-@@ -4391,7 +4302,7 @@
-   for ac_prog in grep ggrep; do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
--    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-     # Check for GNU ac_path_GREP and select it if it is found.
-   # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
-@@ -4473,7 +4384,7 @@
-   for ac_prog in egrep; do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-     # Check for GNU ac_path_EGREP and select it if it is found.
-   # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
-@@ -4728,8 +4639,8 @@
+@@ -4636,8 +4639,8 @@
  echo "${ECHO_T}no, using $LN_S" >&6; }
  fi
  
@@ -15049,7 +14383,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4770,16 +4681,22 @@
+@@ -4678,16 +4681,22 @@
  
  mingw* | pw32*)
    # Base MSYS/MinGW do not provide the 'file' command needed by
@@ -15076,7 +14410,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -4817,7 +4734,7 @@
+@@ -4725,7 +4734,7 @@
    esac
    ;;
  
@@ -15085,7 +14419,7 @@
    # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
    ;;
-@@ -4833,11 +4750,11 @@
+@@ -4741,11 +4750,11 @@
    ;;
  
  # This must be Linux ELF.
@@ -15099,7 +14433,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -4867,6 +4784,10 @@
+@@ -4775,6 +4784,10 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -15110,16 +14444,16 @@
  solaris*)
    lt_cv_deplibs_check_method=pass_all
    ;;
-@@ -4954,7 +4875,7 @@
+@@ -4862,7 +4875,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4957 "configure"' > conftest.$ac_ext
+-  echo '#line 4865 "configure"' > conftest.$ac_ext
 +  echo '#line 4878 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -4989,7 +4910,8 @@
+@@ -4897,7 +4910,8 @@
    rm -rf conftest*
    ;;
  
@@ -15129,7 +14463,7 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5000,6 +4922,9 @@
+@@ -4908,6 +4922,9 @@
      case `/usr/bin/file conftest.o` in
      *32-bit*)
        case $host in
@@ -15139,7 +14473,7 @@
          x86_64-*linux*)
            LD="${LD-ld} -m elf_i386"
            ;;
-@@ -5016,6 +4941,9 @@
+@@ -4924,6 +4941,9 @@
        ;;
      *64-bit*)
        case $host in
@@ -15149,555 +14483,7 @@
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
            ;;
-@@ -5078,27 +5006,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_cc_needs_belf=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5107,7 +5019,7 @@
- 	lt_cv_cc_needs_belf=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5161,7 +5073,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5201,7 +5113,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5257,7 +5169,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AS="${ac_tool_prefix}as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5297,7 +5209,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AS="as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5353,7 +5265,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5393,7 +5305,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5477,27 +5389,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5673,27 +5568,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5756,27 +5634,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5812,17 +5673,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5914,7 +5768,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -5958,7 +5812,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  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_CXX="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6071,27 +5925,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6146,27 +5983,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6201,27 +6021,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6257,27 +6060,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6479,17 +6265,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6523,17 +6302,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
-@@ -6598,17 +6370,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6642,17 +6407,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
-@@ -6693,7 +6451,7 @@
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -6711,7 +6469,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6737,7 +6495,7 @@
- fi
- if test -z "$F77"; then
-   ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -6755,7 +6513,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  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_F77="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -6862,27 +6620,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6925,27 +6666,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_f77_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -7072,24 +6796,27 @@
+@@ -6776,24 +6796,27 @@
      fi
      ;;
    *)
@@ -15742,7 +14528,7 @@
      ;;
    esac
  
-@@ -7106,6 +6833,7 @@
+@@ -6810,6 +6833,7 @@
  
  
  
@@ -15750,7 +14536,7 @@
  # Check for command to grab the raw symbol name followed by C symbol from nm.
  { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
  echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -7143,7 +6871,7 @@
+@@ -6847,7 +6871,7 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -15759,61 +14545,7 @@
    if test "$host_cpu" = ia64; then
      symcode='[ABCDGIRSTW]'
      lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -7400,7 +7128,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AR="${ac_tool_prefix}ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7440,7 +7168,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AR="ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7496,7 +7224,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7536,7 +7264,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7592,7 +7320,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7632,7 +7360,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -7694,7 +7422,7 @@
+@@ -7398,7 +7422,7 @@
  test -z "$ac_objext" && ac_objext=o
  
  # Determine commands to create old-style static archives.
@@ -15822,7 +14554,7 @@
  old_postinstall_cmds='chmod 644 $oldlib'
  old_postuninstall_cmds=
  
-@@ -7894,10 +7622,10 @@
+@@ -7598,10 +7622,10 @@
  objext=$objext
  
  # Code to be used in simple compile tests
@@ -15835,7 +14567,7 @@
  
  
  # If no C compiler was specified, use CC.
-@@ -7912,13 +7640,13 @@
+@@ -7616,13 +7640,13 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -15851,7 +14583,7 @@
  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
  _lt_linker_boilerplate=`cat conftest.err`
  $rm conftest*
-@@ -7938,7 +7666,7 @@
+@@ -7642,7 +7666,7 @@
  else
    lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
@@ -15860,21 +14592,21 @@
     lt_compiler_flag="-fno-rtti -fno-exceptions"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -7949,11 +7677,11 @@
+@@ -7653,11 +7677,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7952: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7656: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:7680: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7956: \$? = $ac_status" >&5
+-   echo "$as_me:7660: \$? = $ac_status" >&5
 +   echo "$as_me:7684: \$? = $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.
-@@ -8004,13 +7732,15 @@
+@@ -7708,13 +7732,15 @@
        lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
  
@@ -15892,7 +14624,7 @@
        lt_prog_compiler_pic='-DDLL_EXPORT'
        ;;
  
-@@ -8020,7 +7750,7 @@
+@@ -7724,7 +7750,7 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -15901,7 +14633,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -8078,7 +7808,7 @@
+@@ -7782,7 +7808,7 @@
         esac
         ;;
  
@@ -15910,7 +14642,7 @@
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -8111,7 +7841,7 @@
+@@ -7815,7 +7841,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -15919,7 +14651,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl='-Wl,'
-@@ -8130,6 +7860,22 @@
+@@ -7834,6 +7860,22 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static='-non_shared'
          ;;
@@ -15942,7 +14674,7 @@
        esac
        ;;
  
-@@ -8139,6 +7885,10 @@
+@@ -7843,6 +7885,10 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -15953,7 +14685,7 @@
      solaris*)
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -8206,7 +7956,7 @@
+@@ -7910,7 +7956,7 @@
  else
    lt_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
@@ -15962,21 +14694,21 @@
     lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -8217,11 +7967,11 @@
+@@ -7921,11 +7967,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8220: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7924: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:7970: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:8224: \$? = $ac_status" >&5
+-   echo "$as_me:7928: \$? = $ac_status" >&5
 +   echo "$as_me:7974: \$? = $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.
-@@ -8270,7 +8020,7 @@
+@@ -7974,7 +8020,7 @@
    lt_prog_compiler_static_works=no
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -15985,7 +14717,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -8310,7 +8060,7 @@
+@@ -8014,7 +8060,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -15994,21 +14726,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -8321,11 +8071,11 @@
+@@ -8025,11 +8071,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8324: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8028: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8074: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:8328: \$? = $ac_status" >&5
+-   echo "$as_me:8032: \$? = $ac_status" >&5
 +   echo "$as_me:8078: \$? = $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
-@@ -8517,7 +8267,7 @@
+@@ -8221,7 +8267,7 @@
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -16017,7 +14749,7 @@
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8535,7 +8285,7 @@
+@@ -8239,7 +8285,7 @@
        fi
        ;;
  
@@ -16026,7 +14758,7 @@
        hardcode_direct=no
        hardcode_shlibpath_var=no
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8550,7 +8300,7 @@
+@@ -8254,7 +8300,7 @@
        archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -16035,7 +14767,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -8568,20 +8318,30 @@
+@@ -8272,20 +8318,30 @@
  	ifc* | ifort*)			# Intel Fortran compiler
  	  tmp_addflag=' -nofor_main' ;;
  	esac
@@ -16069,7 +14801,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -8733,7 +8493,7 @@
+@@ -8437,7 +8493,7 @@
    	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	  then
    	  # We have reworked collect2
@@ -16078,40 +14810,12 @@
  	  else
    	  # We have old collect2
    	  hardcode_direct=unsupported
-@@ -8801,33 +8561,24 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -8511,11 +8567,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (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_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -16129,49 +14833,12 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8835,7 +8586,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -8876,33 +8627,24 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -8570,11 +8633,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (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_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -16189,16 +14856,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8910,7 +8652,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -8956,7 +8698,7 @@
+@@ -8628,7 +8698,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
@@ -16207,7 +14865,7 @@
        fix_srcfile_path='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes=yes
        ;;
-@@ -8998,10 +8740,10 @@
+@@ -8670,10 +8740,10 @@
        case $cc_basename in
          xlc*)
           output_verbose_link_cmd='echo'
@@ -16220,7 +14878,7 @@
            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}'
            ;;
         *)
-@@ -9041,7 +8783,7 @@
+@@ -8713,7 +8783,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16229,7 +14887,7 @@
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -9143,7 +8885,7 @@
+@@ -8815,7 +8885,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -16238,7 +14896,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -9163,24 +8905,28 @@
+@@ -8835,24 +8905,28 @@
        ;;
  
      openbsd*)
@@ -16284,7 +14942,7 @@
        fi
        ;;
  
-@@ -9239,17 +8985,16 @@
+@@ -8911,17 +8985,16 @@
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
        *)
@@ -16311,7 +14969,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -9306,7 +9051,7 @@
+@@ -8978,7 +9051,7 @@
        fi
        ;;
  
@@ -16320,7 +14978,7 @@
        no_undefined_flag='${wl}-z,text'
        archive_cmds_need_lc=no
        hardcode_shlibpath_var=no
-@@ -9383,7 +9128,7 @@
+@@ -9055,7 +9128,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -16329,7 +14987,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -9441,17 +9186,55 @@
+@@ -9113,17 +9186,55 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16389,7 +15047,7 @@
  else
    sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  fi
-@@ -9611,12 +9394,8 @@
+@@ -9283,12 +9394,8 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16404,7 +15062,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -9633,18 +9412,6 @@
+@@ -9305,18 +9412,6 @@
    dynamic_linker=no
    ;;
  
@@ -16423,7 +15081,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -9682,7 +9449,7 @@
+@@ -9354,7 +9449,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -16432,7 +15090,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -9745,7 +9512,7 @@
+@@ -9417,7 +9512,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -16441,7 +15099,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -9800,7 +9567,7 @@
+@@ -9472,7 +9567,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -16450,7 +15108,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -9814,31 +9581,10 @@
+@@ -9486,31 +9581,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -16458,7 +15116,7 @@
 -  libsuff=
 -  case "$host_cpu" in
 -  x86_64*|s390x*|powerpc64*)
--    echo '#line 9821 "configure"' > conftest.$ac_ext
+-    echo '#line 9493 "configure"' > conftest.$ac_ext
 -    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -16484,7 +15142,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9850,7 +9596,7 @@
+@@ -9522,7 +9596,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -16493,7 +15151,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -9859,7 +9605,7 @@
+@@ -9531,7 +9605,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -16502,7 +15160,7 @@
    ;;
  
  netbsd*)
-@@ -9943,6 +9689,10 @@
+@@ -9615,6 +9689,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -16513,7 +15171,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -10096,6 +9846,7 @@
+@@ -9768,6 +9846,7 @@
     darwin*)
         if test -n "$STRIP" ; then
           striplib="$STRIP -x"
@@ -16521,319 +15179,25 @@
           { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
         else
-@@ -10179,27 +9930,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_lib_dl_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10208,7 +9943,7 @@
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -10290,27 +10025,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_func_shl_load=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10319,7 +10038,7 @@
- 	ac_cv_func_shl_load=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10369,27 +10088,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_lib_dld_shl_load=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10398,7 +10101,7 @@
- 	ac_cv_lib_dld_shl_load=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -10470,27 +10173,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_func_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10499,7 +10186,7 @@
- 	ac_cv_func_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10549,27 +10236,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_lib_dl_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10578,7 +10249,7 @@
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -10629,27 +10300,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_lib_svld_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10658,7 +10313,7 @@
- 	ac_cv_lib_svld_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -10709,27 +10364,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_lib_dld_dld_link=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10738,7 +10377,7 @@
- 	ac_cv_lib_dld_dld_link=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -10794,7 +10433,7 @@
+@@ -10354,7 +10433,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 10797 "configure"
+-#line 10357 "configure"
 +#line 10436 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10894,7 +10533,7 @@
+@@ -10454,7 +10533,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 10897 "configure"
+-#line 10457 "configure"
 +#line 10536 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11092,6 +10731,7 @@
+@@ -10652,6 +10731,7 @@
      module_cmds \
      module_expsym_cmds \
      lt_cv_prog_compiler_c_o \
@@ -16841,7 +15205,7 @@
      exclude_expsyms \
      include_expsyms; do
  
-@@ -11136,7 +10776,7 @@
+@@ -10696,7 +10776,7 @@
  # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
@@ -16850,7 +15214,7 @@
  # Free Software Foundation, Inc.
  #
  # This file is part of GNU Libtool:
-@@ -11460,7 +11100,7 @@
+@@ -11020,7 +11100,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -16859,7 +15223,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols
-@@ -11629,10 +11269,10 @@
+@@ -11189,10 +11269,10 @@
  objext_CXX=$objext
  
  # Code to be used in simple compile tests
@@ -16872,7 +15236,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -11648,13 +11288,13 @@
+@@ -11208,13 +11288,13 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -16888,7 +15252,7 @@
  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
  _lt_linker_boilerplate=`cat conftest.err`
  $rm conftest*
-@@ -11913,7 +11553,7 @@
+@@ -11473,7 +11553,7 @@
  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	then
  	  # We have reworked collect2
@@ -16897,40 +15261,12 @@
  	else
  	  # We have old collect2
  	  hardcode_direct_CXX=unsupported
-@@ -11981,33 +11621,24 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -11547,11 +11627,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+
 +lt_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -16948,81 +15284,12 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12015,7 +11646,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -12038,52 +11669,43 @@
- 
- 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); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
-+{
-+
-+  ;
-+  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_try") 2>&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); }; }; then
--
+@@ -11607,11 +11694,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+
 +lt_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -17040,16 +15307,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12091,7 +11713,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -12202,10 +11824,10 @@
+@@ -11730,10 +11824,10 @@
        case $cc_basename in
          xlc*)
           output_verbose_link_cmd='echo'
@@ -17062,7 +15320,7 @@
            module_expsym_cmds_CXX='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}'
            ;;
         *)
-@@ -12239,7 +11861,7 @@
+@@ -11767,7 +11861,7 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -17071,7 +15329,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12288,9 +11910,7 @@
+@@ -11816,9 +11910,7 @@
        hardcode_libdir_separator_CXX=:
  
        case $host_cpu in
@@ -17082,7 +15340,7 @@
        *)
  	export_dynamic_flag_spec_CXX='${wl}-E'
          ;;
-@@ -12358,7 +11978,7 @@
+@@ -11886,7 +11978,7 @@
  	;;
      esac
      ;;
@@ -17091,7 +15349,7 @@
      hardcode_direct_CXX=no
      hardcode_shlibpath_var_CXX=no
      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -12398,7 +12018,7 @@
+@@ -11926,7 +12018,7 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -17100,7 +15358,7 @@
      case $cc_basename in
        KCC*)
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12478,6 +12098,29 @@
+@@ -12006,6 +12098,29 @@
  	# dependencies.
  	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
  	;;
@@ -17130,7 +15388,7 @@
      esac
      ;;
    lynxos*)
-@@ -12500,7 +12143,7 @@
+@@ -12028,7 +12143,7 @@
  	;;
      esac
      ;;
@@ -17139,7 +15397,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -12516,16 +12159,20 @@
+@@ -12044,16 +12159,20 @@
      ld_shlibs_CXX=no
      ;;
    openbsd*)
@@ -17169,7 +15427,7 @@
      ;;
    osf3*)
      case $cc_basename in
-@@ -12687,15 +12334,10 @@
+@@ -12215,15 +12334,10 @@
  	case $host_os in
  	  solaris2.[0-5] | solaris2.[0-5].*) ;;
  	  *)
@@ -17188,7 +15446,7 @@
  	    ;;
  	esac
  	link_all_deplibs_CXX=yes
-@@ -12742,6 +12384,12 @@
+@@ -12270,6 +12384,12 @@
  	  fi
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -17201,7 +15459,7 @@
  	fi
  	;;
      esac
-@@ -12933,7 +12581,7 @@
+@@ -12461,7 +12581,7 @@
  
  # PORTME: override above test on systems where it is broken
  case $host_os in
@@ -17210,7 +15468,7 @@
    # Interix 3.5 installs completely hosed .la files for C++, so rather than
    # hack all around it, let's just trust "g++" to DTRT.
    predep_objects_CXX=
-@@ -12941,13 +12589,46 @@
+@@ -12469,13 +12589,46 @@
    postdeps_CXX=
    ;;
  
@@ -17258,7 +15516,7 @@
      ;;
    esac
    ;;
-@@ -12984,12 +12665,14 @@
+@@ -12512,12 +12665,14 @@
        # like `-m68040'.
        lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
        ;;
@@ -17275,7 +15533,7 @@
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
-@@ -13001,7 +12684,7 @@
+@@ -12529,7 +12684,7 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -17284,7 +15542,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -13067,7 +12750,7 @@
+@@ -12595,7 +12750,7 @@
  	    ;;
  	esac
  	;;
@@ -17293,7 +15551,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13110,7 +12793,7 @@
+@@ -12638,7 +12793,7 @@
  	    ;;
  	esac
  	;;
@@ -17302,7 +15560,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -13137,6 +12820,14 @@
+@@ -12665,6 +12820,14 @@
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    ;;
  	  *)
@@ -17317,7 +15575,7 @@
  	    ;;
  	esac
  	;;
-@@ -13153,7 +12844,7 @@
+@@ -12681,7 +12844,7 @@
  	    ;;
  	esac
  	;;
@@ -17326,7 +15584,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -13251,7 +12942,7 @@
+@@ -12779,7 +12942,7 @@
  else
    lt_prog_compiler_pic_works_CXX=no
    ac_outfile=conftest.$ac_objext
@@ -17335,21 +15593,21 @@
     lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -13262,11 +12953,11 @@
+@@ -12790,11 +12953,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13265: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12793: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:12956: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13269: \$? = $ac_status" >&5
+-   echo "$as_me:12797: \$? = $ac_status" >&5
 +   echo "$as_me:12960: \$? = $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.
-@@ -13315,7 +13006,7 @@
+@@ -12843,7 +13006,7 @@
    lt_prog_compiler_static_works_CXX=no
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17358,7 +15616,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -13355,7 +13046,7 @@
+@@ -12883,7 +13046,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -17367,21 +15625,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -13366,11 +13057,11 @@
+@@ -12894,11 +13057,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13369: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12897: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:13060: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13373: \$? = $ac_status" >&5
+-   echo "$as_me:12901: \$? = $ac_status" >&5
 +   echo "$as_me:13064: \$? = $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
-@@ -13436,7 +13127,10 @@
+@@ -12964,7 +13127,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -17393,7 +15651,7 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13467,7 +13161,7 @@
+@@ -12995,7 +13161,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -17402,7 +15660,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -13525,20 +13219,7 @@
+@@ -13053,20 +13219,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17424,7 +15682,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -13695,12 +13376,7 @@
+@@ -13223,12 +13376,7 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17438,7 +15696,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -13717,18 +13393,6 @@
+@@ -13245,18 +13393,6 @@
    dynamic_linker=no
    ;;
  
@@ -17457,7 +15715,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -13766,7 +13430,7 @@
+@@ -13294,7 +13430,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -17466,7 +15724,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -13829,7 +13493,7 @@
+@@ -13357,7 +13493,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -17475,7 +15733,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13884,7 +13548,7 @@
+@@ -13412,7 +13548,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -17484,7 +15742,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13898,31 +13562,10 @@
+@@ -13426,31 +13562,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -17492,7 +15750,7 @@
 -  libsuff=
 -  case "$host_cpu" in
 -  x86_64*|s390x*|powerpc64*)
--    echo '#line 13905 "configure"' > conftest.$ac_ext
+-    echo '#line 13433 "configure"' > conftest.$ac_ext
 -    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -17518,7 +15776,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -13934,7 +13577,7 @@
+@@ -13462,7 +13577,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -17527,7 +15785,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -13943,7 +13586,7 @@
+@@ -13471,7 +13586,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -17536,7 +15794,7 @@
    ;;
  
  netbsd*)
-@@ -14027,6 +13670,10 @@
+@@ -13555,6 +13670,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -17547,7 +15805,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14221,6 +13868,7 @@
+@@ -13749,6 +13868,7 @@
      module_cmds_CXX \
      module_expsym_cmds_CXX \
      lt_cv_prog_compiler_c_o_CXX \
@@ -17555,7 +15813,7 @@
      exclude_expsyms_CXX \
      include_expsyms_CXX; do
  
-@@ -14541,7 +14189,7 @@
+@@ -14069,7 +14189,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -17564,7 +15822,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_CXX
-@@ -14632,10 +14280,17 @@
+@@ -14160,10 +14280,17 @@
  objext_F77=$objext
  
  # Code to be used in simple compile tests
@@ -17584,7 +15842,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -14651,13 +14306,13 @@
+@@ -14179,13 +14306,13 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -17600,7 +15858,7 @@
  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
  _lt_linker_boilerplate=`cat conftest.err`
  $rm conftest*
-@@ -14744,13 +14399,15 @@
+@@ -14272,13 +14399,15 @@
        lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
        ;;
  
@@ -17618,7 +15876,7 @@
        lt_prog_compiler_pic_F77='-DDLL_EXPORT'
        ;;
  
-@@ -14760,7 +14417,7 @@
+@@ -14288,7 +14417,7 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -17627,7 +15885,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -14818,7 +14475,7 @@
+@@ -14346,7 +14475,7 @@
         esac
         ;;
  
@@ -17636,7 +15894,7 @@
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14851,7 +14508,7 @@
+@@ -14379,7 +14508,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -17645,7 +15903,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_F77='-Wl,'
-@@ -14870,6 +14527,22 @@
+@@ -14398,6 +14527,22 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static_F77='-non_shared'
          ;;
@@ -17668,7 +15926,7 @@
        esac
        ;;
  
-@@ -14879,6 +14552,10 @@
+@@ -14407,6 +14552,10 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -17679,7 +15937,7 @@
      solaris*)
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -14946,7 +14623,7 @@
+@@ -14474,7 +14623,7 @@
  else
    lt_prog_compiler_pic_works_F77=no
    ac_outfile=conftest.$ac_objext
@@ -17688,21 +15946,21 @@
     lt_compiler_flag="$lt_prog_compiler_pic_F77"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -14957,11 +14634,11 @@
+@@ -14485,11 +14634,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14960: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14488: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:14637: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14964: \$? = $ac_status" >&5
+-   echo "$as_me:14492: \$? = $ac_status" >&5
 +   echo "$as_me:14641: \$? = $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.
-@@ -15010,7 +14687,7 @@
+@@ -14538,7 +14687,7 @@
    lt_prog_compiler_static_works_F77=no
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -17711,7 +15969,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -15050,7 +14727,7 @@
+@@ -14578,7 +14727,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -17720,21 +15978,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -15061,11 +14738,11 @@
+@@ -14589,11 +14738,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15064: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14592: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:14741: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:15068: \$? = $ac_status" >&5
+-   echo "$as_me:14596: \$? = $ac_status" >&5
 +   echo "$as_me:14745: \$? = $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
-@@ -15257,7 +14934,7 @@
+@@ -14785,7 +14934,7 @@
        allow_undefined_flag_F77=unsupported
        always_export_symbols_F77=no
        enable_shared_with_static_runtimes_F77=yes
@@ -17743,7 +16001,7 @@
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -15275,7 +14952,7 @@
+@@ -14803,7 +14952,7 @@
        fi
        ;;
  
@@ -17752,7 +16010,7 @@
        hardcode_direct_F77=no
        hardcode_shlibpath_var_F77=no
        hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -15290,7 +14967,7 @@
+@@ -14818,7 +14967,7 @@
        archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -17761,7 +16019,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -15308,20 +14985,30 @@
+@@ -14836,20 +14985,30 @@
  	ifc* | ifort*)			# Intel Fortran compiler
  	  tmp_addflag=' -nofor_main' ;;
  	esac
@@ -17795,7 +16053,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -15473,7 +15160,7 @@
+@@ -15001,7 +15160,7 @@
    	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	  then
    	  # We have reworked collect2
@@ -17804,40 +16062,12 @@
  	  else
    	  # We have old collect2
    	  hardcode_direct_F77=unsupported
-@@ -15531,33 +15218,24 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -15065,11 +15224,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+
 +lt_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -17855,49 +16085,12 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15565,7 +15243,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -15596,33 +15274,24 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -15114,11 +15280,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (exit $ac_status); } && {
-+	 test -z "$ac_f77_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+
 +lt_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -17915,16 +16108,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15630,7 +15299,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -15676,7 +15345,7 @@
+@@ -15172,7 +15345,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_F77='true'
        # FIXME: Should let the user specify the lib program.
@@ -17933,7 +16117,7 @@
        fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes_F77=yes
        ;;
-@@ -15718,10 +15387,10 @@
+@@ -15214,10 +15387,10 @@
        case $cc_basename in
          xlc*)
           output_verbose_link_cmd='echo'
@@ -17946,7 +16130,7 @@
            module_expsym_cmds_F77='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}'
            ;;
         *)
-@@ -15761,7 +15430,7 @@
+@@ -15257,7 +15430,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17955,7 +16139,7 @@
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -15863,7 +15532,7 @@
+@@ -15359,7 +15532,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -17964,7 +16148,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -15883,24 +15552,28 @@
+@@ -15379,24 +15552,28 @@
        ;;
  
      openbsd*)
@@ -18010,7 +16194,7 @@
        fi
        ;;
  
-@@ -15959,17 +15632,16 @@
+@@ -15455,17 +15632,16 @@
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
        *)
@@ -18037,7 +16221,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -16026,7 +15698,7 @@
+@@ -15522,7 +15698,7 @@
        fi
        ;;
  
@@ -18046,7 +16230,7 @@
        no_undefined_flag_F77='${wl}-z,text'
        archive_cmds_need_lc_F77=no
        hardcode_shlibpath_var_F77=no
-@@ -16103,7 +15775,7 @@
+@@ -15599,7 +15775,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -18055,7 +16239,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -16161,20 +15833,7 @@
+@@ -15657,20 +15833,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18077,7 +16261,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -16331,12 +15990,7 @@
+@@ -15827,12 +15990,7 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18091,7 +16275,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -16353,18 +16007,6 @@
+@@ -15849,18 +16007,6 @@
    dynamic_linker=no
    ;;
  
@@ -18110,7 +16294,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -16402,7 +16044,7 @@
+@@ -15898,7 +16044,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -18119,7 +16303,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -16465,7 +16107,7 @@
+@@ -15961,7 +16107,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18128,7 +16312,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -16520,7 +16162,7 @@
+@@ -16016,7 +16162,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -18137,7 +16321,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -16534,31 +16176,10 @@
+@@ -16030,31 +16176,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -18145,7 +16329,7 @@
 -  libsuff=
 -  case "$host_cpu" in
 -  x86_64*|s390x*|powerpc64*)
--    echo '#line 16541 "configure"' > conftest.$ac_ext
+-    echo '#line 16037 "configure"' > conftest.$ac_ext
 -    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -18171,7 +16355,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16570,7 +16191,7 @@
+@@ -16066,7 +16191,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18180,7 +16364,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -16579,7 +16200,7 @@
+@@ -16075,7 +16200,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -18189,7 +16373,7 @@
    ;;
  
  netbsd*)
-@@ -16663,6 +16284,10 @@
+@@ -16159,6 +16284,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18200,7 +16384,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -16857,6 +16482,7 @@
+@@ -16353,6 +16482,7 @@
      module_cmds_F77 \
      module_expsym_cmds_F77 \
      lt_cv_prog_compiler_c_o_F77 \
@@ -18208,7 +16392,7 @@
      exclude_expsyms_F77 \
      include_expsyms_F77; do
  
-@@ -17177,7 +16803,7 @@
+@@ -16673,7 +16803,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -18217,7 +16401,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_F77
-@@ -17235,10 +16861,10 @@
+@@ -16731,10 +16861,10 @@
  objext_GCJ=$objext
  
  # Code to be used in simple compile tests
@@ -18230,7 +16414,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -17254,13 +16880,13 @@
+@@ -16750,13 +16880,13 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -18246,7 +16430,7 @@
  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
  _lt_linker_boilerplate=`cat conftest.err`
  $rm conftest*
-@@ -17301,7 +16927,7 @@
+@@ -16797,7 +16927,7 @@
  else
    lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
@@ -18255,21 +16439,21 @@
     lt_compiler_flag="-fno-rtti -fno-exceptions"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -17312,11 +16938,11 @@
+@@ -16808,11 +16938,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17315: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16811: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:16941: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:17319: \$? = $ac_status" >&5
+-   echo "$as_me:16815: \$? = $ac_status" >&5
 +   echo "$as_me:16945: \$? = $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.
-@@ -17367,13 +16993,15 @@
+@@ -16863,13 +16993,15 @@
        lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
        ;;
  
@@ -18287,7 +16471,7 @@
        lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
        ;;
  
-@@ -17383,7 +17011,7 @@
+@@ -16879,7 +17011,7 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -18296,7 +16480,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -17441,7 +17069,7 @@
+@@ -16937,7 +17069,7 @@
         esac
         ;;
  
@@ -18305,7 +16489,7 @@
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -17474,7 +17102,7 @@
+@@ -16970,7 +17102,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -18314,7 +16498,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17493,6 +17121,22 @@
+@@ -16989,6 +17121,22 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static_GCJ='-non_shared'
          ;;
@@ -18337,7 +16521,7 @@
        esac
        ;;
  
-@@ -17502,6 +17146,10 @@
+@@ -16998,6 +17146,10 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -18348,7 +16532,7 @@
      solaris*)
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -17569,7 +17217,7 @@
+@@ -17065,7 +17217,7 @@
  else
    lt_prog_compiler_pic_works_GCJ=no
    ac_outfile=conftest.$ac_objext
@@ -18357,21 +16541,21 @@
     lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -17580,11 +17228,11 @@
+@@ -17076,11 +17228,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17583: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:17079: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17231: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:17587: \$? = $ac_status" >&5
+-   echo "$as_me:17083: \$? = $ac_status" >&5
 +   echo "$as_me:17235: \$? = $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.
-@@ -17633,7 +17281,7 @@
+@@ -17129,7 +17281,7 @@
    lt_prog_compiler_static_works_GCJ=no
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -18380,7 +16564,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -17673,7 +17321,7 @@
+@@ -17169,7 +17321,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -18389,21 +16573,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -17684,11 +17332,11 @@
+@@ -17180,11 +17332,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17687: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:17183: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17335: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:17691: \$? = $ac_status" >&5
+-   echo "$as_me:17187: \$? = $ac_status" >&5
 +   echo "$as_me:17339: \$? = $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
-@@ -17880,7 +17528,7 @@
+@@ -17376,7 +17528,7 @@
        allow_undefined_flag_GCJ=unsupported
        always_export_symbols_GCJ=no
        enable_shared_with_static_runtimes_GCJ=yes
@@ -18412,7 +16596,7 @@
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -17898,7 +17546,7 @@
+@@ -17394,7 +17546,7 @@
        fi
        ;;
  
@@ -18421,7 +16605,7 @@
        hardcode_direct_GCJ=no
        hardcode_shlibpath_var_GCJ=no
        hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17913,7 +17561,7 @@
+@@ -17409,7 +17561,7 @@
        archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -18430,7 +16614,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -17931,20 +17579,30 @@
+@@ -17427,20 +17579,30 @@
  	ifc* | ifort*)			# Intel Fortran compiler
  	  tmp_addflag=' -nofor_main' ;;
  	esac
@@ -18464,7 +16648,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -18096,7 +17754,7 @@
+@@ -17592,7 +17754,7 @@
    	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	  then
    	  # We have reworked collect2
@@ -18473,40 +16657,12 @@
  	  else
    	  # We have old collect2
    	  hardcode_direct_GCJ=unsupported
-@@ -18164,33 +17822,24 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -17666,11 +17828,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  (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_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -18524,53 +16680,12 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18198,7 +17847,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -18237,35 +17886,26 @@
-   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); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
+@@ -17725,11 +17894,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
-+  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_aix_libpath_sed='
 +    /Import File Strings/,/^$/ {
 +	/^0/ {
@@ -18588,16 +16703,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18273,7 +17913,7 @@
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-@@ -18319,7 +17959,7 @@
+@@ -17783,7 +17959,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_GCJ='true'
        # FIXME: Should let the user specify the lib program.
@@ -18606,7 +16712,7 @@
        fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes_GCJ=yes
        ;;
-@@ -18361,10 +18001,10 @@
+@@ -17825,10 +18001,10 @@
        case $cc_basename in
          xlc*)
           output_verbose_link_cmd='echo'
@@ -18619,7 +16725,7 @@
            module_expsym_cmds_GCJ='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}'
            ;;
         *)
-@@ -18404,7 +18044,7 @@
+@@ -17868,7 +18044,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18628,7 +16734,7 @@
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -18506,7 +18146,7 @@
+@@ -17970,7 +18146,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -18637,7 +16743,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -18526,24 +18166,28 @@
+@@ -17990,24 +18166,28 @@
        ;;
  
      openbsd*)
@@ -18683,7 +16789,7 @@
        fi
        ;;
  
-@@ -18602,17 +18246,16 @@
+@@ -18066,17 +18246,16 @@
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
        *)
@@ -18710,7 +16816,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -18669,7 +18312,7 @@
+@@ -18133,7 +18312,7 @@
        fi
        ;;
  
@@ -18719,7 +16825,7 @@
        no_undefined_flag_GCJ='${wl}-z,text'
        archive_cmds_need_lc_GCJ=no
        hardcode_shlibpath_var_GCJ=no
-@@ -18746,7 +18389,7 @@
+@@ -18210,7 +18389,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -18728,7 +16834,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -18804,20 +18447,7 @@
+@@ -18268,20 +18447,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18750,7 +16856,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -18974,12 +18604,7 @@
+@@ -18438,12 +18604,7 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18764,7 +16870,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -18996,18 +18621,6 @@
+@@ -18460,18 +18621,6 @@
    dynamic_linker=no
    ;;
  
@@ -18783,7 +16889,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -19045,7 +18658,7 @@
+@@ -18509,7 +18658,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -18792,7 +16898,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19108,7 +18721,7 @@
+@@ -18572,7 +18721,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18801,7 +16907,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19163,7 +18776,7 @@
+@@ -18627,7 +18776,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -18810,7 +16916,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19177,31 +18790,10 @@
+@@ -18641,31 +18790,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -18818,7 +16924,7 @@
 -  libsuff=
 -  case "$host_cpu" in
 -  x86_64*|s390x*|powerpc64*)
--    echo '#line 19184 "configure"' > conftest.$ac_ext
+-    echo '#line 18648 "configure"' > conftest.$ac_ext
 -    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -18844,7 +16950,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19213,7 +18805,7 @@
+@@ -18677,7 +18805,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18853,7 +16959,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19222,7 +18814,7 @@
+@@ -18686,7 +18814,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -18862,7 +16968,7 @@
    ;;
  
  netbsd*)
-@@ -19306,6 +18898,10 @@
+@@ -18770,6 +18898,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18873,7 +16979,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -19500,6 +19096,7 @@
+@@ -18964,6 +19096,7 @@
      module_cmds_GCJ \
      module_expsym_cmds_GCJ \
      lt_cv_prog_compiler_c_o_GCJ \
@@ -18881,7 +16987,7 @@
      exclude_expsyms_GCJ \
      include_expsyms_GCJ; do
  
-@@ -19820,7 +19417,7 @@
+@@ -19284,7 +19417,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -18890,7 +16996,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_GCJ
-@@ -19877,7 +19474,7 @@
+@@ -19341,7 +19474,7 @@
  objext_RC=$objext
  
  # Code to be used in simple compile tests
@@ -18899,7 +17005,7 @@
  
  # Code to be used in simple link tests
  lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19896,13 +19493,13 @@
+@@ -19360,13 +19493,13 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -18915,7 +17021,7 @@
  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
  _lt_linker_boilerplate=`cat conftest.err`
  $rm conftest*
-@@ -19980,6 +19577,7 @@
+@@ -19444,6 +19577,7 @@
      module_cmds_RC \
      module_expsym_cmds_RC \
      lt_cv_prog_compiler_c_o_RC \
@@ -18923,7 +17029,7 @@
      exclude_expsyms_RC \
      include_expsyms_RC; do
  
-@@ -20300,7 +19898,7 @@
+@@ -19764,7 +19898,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -18932,325 +17038,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_RC
-@@ -20419,7 +20017,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_M4="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -20509,7 +20107,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PERL_PATH="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -20641,27 +20239,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (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_func_mkfifo=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -20670,7 +20252,7 @@
- 	ac_cv_func_mkfifo=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_mkfifo" >&5
-@@ -20722,27 +20304,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -20792,27 +20358,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -20835,11 +20385,11 @@
- echo "${ECHO_T}not available" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
- { echo "$as_me:$LINENO: checking for funlockfile" >&5
-@@ -20874,27 +20424,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -20944,27 +20478,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -20987,11 +20505,11 @@
- echo "${ECHO_T}not available" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
- { echo "$as_me:$LINENO: checking for getc_unlocked" >&5
-@@ -21026,27 +20544,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -21096,27 +20598,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
- 
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -21139,11 +20625,11 @@
- echo "${ECHO_T}not available" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -21189,7 +20675,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -21232,7 +20718,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -21378,7 +20864,7 @@
+@@ -20730,7 +20864,7 @@
  and ATKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19259,7 +17047,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21388,7 +20874,7 @@
+@@ -20740,7 +20874,7 @@
  and ATKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19268,7 +17056,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21492,7 +20978,7 @@
+@@ -20844,7 +20978,7 @@
  and PANGOMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19277,7 +17065,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21502,7 +20988,7 @@
+@@ -20854,7 +20988,7 @@
  and PANGOMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19286,7 +17074,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21607,7 +21093,7 @@
+@@ -20959,7 +21093,7 @@
  and GDKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19295,7 +17083,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21617,7 +21103,7 @@
+@@ -20969,7 +21103,7 @@
  and GDKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19304,7 +17092,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21724,7 +21210,7 @@
+@@ -21076,7 +21210,7 @@
  and GTKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19313,7 +17101,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21734,7 +21220,7 @@
+@@ -21086,7 +21220,7 @@
  and GTKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19322,7 +17110,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21836,7 +21322,7 @@
+@@ -21188,7 +21322,7 @@
  and GTKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19331,7 +17119,7 @@
  See \`config.log' for more details." >&5
  echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21846,7 +21332,7 @@
+@@ -21198,7 +21332,7 @@
  and GTKMM_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
@@ -19340,247 +17128,7 @@
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
-@@ -21966,7 +21452,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -22010,7 +21496,7 @@
-   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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  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_CXX="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -22123,27 +21609,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -22198,27 +21667,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -22253,27 +21705,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -22309,27 +21744,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -22967,7 +22385,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -22976,10 +22395,13 @@
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
- 
- 
- # PATH needs CR
-@@ -23203,19 +22625,28 @@
-   as_mkdir_p=false
- fi
- 
--# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
--# systems may use methods other than mode bits to determine executability.
--cat >conf$$.file <<_ASEOF
--#! /bin/sh
--exit 0
--_ASEOF
--chmod +x conf$$.file
--if test -x conf$$.file >/dev/null 2>&1; then
--  as_executable_p="test -x"
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
- else
--  as_executable_p=:
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
- fi
--rm -f conf$$.file
-+as_executable_p=$as_test_x
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -23231,7 +22662,7 @@
- # values after options handling.
- ac_log="
- This file was extended by gtkmm $as_me 2.12.1, which was
--generated by GNU Autoconf 2.60.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -23260,7 +22691,7 @@
- Usage: $0 [OPTIONS] [FILE]...
- 
-   -h, --help       print this help, then exit
--  -V, --version    print version number, then exit
-+  -V, --version    print version number and configuration settings, then exit
-   -q, --quiet      do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
-@@ -23284,7 +22715,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- gtkmm config.status 2.12.1
--configured by $0, generated by GNU Autoconf 2.60,
-+configured by $0, generated by GNU Autoconf 2.61,
-   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -23778,6 +23209,7 @@
+@@ -23095,6 +23229,7 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -19588,7 +17136,7 @@
  GREP!$GREP$ac_delim
  EGREP!$EGREP$ac_delim
  LN_S!$LN_S$ac_delim
-@@ -23828,7 +23260,7 @@
+@@ -23145,7 +23280,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -19597,9 +17145,9 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Naur gtkmm-2.12.1.orig/demos/gtk-demo/Makefile.in gtkmm-2.12.1/demos/gtk-demo/Makefile.in
---- gtkmm-2.12.1.orig/demos/gtk-demo/Makefile.in	2007-10-05 16:14:09.000000000 +0800
-+++ gtkmm-2.12.1/demos/gtk-demo/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/demos/gtk-demo/Makefile.in gtkmm-2.12.2/demos/gtk-demo/Makefile.in
+--- gtkmm-2.12.2.orig/demos/gtk-demo/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/demos/gtk-demo/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -178,6 +178,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19608,9 +17156,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/demos/Makefile.in gtkmm-2.12.1/demos/Makefile.in
---- gtkmm-2.12.1.orig/demos/Makefile.in	2007-10-05 16:14:09.000000000 +0800
-+++ gtkmm-2.12.1/demos/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/demos/Makefile.in gtkmm-2.12.2/demos/Makefile.in
+--- gtkmm-2.12.2.orig/demos/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/demos/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -166,6 +166,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19619,9 +17167,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/FAQ/Makefile.in gtkmm-2.12.1/docs/FAQ/Makefile.in
---- gtkmm-2.12.1.orig/docs/FAQ/Makefile.in	2007-10-05 16:14:10.000000000 +0800
-+++ gtkmm-2.12.1/docs/FAQ/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/FAQ/Makefile.in gtkmm-2.12.2/docs/FAQ/Makefile.in
+--- gtkmm-2.12.2.orig/docs/FAQ/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/docs/FAQ/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -130,6 +130,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19630,9 +17178,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/images/Makefile.in gtkmm-2.12.1/docs/images/Makefile.in
---- gtkmm-2.12.1.orig/docs/images/Makefile.in	2007-10-05 16:14:10.000000000 +0800
-+++ gtkmm-2.12.1/docs/images/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/images/Makefile.in gtkmm-2.12.2/docs/images/Makefile.in
+--- gtkmm-2.12.2.orig/docs/images/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/docs/images/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19641,9 +17189,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/Makefile.in gtkmm-2.12.1/docs/Makefile.in
---- gtkmm-2.12.1.orig/docs/Makefile.in	2007-10-05 16:14:10.000000000 +0800
-+++ gtkmm-2.12.1/docs/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/Makefile.in gtkmm-2.12.2/docs/Makefile.in
+--- gtkmm-2.12.2.orig/docs/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/docs/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -152,6 +152,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19652,9 +17200,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/reference/Makefile.in gtkmm-2.12.1/docs/reference/Makefile.in
---- gtkmm-2.12.1.orig/docs/reference/Makefile.in	2007-10-05 16:14:10.000000000 +0800
-+++ gtkmm-2.12.1/docs/reference/Makefile.in	2007-10-16 20:05:21.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/reference/Makefile.in gtkmm-2.12.2/docs/reference/Makefile.in
+--- gtkmm-2.12.2.orig/docs/reference/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/docs/reference/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -131,6 +131,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19663,9 +17211,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/tutorial/figures/Makefile.in gtkmm-2.12.1/docs/tutorial/figures/Makefile.in
---- gtkmm-2.12.1.orig/docs/tutorial/figures/Makefile.in	2007-10-05 16:14:10.000000000 +0800
-+++ gtkmm-2.12.1/docs/tutorial/figures/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/tutorial/figures/Makefile.in gtkmm-2.12.2/docs/tutorial/figures/Makefile.in
+--- gtkmm-2.12.2.orig/docs/tutorial/figures/Makefile.in	2007-11-05 17:08:41.000000000 +0800
++++ gtkmm-2.12.2/docs/tutorial/figures/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19674,9 +17222,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/tutorial/icons/Makefile.in gtkmm-2.12.1/docs/tutorial/icons/Makefile.in
---- gtkmm-2.12.1.orig/docs/tutorial/icons/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/docs/tutorial/icons/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/tutorial/icons/Makefile.in gtkmm-2.12.2/docs/tutorial/icons/Makefile.in
+--- gtkmm-2.12.2.orig/docs/tutorial/icons/Makefile.in	2007-11-05 17:08:41.000000000 +0800
++++ gtkmm-2.12.2/docs/tutorial/icons/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19685,9 +17233,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/docs/tutorial/Makefile.in gtkmm-2.12.1/docs/tutorial/Makefile.in
---- gtkmm-2.12.1.orig/docs/tutorial/Makefile.in	2007-10-05 16:14:10.000000000 +0800
-+++ gtkmm-2.12.1/docs/tutorial/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/docs/tutorial/Makefile.in gtkmm-2.12.2/docs/tutorial/Makefile.in
+--- gtkmm-2.12.2.orig/docs/tutorial/Makefile.in	2007-11-05 17:08:40.000000000 +0800
++++ gtkmm-2.12.2/docs/tutorial/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -142,6 +142,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19696,9 +17244,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/arrow/Makefile.in gtkmm-2.12.1/examples/arrow/Makefile.in
---- gtkmm-2.12.1.orig/examples/arrow/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/examples/arrow/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/arrow/Makefile.in gtkmm-2.12.2/examples/arrow/Makefile.in
+--- gtkmm-2.12.2.orig/examples/arrow/Makefile.in	2007-11-05 17:08:41.000000000 +0800
++++ gtkmm-2.12.2/examples/arrow/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -154,6 +154,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19707,9 +17255,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/base/Makefile.in gtkmm-2.12.1/examples/base/Makefile.in
---- gtkmm-2.12.1.orig/examples/base/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/examples/base/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/base/Makefile.in gtkmm-2.12.2/examples/base/Makefile.in
+--- gtkmm-2.12.2.orig/examples/base/Makefile.in	2007-11-05 17:08:41.000000000 +0800
++++ gtkmm-2.12.2/examples/base/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19718,9 +17266,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/alignment/Makefile.in gtkmm-2.12.1/examples/book/alignment/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/alignment/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/alignment/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/alignment/Makefile.in gtkmm-2.12.2/examples/book/alignment/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/alignment/Makefile.in	2007-11-05 17:08:42.000000000 +0800
++++ gtkmm-2.12.2/examples/book/alignment/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19729,9 +17277,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/aspectframe/Makefile.in gtkmm-2.12.1/examples/book/aspectframe/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/aspectframe/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/aspectframe/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/aspectframe/Makefile.in gtkmm-2.12.2/examples/book/aspectframe/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/aspectframe/Makefile.in	2007-11-05 17:08:42.000000000 +0800
++++ gtkmm-2.12.2/examples/book/aspectframe/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19740,9 +17288,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/box/Makefile.in gtkmm-2.12.1/examples/book/box/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/box/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/box/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/box/Makefile.in gtkmm-2.12.2/examples/book/box/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/box/Makefile.in	2007-11-05 17:08:42.000000000 +0800
++++ gtkmm-2.12.2/examples/book/box/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19751,9 +17299,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/builder/basic/Makefile.in gtkmm-2.12.1/examples/book/builder/basic/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/builder/basic/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/builder/basic/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/builder/basic/Makefile.in gtkmm-2.12.2/examples/book/builder/basic/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/builder/basic/Makefile.in	2007-11-05 17:08:43.000000000 +0800
++++ gtkmm-2.12.2/examples/book/builder/basic/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19762,9 +17310,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/builder/derived/Makefile.in gtkmm-2.12.1/examples/book/builder/derived/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/builder/derived/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/builder/derived/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/builder/derived/Makefile.in gtkmm-2.12.2/examples/book/builder/derived/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/builder/derived/Makefile.in	2007-11-05 17:08:43.000000000 +0800
++++ gtkmm-2.12.2/examples/book/builder/derived/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19773,9 +17321,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/builder/Makefile.in gtkmm-2.12.1/examples/book/builder/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/builder/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/builder/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/builder/Makefile.in gtkmm-2.12.2/examples/book/builder/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/builder/Makefile.in	2007-11-05 17:08:42.000000000 +0800
++++ gtkmm-2.12.2/examples/book/builder/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19784,9 +17332,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttonbox/Makefile.in gtkmm-2.12.1/examples/book/buttonbox/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttonbox/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttonbox/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttonbox/Makefile.in gtkmm-2.12.2/examples/book/buttonbox/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttonbox/Makefile.in	2007-11-05 17:08:43.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttonbox/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19795,9 +17343,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttons/button/Makefile.in gtkmm-2.12.1/examples/book/buttons/button/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttons/button/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttons/button/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttons/button/Makefile.in gtkmm-2.12.2/examples/book/buttons/button/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttons/button/Makefile.in	2007-11-05 17:08:44.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttons/button/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19806,9 +17354,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttons/checkbutton/Makefile.in gtkmm-2.12.1/examples/book/buttons/checkbutton/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttons/checkbutton/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttons/checkbutton/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttons/checkbutton/Makefile.in gtkmm-2.12.2/examples/book/buttons/checkbutton/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttons/checkbutton/Makefile.in	2007-11-05 17:08:44.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttons/checkbutton/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19817,9 +17365,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttons/filechooserbutton/Makefile.in gtkmm-2.12.1/examples/book/buttons/filechooserbutton/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttons/filechooserbutton/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttons/filechooserbutton/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttons/filechooserbutton/Makefile.in gtkmm-2.12.2/examples/book/buttons/filechooserbutton/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttons/filechooserbutton/Makefile.in	2007-11-05 17:08:44.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttons/filechooserbutton/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19828,9 +17376,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttons/Makefile.in gtkmm-2.12.1/examples/book/buttons/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttons/Makefile.in	2007-10-05 16:14:12.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttons/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttons/Makefile.in gtkmm-2.12.2/examples/book/buttons/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttons/Makefile.in	2007-11-05 17:08:43.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttons/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19839,9 +17387,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttons/radiobutton/Makefile.in gtkmm-2.12.1/examples/book/buttons/radiobutton/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttons/radiobutton/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttons/radiobutton/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttons/radiobutton/Makefile.in gtkmm-2.12.2/examples/book/buttons/radiobutton/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttons/radiobutton/Makefile.in	2007-11-05 17:08:45.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttons/radiobutton/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19850,9 +17398,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/buttons/togglebutton/Makefile.in gtkmm-2.12.1/examples/book/buttons/togglebutton/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/buttons/togglebutton/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/buttons/togglebutton/Makefile.in	2007-10-16 20:05:23.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/buttons/togglebutton/Makefile.in gtkmm-2.12.2/examples/book/buttons/togglebutton/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/buttons/togglebutton/Makefile.in	2007-11-05 17:08:45.000000000 +0800
++++ gtkmm-2.12.2/examples/book/buttons/togglebutton/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19861,9 +17409,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/clipboard/ideal/Makefile.in gtkmm-2.12.1/examples/book/clipboard/ideal/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/clipboard/ideal/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/clipboard/ideal/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/clipboard/ideal/Makefile.in gtkmm-2.12.2/examples/book/clipboard/ideal/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/clipboard/ideal/Makefile.in	2007-11-05 17:08:45.000000000 +0800
++++ gtkmm-2.12.2/examples/book/clipboard/ideal/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19872,9 +17420,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/clipboard/Makefile.in gtkmm-2.12.1/examples/book/clipboard/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/clipboard/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/clipboard/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/clipboard/Makefile.in gtkmm-2.12.2/examples/book/clipboard/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/clipboard/Makefile.in	2007-11-05 17:08:45.000000000 +0800
++++ gtkmm-2.12.2/examples/book/clipboard/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19883,9 +17431,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/clipboard/simple/Makefile.in gtkmm-2.12.1/examples/book/clipboard/simple/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/clipboard/simple/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/clipboard/simple/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/clipboard/simple/Makefile.in gtkmm-2.12.2/examples/book/clipboard/simple/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/clipboard/simple/Makefile.in	2007-11-05 17:08:46.000000000 +0800
++++ gtkmm-2.12.2/examples/book/clipboard/simple/Makefile.in	2007-11-05 20:58:41.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19894,9 +17442,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/combobox/complex/Makefile.in gtkmm-2.12.1/examples/book/combobox/complex/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/combobox/complex/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/combobox/complex/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/combobox/complex/Makefile.in gtkmm-2.12.2/examples/book/combobox/complex/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/combobox/complex/Makefile.in	2007-11-05 17:08:46.000000000 +0800
++++ gtkmm-2.12.2/examples/book/combobox/complex/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19905,9 +17453,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/combobox/Makefile.in gtkmm-2.12.1/examples/book/combobox/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/combobox/Makefile.in	2007-10-05 16:14:13.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/combobox/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/combobox/Makefile.in gtkmm-2.12.2/examples/book/combobox/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/combobox/Makefile.in	2007-11-05 17:08:46.000000000 +0800
++++ gtkmm-2.12.2/examples/book/combobox/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19916,9 +17464,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/combobox/text/Makefile.in gtkmm-2.12.1/examples/book/combobox/text/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/combobox/text/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/combobox/text/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/combobox/text/Makefile.in gtkmm-2.12.2/examples/book/combobox/text/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/combobox/text/Makefile.in	2007-11-05 17:08:46.000000000 +0800
++++ gtkmm-2.12.2/examples/book/combobox/text/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19927,9 +17475,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/comboboxentry/complex/Makefile.in gtkmm-2.12.1/examples/book/comboboxentry/complex/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/comboboxentry/complex/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/comboboxentry/complex/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/comboboxentry/complex/Makefile.in gtkmm-2.12.2/examples/book/comboboxentry/complex/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/comboboxentry/complex/Makefile.in	2007-11-05 17:08:47.000000000 +0800
++++ gtkmm-2.12.2/examples/book/comboboxentry/complex/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19938,9 +17486,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/comboboxentry/Makefile.in gtkmm-2.12.1/examples/book/comboboxentry/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/comboboxentry/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/comboboxentry/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/comboboxentry/Makefile.in gtkmm-2.12.2/examples/book/comboboxentry/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/comboboxentry/Makefile.in	2007-11-05 17:08:46.000000000 +0800
++++ gtkmm-2.12.2/examples/book/comboboxentry/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19949,9 +17497,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/comboboxentry/text/Makefile.in gtkmm-2.12.1/examples/book/comboboxentry/text/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/comboboxentry/text/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/comboboxentry/text/Makefile.in	2007-10-16 20:05:24.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/comboboxentry/text/Makefile.in gtkmm-2.12.2/examples/book/comboboxentry/text/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/comboboxentry/text/Makefile.in	2007-11-05 17:08:47.000000000 +0800
++++ gtkmm-2.12.2/examples/book/comboboxentry/text/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19960,9 +17508,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/custom/custom_container/Makefile.in gtkmm-2.12.1/examples/book/custom/custom_container/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/custom/custom_container/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/custom/custom_container/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/custom/custom_container/Makefile.in gtkmm-2.12.2/examples/book/custom/custom_container/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/custom/custom_container/Makefile.in	2007-11-05 17:08:47.000000000 +0800
++++ gtkmm-2.12.2/examples/book/custom/custom_container/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19971,9 +17519,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/custom/custom_widget/Makefile.in gtkmm-2.12.1/examples/book/custom/custom_widget/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/custom/custom_widget/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/custom/custom_widget/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/custom/custom_widget/Makefile.in gtkmm-2.12.2/examples/book/custom/custom_widget/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/custom/custom_widget/Makefile.in	2007-11-05 17:08:48.000000000 +0800
++++ gtkmm-2.12.2/examples/book/custom/custom_widget/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19982,9 +17530,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/custom/Makefile.in gtkmm-2.12.1/examples/book/custom/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/custom/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/custom/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/custom/Makefile.in gtkmm-2.12.2/examples/book/custom/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/custom/Makefile.in	2007-11-05 17:08:47.000000000 +0800
++++ gtkmm-2.12.2/examples/book/custom/Makefile.in	2007-11-05 20:58:42.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -19993,9 +17541,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/aboutdialog/Makefile.in gtkmm-2.12.1/examples/book/dialogs/aboutdialog/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/aboutdialog/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/aboutdialog/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/aboutdialog/Makefile.in gtkmm-2.12.2/examples/book/dialogs/aboutdialog/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/aboutdialog/Makefile.in	2007-11-05 17:08:48.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/aboutdialog/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20004,9 +17552,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/colorselectiondialog/Makefile.in gtkmm-2.12.1/examples/book/dialogs/colorselectiondialog/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/colorselectiondialog/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/colorselectiondialog/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/colorselectiondialog/Makefile.in gtkmm-2.12.2/examples/book/dialogs/colorselectiondialog/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/colorselectiondialog/Makefile.in	2007-11-05 17:08:48.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/colorselectiondialog/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20015,9 +17563,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/filechooserdialog/Makefile.in gtkmm-2.12.1/examples/book/dialogs/filechooserdialog/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/filechooserdialog/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/filechooserdialog/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/filechooserdialog/Makefile.in gtkmm-2.12.2/examples/book/dialogs/filechooserdialog/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/filechooserdialog/Makefile.in	2007-11-05 17:08:48.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/filechooserdialog/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20026,9 +17574,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/fileselection/Makefile.in gtkmm-2.12.1/examples/book/dialogs/fileselection/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/fileselection/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/fileselection/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/fileselection/Makefile.in gtkmm-2.12.2/examples/book/dialogs/fileselection/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/fileselection/Makefile.in	2007-11-05 17:08:48.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/fileselection/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20037,9 +17585,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/fontselectiondialog/Makefile.in gtkmm-2.12.1/examples/book/dialogs/fontselectiondialog/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/fontselectiondialog/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/fontselectiondialog/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/fontselectiondialog/Makefile.in gtkmm-2.12.2/examples/book/dialogs/fontselectiondialog/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/fontselectiondialog/Makefile.in	2007-11-05 17:08:49.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/fontselectiondialog/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20048,9 +17596,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/Makefile.in gtkmm-2.12.1/examples/book/dialogs/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/Makefile.in	2007-10-05 16:14:14.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/Makefile.in	2007-10-16 20:05:25.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/Makefile.in gtkmm-2.12.2/examples/book/dialogs/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/Makefile.in	2007-11-05 17:08:48.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20059,9 +17607,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/messagedialog/Makefile.in gtkmm-2.12.1/examples/book/dialogs/messagedialog/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/messagedialog/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/messagedialog/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/messagedialog/Makefile.in gtkmm-2.12.2/examples/book/dialogs/messagedialog/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/messagedialog/Makefile.in	2007-11-05 17:08:49.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/messagedialog/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20070,9 +17618,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/dialogs/simple/Makefile.in gtkmm-2.12.1/examples/book/dialogs/simple/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/dialogs/simple/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/dialogs/simple/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/dialogs/simple/Makefile.in gtkmm-2.12.2/examples/book/dialogs/simple/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/dialogs/simple/Makefile.in	2007-11-05 17:08:49.000000000 +0800
++++ gtkmm-2.12.2/examples/book/dialogs/simple/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20081,9 +17629,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drag_and_drop/Makefile.in gtkmm-2.12.1/examples/book/drag_and_drop/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drag_and_drop/Makefile.in	2007-10-05 16:14:15.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drag_and_drop/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drag_and_drop/Makefile.in gtkmm-2.12.2/examples/book/drag_and_drop/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drag_and_drop/Makefile.in	2007-11-05 17:08:49.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drag_and_drop/Makefile.in	2007-11-05 20:58:43.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20092,9 +17640,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drawingarea/arcs/Makefile.in gtkmm-2.12.1/examples/book/drawingarea/arcs/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drawingarea/arcs/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drawingarea/arcs/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drawingarea/arcs/Makefile.in gtkmm-2.12.2/examples/book/drawingarea/arcs/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drawingarea/arcs/Makefile.in	2007-11-05 17:08:50.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drawingarea/arcs/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20103,9 +17651,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drawingarea/clock/Makefile.in gtkmm-2.12.1/examples/book/drawingarea/clock/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drawingarea/clock/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drawingarea/clock/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drawingarea/clock/Makefile.in gtkmm-2.12.2/examples/book/drawingarea/clock/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drawingarea/clock/Makefile.in	2007-11-05 17:08:50.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drawingarea/clock/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20114,9 +17662,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drawingarea/curve/Makefile.in gtkmm-2.12.1/examples/book/drawingarea/curve/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drawingarea/curve/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drawingarea/curve/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drawingarea/curve/Makefile.in gtkmm-2.12.2/examples/book/drawingarea/curve/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drawingarea/curve/Makefile.in	2007-11-05 17:08:50.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drawingarea/curve/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20125,9 +17673,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drawingarea/joins/Makefile.in gtkmm-2.12.1/examples/book/drawingarea/joins/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drawingarea/joins/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drawingarea/joins/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drawingarea/joins/Makefile.in gtkmm-2.12.2/examples/book/drawingarea/joins/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drawingarea/joins/Makefile.in	2007-11-05 17:08:50.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drawingarea/joins/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20136,9 +17684,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drawingarea/Makefile.in gtkmm-2.12.1/examples/book/drawingarea/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drawingarea/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drawingarea/Makefile.in	2007-10-16 20:05:26.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drawingarea/Makefile.in gtkmm-2.12.2/examples/book/drawingarea/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drawingarea/Makefile.in	2007-11-05 17:08:49.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drawingarea/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20147,9 +17695,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/drawingarea/simple/Makefile.in gtkmm-2.12.1/examples/book/drawingarea/simple/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/drawingarea/simple/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/drawingarea/simple/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/drawingarea/simple/Makefile.in gtkmm-2.12.2/examples/book/drawingarea/simple/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/drawingarea/simple/Makefile.in	2007-11-05 17:08:50.000000000 +0800
++++ gtkmm-2.12.2/examples/book/drawingarea/simple/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20158,9 +17706,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/entry/completion/Makefile.in gtkmm-2.12.1/examples/book/entry/completion/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/entry/completion/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/entry/completion/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/entry/completion/Makefile.in gtkmm-2.12.2/examples/book/entry/completion/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/entry/completion/Makefile.in	2007-11-05 17:08:51.000000000 +0800
++++ gtkmm-2.12.2/examples/book/entry/completion/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20169,9 +17717,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/entry/Makefile.in gtkmm-2.12.1/examples/book/entry/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/entry/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/entry/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/entry/Makefile.in gtkmm-2.12.2/examples/book/entry/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/entry/Makefile.in	2007-11-05 17:08:51.000000000 +0800
++++ gtkmm-2.12.2/examples/book/entry/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20180,9 +17728,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/entry/simple/Makefile.in gtkmm-2.12.1/examples/book/entry/simple/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/entry/simple/Makefile.in	2007-10-05 16:14:16.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/entry/simple/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/entry/simple/Makefile.in gtkmm-2.12.2/examples/book/entry/simple/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/entry/simple/Makefile.in	2007-11-05 17:08:51.000000000 +0800
++++ gtkmm-2.12.2/examples/book/entry/simple/Makefile.in	2007-11-05 20:58:44.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20191,9 +17739,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/eventbox/Makefile.in gtkmm-2.12.1/examples/book/eventbox/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/eventbox/Makefile.in	2007-10-05 16:14:17.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/eventbox/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/eventbox/Makefile.in gtkmm-2.12.2/examples/book/eventbox/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/eventbox/Makefile.in	2007-11-05 17:08:51.000000000 +0800
++++ gtkmm-2.12.2/examples/book/eventbox/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20202,9 +17750,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/expander/Makefile.in gtkmm-2.12.1/examples/book/expander/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/expander/Makefile.in	2007-10-05 16:14:17.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/expander/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/expander/Makefile.in gtkmm-2.12.2/examples/book/expander/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/expander/Makefile.in	2007-11-05 17:08:51.000000000 +0800
++++ gtkmm-2.12.2/examples/book/expander/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20213,9 +17761,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/frame/Makefile.in gtkmm-2.12.1/examples/book/frame/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/frame/Makefile.in	2007-10-05 16:14:17.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/frame/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/frame/Makefile.in gtkmm-2.12.2/examples/book/frame/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/frame/Makefile.in	2007-11-05 17:08:52.000000000 +0800
++++ gtkmm-2.12.2/examples/book/frame/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20224,9 +17772,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/helloworld/Makefile.in gtkmm-2.12.1/examples/book/helloworld/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/helloworld/Makefile.in	2007-10-05 16:14:17.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/helloworld/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/helloworld/Makefile.in gtkmm-2.12.2/examples/book/helloworld/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/helloworld/Makefile.in	2007-11-05 17:08:52.000000000 +0800
++++ gtkmm-2.12.2/examples/book/helloworld/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20235,9 +17783,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/helloworld2/Makefile.in gtkmm-2.12.1/examples/book/helloworld2/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/helloworld2/Makefile.in	2007-10-05 16:14:17.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/helloworld2/Makefile.in	2007-10-16 20:05:27.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/helloworld2/Makefile.in gtkmm-2.12.2/examples/book/helloworld2/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/helloworld2/Makefile.in	2007-11-05 17:08:52.000000000 +0800
++++ gtkmm-2.12.2/examples/book/helloworld2/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20246,9 +17794,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/iconview/Makefile.in gtkmm-2.12.1/examples/book/iconview/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/iconview/Makefile.in	2007-10-05 16:14:17.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/iconview/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/iconview/Makefile.in gtkmm-2.12.2/examples/book/iconview/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/iconview/Makefile.in	2007-11-05 17:08:52.000000000 +0800
++++ gtkmm-2.12.2/examples/book/iconview/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20257,9 +17805,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/idle/Makefile.in gtkmm-2.12.1/examples/book/idle/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/idle/Makefile.in	2007-10-05 16:14:18.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/idle/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/idle/Makefile.in gtkmm-2.12.2/examples/book/idle/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/idle/Makefile.in	2007-11-05 17:08:53.000000000 +0800
++++ gtkmm-2.12.2/examples/book/idle/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20268,9 +17816,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/input/Makefile.in gtkmm-2.12.1/examples/book/input/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/input/Makefile.in	2007-10-05 16:14:18.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/input/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/input/Makefile.in gtkmm-2.12.2/examples/book/input/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/input/Makefile.in	2007-11-05 17:08:53.000000000 +0800
++++ gtkmm-2.12.2/examples/book/input/Makefile.in	2007-11-05 20:58:45.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20279,9 +17827,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/label/Makefile.in gtkmm-2.12.1/examples/book/label/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/label/Makefile.in	2007-10-05 16:14:18.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/label/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/label/Makefile.in gtkmm-2.12.2/examples/book/label/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/label/Makefile.in	2007-11-05 17:08:53.000000000 +0800
++++ gtkmm-2.12.2/examples/book/label/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20290,9 +17838,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/Makefile.in gtkmm-2.12.1/examples/book/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/Makefile.in gtkmm-2.12.2/examples/book/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/Makefile.in	2007-11-05 17:08:42.000000000 +0800
++++ gtkmm-2.12.2/examples/book/Makefile.in	2007-11-05 20:58:40.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20301,9 +17849,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/menus/main_menu/Makefile.in gtkmm-2.12.1/examples/book/menus/main_menu/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/menus/main_menu/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/menus/main_menu/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/menus/main_menu/Makefile.in gtkmm-2.12.2/examples/book/menus/main_menu/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/menus/main_menu/Makefile.in	2007-11-05 17:08:53.000000000 +0800
++++ gtkmm-2.12.2/examples/book/menus/main_menu/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20312,9 +17860,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/menus/Makefile.in gtkmm-2.12.1/examples/book/menus/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/menus/Makefile.in	2007-10-05 16:14:18.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/menus/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/menus/Makefile.in gtkmm-2.12.2/examples/book/menus/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/menus/Makefile.in	2007-11-05 17:08:53.000000000 +0800
++++ gtkmm-2.12.2/examples/book/menus/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20323,9 +17871,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/menus/popup/Makefile.in gtkmm-2.12.1/examples/book/menus/popup/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/menus/popup/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/menus/popup/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/menus/popup/Makefile.in gtkmm-2.12.2/examples/book/menus/popup/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/menus/popup/Makefile.in	2007-11-05 17:08:54.000000000 +0800
++++ gtkmm-2.12.2/examples/book/menus/popup/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20334,9 +17882,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/menus_and_toolbars/Makefile.in gtkmm-2.12.1/examples/book/menus_and_toolbars/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/menus_and_toolbars/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/menus_and_toolbars/Makefile.in	2007-10-16 20:05:28.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/menus_and_toolbars/Makefile.in gtkmm-2.12.2/examples/book/menus_and_toolbars/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/menus_and_toolbars/Makefile.in	2007-11-05 17:08:54.000000000 +0800
++++ gtkmm-2.12.2/examples/book/menus_and_toolbars/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20345,9 +17893,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/notebook/Makefile.in gtkmm-2.12.1/examples/book/notebook/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/notebook/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/notebook/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/notebook/Makefile.in gtkmm-2.12.2/examples/book/notebook/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/notebook/Makefile.in	2007-11-05 17:08:54.000000000 +0800
++++ gtkmm-2.12.2/examples/book/notebook/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20356,9 +17904,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/paned/Makefile.in gtkmm-2.12.1/examples/book/paned/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/paned/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/paned/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/paned/Makefile.in gtkmm-2.12.2/examples/book/paned/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/paned/Makefile.in	2007-11-05 17:08:54.000000000 +0800
++++ gtkmm-2.12.2/examples/book/paned/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20367,9 +17915,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/printing/advanced/Makefile.in gtkmm-2.12.1/examples/book/printing/advanced/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/printing/advanced/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/printing/advanced/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/printing/advanced/Makefile.in gtkmm-2.12.2/examples/book/printing/advanced/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/printing/advanced/Makefile.in	2007-11-05 17:08:55.000000000 +0800
++++ gtkmm-2.12.2/examples/book/printing/advanced/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20378,9 +17926,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/printing/Makefile.in gtkmm-2.12.1/examples/book/printing/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/printing/Makefile.in	2007-10-05 16:14:19.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/printing/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/printing/Makefile.in gtkmm-2.12.2/examples/book/printing/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/printing/Makefile.in	2007-11-05 17:08:55.000000000 +0800
++++ gtkmm-2.12.2/examples/book/printing/Makefile.in	2007-11-05 20:58:46.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20389,9 +17937,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/printing/simple/Makefile.in gtkmm-2.12.1/examples/book/printing/simple/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/printing/simple/Makefile.in	2007-10-05 16:14:20.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/printing/simple/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/printing/simple/Makefile.in gtkmm-2.12.2/examples/book/printing/simple/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/printing/simple/Makefile.in	2007-11-05 17:08:55.000000000 +0800
++++ gtkmm-2.12.2/examples/book/printing/simple/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20400,9 +17948,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/progressbar/Makefile.in gtkmm-2.12.1/examples/book/progressbar/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/progressbar/Makefile.in	2007-10-05 16:14:20.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/progressbar/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/progressbar/Makefile.in gtkmm-2.12.2/examples/book/progressbar/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/progressbar/Makefile.in	2007-11-05 17:08:56.000000000 +0800
++++ gtkmm-2.12.2/examples/book/progressbar/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20411,9 +17959,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/range_widgets/Makefile.in gtkmm-2.12.1/examples/book/range_widgets/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/range_widgets/Makefile.in	2007-10-05 16:14:20.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/range_widgets/Makefile.in	2007-10-16 20:05:29.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/range_widgets/Makefile.in gtkmm-2.12.2/examples/book/range_widgets/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/range_widgets/Makefile.in	2007-11-05 17:08:56.000000000 +0800
++++ gtkmm-2.12.2/examples/book/range_widgets/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20422,9 +17970,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/recent_files/Makefile.in gtkmm-2.12.1/examples/book/recent_files/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/recent_files/Makefile.in	2007-10-05 16:14:20.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/recent_files/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/recent_files/Makefile.in gtkmm-2.12.2/examples/book/recent_files/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/recent_files/Makefile.in	2007-11-05 17:08:56.000000000 +0800
++++ gtkmm-2.12.2/examples/book/recent_files/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20433,9 +17981,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/scrolledwindow/Makefile.in gtkmm-2.12.1/examples/book/scrolledwindow/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/scrolledwindow/Makefile.in	2007-10-05 16:14:20.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/scrolledwindow/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/scrolledwindow/Makefile.in gtkmm-2.12.2/examples/book/scrolledwindow/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/scrolledwindow/Makefile.in	2007-11-05 17:08:57.000000000 +0800
++++ gtkmm-2.12.2/examples/book/scrolledwindow/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20444,9 +17992,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/signals/custom/Makefile.in gtkmm-2.12.1/examples/book/signals/custom/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/signals/custom/Makefile.in	2007-10-05 16:14:21.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/signals/custom/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/signals/custom/Makefile.in gtkmm-2.12.2/examples/book/signals/custom/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/signals/custom/Makefile.in	2007-11-05 17:08:57.000000000 +0800
++++ gtkmm-2.12.2/examples/book/signals/custom/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20455,9 +18003,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/signals/Makefile.in gtkmm-2.12.1/examples/book/signals/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/signals/Makefile.in	2007-10-05 16:14:20.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/signals/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/signals/Makefile.in gtkmm-2.12.2/examples/book/signals/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/signals/Makefile.in	2007-11-05 17:08:57.000000000 +0800
++++ gtkmm-2.12.2/examples/book/signals/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20466,9 +18014,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/socket/Makefile.in gtkmm-2.12.1/examples/book/socket/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/socket/Makefile.in	2007-10-05 16:14:21.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/socket/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/socket/Makefile.in gtkmm-2.12.2/examples/book/socket/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/socket/Makefile.in	2007-11-05 17:08:57.000000000 +0800
++++ gtkmm-2.12.2/examples/book/socket/Makefile.in	2007-11-05 20:58:47.000000000 +0800
 @@ -154,6 +154,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20477,9 +18025,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/spinbutton/Makefile.in gtkmm-2.12.1/examples/book/spinbutton/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/spinbutton/Makefile.in	2007-10-05 16:14:21.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/spinbutton/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/spinbutton/Makefile.in gtkmm-2.12.2/examples/book/spinbutton/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/spinbutton/Makefile.in	2007-11-05 17:08:58.000000000 +0800
++++ gtkmm-2.12.2/examples/book/spinbutton/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20488,9 +18036,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/statusicon/Makefile.in gtkmm-2.12.1/examples/book/statusicon/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/statusicon/Makefile.in	2007-10-05 16:14:21.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/statusicon/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/statusicon/Makefile.in gtkmm-2.12.2/examples/book/statusicon/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/statusicon/Makefile.in	2007-11-05 17:08:58.000000000 +0800
++++ gtkmm-2.12.2/examples/book/statusicon/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20499,9 +18047,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/table/Makefile.in gtkmm-2.12.1/examples/book/table/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/table/Makefile.in	2007-10-05 16:14:21.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/table/Makefile.in	2007-10-16 20:05:30.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/table/Makefile.in gtkmm-2.12.2/examples/book/table/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/table/Makefile.in	2007-11-05 17:08:58.000000000 +0800
++++ gtkmm-2.12.2/examples/book/table/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20510,9 +18058,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/textview/Makefile.in gtkmm-2.12.1/examples/book/textview/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/textview/Makefile.in	2007-10-05 16:14:21.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/textview/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/textview/Makefile.in gtkmm-2.12.2/examples/book/textview/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/textview/Makefile.in	2007-11-05 17:08:58.000000000 +0800
++++ gtkmm-2.12.2/examples/book/textview/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20521,9 +18069,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/timeout/Makefile.in gtkmm-2.12.1/examples/book/timeout/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/timeout/Makefile.in	2007-10-05 16:14:22.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/timeout/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/timeout/Makefile.in gtkmm-2.12.2/examples/book/timeout/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/timeout/Makefile.in	2007-11-05 17:08:59.000000000 +0800
++++ gtkmm-2.12.2/examples/book/timeout/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20532,9 +18080,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/toolbar/Makefile.in gtkmm-2.12.1/examples/book/toolbar/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/toolbar/Makefile.in	2007-10-05 16:14:22.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/toolbar/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/toolbar/Makefile.in gtkmm-2.12.2/examples/book/toolbar/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/toolbar/Makefile.in	2007-11-05 17:08:59.000000000 +0800
++++ gtkmm-2.12.2/examples/book/toolbar/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20543,9 +18091,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/tooltips/Makefile.in gtkmm-2.12.1/examples/book/tooltips/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/tooltips/Makefile.in	2007-10-05 16:14:22.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/tooltips/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/tooltips/Makefile.in gtkmm-2.12.2/examples/book/tooltips/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/tooltips/Makefile.in	2007-11-05 17:08:59.000000000 +0800
++++ gtkmm-2.12.2/examples/book/tooltips/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20554,9 +18102,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/combo_renderer/Makefile.in gtkmm-2.12.1/examples/book/treeview/combo_renderer/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/combo_renderer/Makefile.in	2007-10-05 16:14:22.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/combo_renderer/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/combo_renderer/Makefile.in gtkmm-2.12.2/examples/book/treeview/combo_renderer/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/combo_renderer/Makefile.in	2007-11-05 17:08:59.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/combo_renderer/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20565,9 +18113,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/drag_and_drop/Makefile.in gtkmm-2.12.1/examples/book/treeview/drag_and_drop/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/drag_and_drop/Makefile.in	2007-10-05 16:14:22.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/drag_and_drop/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/drag_and_drop/Makefile.in gtkmm-2.12.2/examples/book/treeview/drag_and_drop/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/drag_and_drop/Makefile.in	2007-11-05 17:09:00.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/drag_and_drop/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20576,9 +18124,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/editable_cells/Makefile.in gtkmm-2.12.1/examples/book/treeview/editable_cells/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/editable_cells/Makefile.in	2007-10-05 16:14:23.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/editable_cells/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/editable_cells/Makefile.in gtkmm-2.12.2/examples/book/treeview/editable_cells/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/editable_cells/Makefile.in	2007-11-05 17:09:00.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/editable_cells/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20587,9 +18135,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/filter/Makefile.in gtkmm-2.12.1/examples/book/treeview/filter/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/filter/Makefile.in	2007-10-05 16:14:23.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/filter/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/filter/Makefile.in gtkmm-2.12.2/examples/book/treeview/filter/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/filter/Makefile.in	2007-11-05 17:09:00.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/filter/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20598,9 +18146,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/filter_modify/Makefile.in gtkmm-2.12.1/examples/book/treeview/filter_modify/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/filter_modify/Makefile.in	2007-10-05 16:14:23.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/filter_modify/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/filter_modify/Makefile.in gtkmm-2.12.2/examples/book/treeview/filter_modify/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/filter_modify/Makefile.in	2007-11-05 17:09:00.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/filter_modify/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20609,9 +18157,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/list/Makefile.in gtkmm-2.12.1/examples/book/treeview/list/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/list/Makefile.in	2007-10-05 16:14:23.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/list/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/list/Makefile.in gtkmm-2.12.2/examples/book/treeview/list/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/list/Makefile.in	2007-11-05 17:09:01.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/list/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20620,9 +18168,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/listviewtext/Makefile.in gtkmm-2.12.1/examples/book/treeview/listviewtext/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/listviewtext/Makefile.in	2007-10-05 16:14:23.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/listviewtext/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/listviewtext/Makefile.in gtkmm-2.12.2/examples/book/treeview/listviewtext/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/listviewtext/Makefile.in	2007-11-05 17:09:01.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/listviewtext/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20631,9 +18179,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/Makefile.in gtkmm-2.12.1/examples/book/treeview/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/Makefile.in	2007-10-05 16:14:22.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/Makefile.in	2007-10-16 20:05:31.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/Makefile.in gtkmm-2.12.2/examples/book/treeview/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/Makefile.in	2007-11-05 17:08:59.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/Makefile.in	2007-11-05 20:58:48.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20642,9 +18190,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/modelsort/Makefile.in gtkmm-2.12.1/examples/book/treeview/modelsort/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/modelsort/Makefile.in	2007-10-05 16:14:23.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/modelsort/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/modelsort/Makefile.in gtkmm-2.12.2/examples/book/treeview/modelsort/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/modelsort/Makefile.in	2007-11-05 17:09:01.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/modelsort/Makefile.in	2007-11-05 20:58:49.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20653,9 +18201,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/popup/Makefile.in gtkmm-2.12.1/examples/book/treeview/popup/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/popup/Makefile.in	2007-10-05 16:14:24.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/popup/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/popup/Makefile.in gtkmm-2.12.2/examples/book/treeview/popup/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/popup/Makefile.in	2007-11-05 17:09:01.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/popup/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20664,9 +18212,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/treeview/tree/Makefile.in gtkmm-2.12.1/examples/book/treeview/tree/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/treeview/tree/Makefile.in	2007-10-05 16:14:24.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/treeview/tree/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/treeview/tree/Makefile.in gtkmm-2.12.2/examples/book/treeview/tree/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/treeview/tree/Makefile.in	2007-11-05 17:09:02.000000000 +0800
++++ gtkmm-2.12.2/examples/book/treeview/tree/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20675,9 +18223,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/book/update_ui/Makefile.in gtkmm-2.12.1/examples/book/update_ui/Makefile.in
---- gtkmm-2.12.1.orig/examples/book/update_ui/Makefile.in	2007-10-05 16:14:24.000000000 +0800
-+++ gtkmm-2.12.1/examples/book/update_ui/Makefile.in	2007-10-16 20:05:32.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/book/update_ui/Makefile.in gtkmm-2.12.2/examples/book/update_ui/Makefile.in
+--- gtkmm-2.12.2.orig/examples/book/update_ui/Makefile.in	2007-11-05 17:09:02.000000000 +0800
++++ gtkmm-2.12.2/examples/book/update_ui/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20686,9 +18234,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/calendar/Makefile.in gtkmm-2.12.1/examples/calendar/Makefile.in
---- gtkmm-2.12.1.orig/examples/calendar/Makefile.in	2007-10-05 16:14:24.000000000 +0800
-+++ gtkmm-2.12.1/examples/calendar/Makefile.in	2007-10-16 20:05:33.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/calendar/Makefile.in gtkmm-2.12.2/examples/calendar/Makefile.in
+--- gtkmm-2.12.2.orig/examples/calendar/Makefile.in	2007-11-05 17:09:02.000000000 +0800
++++ gtkmm-2.12.2/examples/calendar/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20697,9 +18245,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/dnd/Makefile.in gtkmm-2.12.1/examples/dnd/Makefile.in
---- gtkmm-2.12.1.orig/examples/dnd/Makefile.in	2007-10-05 16:14:24.000000000 +0800
-+++ gtkmm-2.12.1/examples/dnd/Makefile.in	2007-10-16 20:05:33.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/dnd/Makefile.in gtkmm-2.12.2/examples/dnd/Makefile.in
+--- gtkmm-2.12.2.orig/examples/dnd/Makefile.in	2007-11-05 17:09:02.000000000 +0800
++++ gtkmm-2.12.2/examples/dnd/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20708,9 +18256,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/exception/Makefile.in gtkmm-2.12.1/examples/exception/Makefile.in
---- gtkmm-2.12.1.orig/examples/exception/Makefile.in	2007-10-05 16:14:24.000000000 +0800
-+++ gtkmm-2.12.1/examples/exception/Makefile.in	2007-10-16 20:05:33.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/exception/Makefile.in gtkmm-2.12.2/examples/exception/Makefile.in
+--- gtkmm-2.12.2.orig/examples/exception/Makefile.in	2007-11-05 17:09:03.000000000 +0800
++++ gtkmm-2.12.2/examples/exception/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20719,9 +18267,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/gdk/Makefile.in gtkmm-2.12.1/examples/gdk/Makefile.in
---- gtkmm-2.12.1.orig/examples/gdk/Makefile.in	2007-10-05 16:14:25.000000000 +0800
-+++ gtkmm-2.12.1/examples/gdk/Makefile.in	2007-10-16 20:05:33.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/gdk/Makefile.in gtkmm-2.12.2/examples/gdk/Makefile.in
+--- gtkmm-2.12.2.orig/examples/gdk/Makefile.in	2007-11-05 17:09:03.000000000 +0800
++++ gtkmm-2.12.2/examples/gdk/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20730,9 +18278,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/Makefile.in gtkmm-2.12.1/examples/Makefile.in
---- gtkmm-2.12.1.orig/examples/Makefile.in	2007-10-05 16:14:11.000000000 +0800
-+++ gtkmm-2.12.1/examples/Makefile.in	2007-10-16 20:05:22.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/Makefile.in gtkmm-2.12.2/examples/Makefile.in
+--- gtkmm-2.12.2.orig/examples/Makefile.in	2007-11-05 17:08:41.000000000 +0800
++++ gtkmm-2.12.2/examples/Makefile.in	2007-11-05 20:58:39.000000000 +0800
 @@ -142,6 +142,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20741,9 +18289,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/rulers/Makefile.in gtkmm-2.12.1/examples/rulers/Makefile.in
---- gtkmm-2.12.1.orig/examples/rulers/Makefile.in	2007-10-05 16:14:25.000000000 +0800
-+++ gtkmm-2.12.1/examples/rulers/Makefile.in	2007-10-16 20:05:33.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/rulers/Makefile.in gtkmm-2.12.2/examples/rulers/Makefile.in
+--- gtkmm-2.12.2.orig/examples/rulers/Makefile.in	2007-11-05 17:09:03.000000000 +0800
++++ gtkmm-2.12.2/examples/rulers/Makefile.in	2007-11-05 20:58:50.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20752,9 +18300,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/statusbar/Makefile.in gtkmm-2.12.1/examples/statusbar/Makefile.in
---- gtkmm-2.12.1.orig/examples/statusbar/Makefile.in	2007-10-05 16:14:25.000000000 +0800
-+++ gtkmm-2.12.1/examples/statusbar/Makefile.in	2007-10-16 20:05:33.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/statusbar/Makefile.in gtkmm-2.12.2/examples/statusbar/Makefile.in
+--- gtkmm-2.12.2.orig/examples/statusbar/Makefile.in	2007-11-05 17:09:04.000000000 +0800
++++ gtkmm-2.12.2/examples/statusbar/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20763,9 +18311,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/stock/Makefile.in gtkmm-2.12.1/examples/stock/Makefile.in
---- gtkmm-2.12.1.orig/examples/stock/Makefile.in	2007-10-05 16:14:25.000000000 +0800
-+++ gtkmm-2.12.1/examples/stock/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/stock/Makefile.in gtkmm-2.12.2/examples/stock/Makefile.in
+--- gtkmm-2.12.2.orig/examples/stock/Makefile.in	2007-11-05 17:09:04.000000000 +0800
++++ gtkmm-2.12.2/examples/stock/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20774,9 +18322,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/tictactoe/Makefile.in gtkmm-2.12.1/examples/tictactoe/Makefile.in
---- gtkmm-2.12.1.orig/examples/tictactoe/Makefile.in	2007-10-05 16:14:25.000000000 +0800
-+++ gtkmm-2.12.1/examples/tictactoe/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/tictactoe/Makefile.in gtkmm-2.12.2/examples/tictactoe/Makefile.in
+--- gtkmm-2.12.2.orig/examples/tictactoe/Makefile.in	2007-11-05 17:09:04.000000000 +0800
++++ gtkmm-2.12.2/examples/tictactoe/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20785,9 +18333,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/treemodelcustom/Makefile.in gtkmm-2.12.1/examples/treemodelcustom/Makefile.in
---- gtkmm-2.12.1.orig/examples/treemodelcustom/Makefile.in	2007-10-05 16:14:25.000000000 +0800
-+++ gtkmm-2.12.1/examples/treemodelcustom/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/treemodelcustom/Makefile.in gtkmm-2.12.2/examples/treemodelcustom/Makefile.in
+--- gtkmm-2.12.2.orig/examples/treemodelcustom/Makefile.in	2007-11-05 17:09:05.000000000 +0800
++++ gtkmm-2.12.2/examples/treemodelcustom/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -161,6 +161,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20796,9 +18344,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/examples/window/Makefile.in gtkmm-2.12.1/examples/window/Makefile.in
---- gtkmm-2.12.1.orig/examples/window/Makefile.in	2007-10-05 16:14:26.000000000 +0800
-+++ gtkmm-2.12.1/examples/window/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/examples/window/Makefile.in gtkmm-2.12.2/examples/window/Makefile.in
+--- gtkmm-2.12.2.orig/examples/window/Makefile.in	2007-11-05 17:09:05.000000000 +0800
++++ gtkmm-2.12.2/examples/window/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20807,9 +18355,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gdk/gdkmm/Makefile.in gtkmm-2.12.1/gdk/gdkmm/Makefile.in
---- gtkmm-2.12.1.orig/gdk/gdkmm/Makefile.in	2007-10-05 16:14:26.000000000 +0800
-+++ gtkmm-2.12.1/gdk/gdkmm/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gdk/gdkmm/Makefile.in gtkmm-2.12.2/gdk/gdkmm/Makefile.in
+--- gtkmm-2.12.2.orig/gdk/gdkmm/Makefile.in	2007-11-05 17:09:05.000000000 +0800
++++ gtkmm-2.12.2/gdk/gdkmm/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -206,6 +206,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20818,9 +18366,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gdk/gdkmm/private/Makefile.in gtkmm-2.12.1/gdk/gdkmm/private/Makefile.in
---- gtkmm-2.12.1.orig/gdk/gdkmm/private/Makefile.in	2007-10-05 16:14:26.000000000 +0800
-+++ gtkmm-2.12.1/gdk/gdkmm/private/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gdk/gdkmm/private/Makefile.in gtkmm-2.12.2/gdk/gdkmm/private/Makefile.in
+--- gtkmm-2.12.2.orig/gdk/gdkmm/private/Makefile.in	2007-11-05 17:09:06.000000000 +0800
++++ gtkmm-2.12.2/gdk/gdkmm/private/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -150,6 +150,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20829,9 +18377,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gdk/Makefile.in gtkmm-2.12.1/gdk/Makefile.in
---- gtkmm-2.12.1.orig/gdk/Makefile.in	2007-10-05 16:14:26.000000000 +0800
-+++ gtkmm-2.12.1/gdk/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gdk/Makefile.in gtkmm-2.12.2/gdk/Makefile.in
+--- gtkmm-2.12.2.orig/gdk/Makefile.in	2007-11-05 17:09:05.000000000 +0800
++++ gtkmm-2.12.2/gdk/Makefile.in	2007-11-05 20:58:51.000000000 +0800
 @@ -157,6 +157,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20840,9 +18388,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gdk/src/Makefile.in gtkmm-2.12.1/gdk/src/Makefile.in
---- gtkmm-2.12.1.orig/gdk/src/Makefile.in	2007-10-05 16:14:26.000000000 +0800
-+++ gtkmm-2.12.1/gdk/src/Makefile.in	2007-10-16 20:05:34.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gdk/src/Makefile.in gtkmm-2.12.2/gdk/src/Makefile.in
+--- gtkmm-2.12.2.orig/gdk/src/Makefile.in	2007-11-05 17:09:06.000000000 +0800
++++ gtkmm-2.12.2/gdk/src/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20851,9 +18399,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gtk/gtkmm/Makefile.in gtkmm-2.12.1/gtk/gtkmm/Makefile.in
---- gtkmm-2.12.1.orig/gtk/gtkmm/Makefile.in	2007-10-05 16:14:27.000000000 +0800
-+++ gtkmm-2.12.1/gtk/gtkmm/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gtk/gtkmm/Makefile.in gtkmm-2.12.2/gtk/gtkmm/Makefile.in
+--- gtkmm-2.12.2.orig/gtk/gtkmm/Makefile.in	2007-11-05 17:09:07.000000000 +0800
++++ gtkmm-2.12.2/gtk/gtkmm/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -290,6 +290,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20862,9 +18410,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gtk/gtkmm/private/Makefile.in gtkmm-2.12.1/gtk/gtkmm/private/Makefile.in
---- gtkmm-2.12.1.orig/gtk/gtkmm/private/Makefile.in	2007-10-05 16:14:27.000000000 +0800
-+++ gtkmm-2.12.1/gtk/gtkmm/private/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gtk/gtkmm/private/Makefile.in gtkmm-2.12.2/gtk/gtkmm/private/Makefile.in
+--- gtkmm-2.12.2.orig/gtk/gtkmm/private/Makefile.in	2007-11-05 17:09:07.000000000 +0800
++++ gtkmm-2.12.2/gtk/gtkmm/private/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -150,6 +150,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20873,9 +18421,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gtk/Makefile.in gtkmm-2.12.1/gtk/Makefile.in
---- gtkmm-2.12.1.orig/gtk/Makefile.in	2007-10-05 16:14:26.000000000 +0800
-+++ gtkmm-2.12.1/gtk/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gtk/Makefile.in gtkmm-2.12.2/gtk/Makefile.in
+--- gtkmm-2.12.2.orig/gtk/Makefile.in	2007-11-05 17:09:06.000000000 +0800
++++ gtkmm-2.12.2/gtk/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -157,6 +157,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20884,9 +18432,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/gtk/src/Makefile.in gtkmm-2.12.1/gtk/src/Makefile.in
---- gtkmm-2.12.1.orig/gtk/src/Makefile.in	2007-10-05 16:14:27.000000000 +0800
-+++ gtkmm-2.12.1/gtk/src/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/gtk/src/Makefile.in gtkmm-2.12.2/gtk/src/Makefile.in
+--- gtkmm-2.12.2.orig/gtk/src/Makefile.in	2007-11-05 17:09:07.000000000 +0800
++++ gtkmm-2.12.2/gtk/src/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20895,9 +18443,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/Makefile.in gtkmm-2.12.1/Makefile.in
---- gtkmm-2.12.1.orig/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/Makefile.in gtkmm-2.12.2/Makefile.in
+--- gtkmm-2.12.2.orig/Makefile.in	2007-11-05 17:08:39.000000000 +0800
++++ gtkmm-2.12.2/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -155,6 +155,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20906,85 +18454,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/atkmm/atkmm.rc gtkmm-2.12.1/MSVC_Net2003/atkmm/atkmm.rc
---- gtkmm-2.12.1.orig/MSVC_Net2003/atkmm/atkmm.rc	2007-10-05 16:14:48.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/atkmm/atkmm.rc	1970-01-01 08:00:00.000000000 +0800
-@@ -1,72 +0,0 @@
--#include "resource.h"
--
--#define APSTUDIO_READONLY_SYMBOLS
--
--#include "afxres.h"
--
--#undef APSTUDIO_READONLY_SYMBOLS
--
--#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
--#ifdef _WIN32
--LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
--#pragma code_page(1252)
--#endif //_WIN32
--
--#ifdef APSTUDIO_INVOKED
--
--1 TEXTINCLUDE 
--BEGIN
--    "resource.h\0"
--END
--
--2 TEXTINCLUDE 
--BEGIN
--    "#include ""afxres.h""\r\n"
--    "\0"
--END
--
--3 TEXTINCLUDE 
--BEGIN
--    "\r\n"
--    "\0"
--END
--
--#endif    // APSTUDIO_INVOKED
--
--VS_VERSION_INFO VERSIONINFO
-- FILEVERSION 2,12,1,1
-- PRODUCTVERSION 2,12,1,1
-- FILEFLAGSMASK 0x17L
--#ifdef _DEBUG
-- FILEFLAGS 0x1L
--#else
-- FILEFLAGS 0x0L
--#endif
-- FILEOS 0x4L
-- FILETYPE 0x2L
-- FILESUBTYPE 0x0L
--BEGIN
--    BLOCK "StringFileInfo"
--    BEGIN
--        BLOCK "040904b0"
--        BEGIN
--            VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
--            VALUE "FileDescription", "The official C++ wrapper for atk"
--            VALUE "FileVersion", "2.12.1"
--            VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
--            VALUE "OriginalFilename", "atkmm-1.6"
--            VALUE "ProductName", "gtkmm"
--            VALUE "ProductVersion", "2.12.1"
--        END
--    END
--    BLOCK "VarFileInfo"
--    BEGIN
--        VALUE "Translation", 0x409, 1200
--    END
--END
--
--#endif    // English (U.S.) resources
--
--#ifndef APSTUDIO_INVOKED
--
--#endif    // not APSTUDIO_INVOKED
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/atkmm/Makefile.in gtkmm-2.12.1/MSVC_Net2003/atkmm/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/atkmm/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/atkmm/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/atkmm/Makefile.in gtkmm-2.12.2/MSVC_Net2003/atkmm/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/atkmm/Makefile.in	2007-11-05 17:08:34.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/atkmm/Makefile.in	2007-11-05 20:58:36.000000000 +0800
 @@ -130,6 +130,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -20993,9 +18465,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/demos/gtk-demo/Makefile.in gtkmm-2.12.1/MSVC_Net2003/demos/gtk-demo/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/demos/gtk-demo/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/demos/gtk-demo/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/demos/gtk-demo/Makefile.in gtkmm-2.12.2/MSVC_Net2003/demos/gtk-demo/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/demos/gtk-demo/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/demos/gtk-demo/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21004,9 +18476,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/demos/Makefile.in gtkmm-2.12.1/MSVC_Net2003/demos/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/demos/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/demos/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/demos/Makefile.in gtkmm-2.12.2/MSVC_Net2003/demos/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/demos/Makefile.in	2007-11-05 17:08:34.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/demos/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21015,9 +18487,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/arrow/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/arrow/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/arrow/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/arrow/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/arrow/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/arrow/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/arrow/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/arrow/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21026,9 +18498,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/calendar/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/calendar/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/calendar/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/calendar/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/calendar/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/calendar/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/calendar/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/calendar/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21037,9 +18509,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21048,9 +18520,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21059,9 +18531,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/direction/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/direction/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/direction/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/direction/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/direction/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/direction/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/direction/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/direction/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21070,9 +18542,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/dnd/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/dnd/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/dnd/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/dnd/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/dnd/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/dnd/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/dnd/Makefile.in	2007-11-05 17:08:36.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/dnd/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21081,9 +18553,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/exception/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/exception/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/exception/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/exception/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/exception/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/exception/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/exception/Makefile.in	2007-11-05 17:08:36.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/exception/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21092,9 +18564,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/gdk/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/gdk/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/gdk/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/gdk/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/gdk/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/gdk/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/gdk/Makefile.in	2007-11-05 17:08:36.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/gdk/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21103,9 +18575,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/Makefile.in	2007-11-05 17:08:35.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21114,9 +18586,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/printing/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/printing/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/printing/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/printing/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/printing/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/printing/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/printing/Makefile.in	2007-11-05 17:08:36.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/printing/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21125,9 +18597,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/rulers/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/rulers/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/rulers/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/rulers/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/rulers/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/rulers/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/rulers/Makefile.in	2007-11-05 17:08:36.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/rulers/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21136,9 +18608,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/statusbar/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/statusbar/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/statusbar/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/statusbar/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/statusbar/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/statusbar/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/statusbar/Makefile.in	2007-11-05 17:08:36.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/statusbar/Makefile.in	2007-11-05 20:58:37.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21147,9 +18619,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/stock/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/stock/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/stock/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/stock/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/stock/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/stock/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/stock/Makefile.in	2007-11-05 17:08:37.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/stock/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21158,9 +18630,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/tictactoe/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/tictactoe/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/tictactoe/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/tictactoe/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/tictactoe/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/tictactoe/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/tictactoe/Makefile.in	2007-11-05 17:08:37.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/tictactoe/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21169,9 +18641,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/treemodelcustom/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/treemodelcustom/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/treemodelcustom/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/treemodelcustom/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/treemodelcustom/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/treemodelcustom/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/treemodelcustom/Makefile.in	2007-11-05 17:08:37.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/treemodelcustom/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21180,9 +18652,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/examples/window/Makefile.in gtkmm-2.12.1/MSVC_Net2003/examples/window/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/examples/window/Makefile.in	2007-10-05 16:14:07.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/examples/window/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/examples/window/Makefile.in gtkmm-2.12.2/MSVC_Net2003/examples/window/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/examples/window/Makefile.in	2007-11-05 17:08:38.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/examples/window/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21191,97 +18663,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gdkmm/gdkmmconfig.h gtkmm-2.12.1/MSVC_Net2003/gdkmm/gdkmmconfig.h
---- gtkmm-2.12.1.orig/MSVC_Net2003/gdkmm/gdkmmconfig.h	2007-10-05 16:44:25.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gdkmm/gdkmmconfig.h	1970-01-01 08:00:00.000000000 +0800
-@@ -1,8 +0,0 @@
--/* gdk/gdkmmconfig.h.  Generated from gdkmmconfig.h.in by configure.  */
--#ifndef _GDKMM_CONFIG_H
--#define _GDKMM_CONFIG_H 1
--
--#include <glibmmconfig.h>
--
--#endif /* _GDKMM_CONFIG_H */
--
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gdkmm/gdkmm.rc gtkmm-2.12.1/MSVC_Net2003/gdkmm/gdkmm.rc
---- gtkmm-2.12.1.orig/MSVC_Net2003/gdkmm/gdkmm.rc	2007-10-05 16:14:49.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gdkmm/gdkmm.rc	1970-01-01 08:00:00.000000000 +0800
-@@ -1,72 +0,0 @@
--#include "resource.h"
--
--#define APSTUDIO_READONLY_SYMBOLS
--
--#include "afxres.h"
--
--#undef APSTUDIO_READONLY_SYMBOLS
--
--#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
--#ifdef _WIN32
--LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
--#pragma code_page(1252)
--#endif //_WIN32
--
--#ifdef APSTUDIO_INVOKED
--
--1 TEXTINCLUDE 
--BEGIN
--    "resource.h\0"
--END
--
--2 TEXTINCLUDE 
--BEGIN
--    "#include ""afxres.h""\r\n"
--    "\0"
--END
--
--3 TEXTINCLUDE 
--BEGIN
--    "\r\n"
--    "\0"
--END
--
--#endif    // APSTUDIO_INVOKED
--
--VS_VERSION_INFO VERSIONINFO
-- FILEVERSION 2,12,1,1
-- PRODUCTVERSION 2,12,1,1
-- FILEFLAGSMASK 0x17L
--#ifdef _DEBUG
-- FILEFLAGS 0x1L
--#else
-- FILEFLAGS 0x0L
--#endif
-- FILEOS 0x4L
-- FILETYPE 0x2L
-- FILESUBTYPE 0x0L
--BEGIN
--    BLOCK "StringFileInfo"
--    BEGIN
--        BLOCK "040904b0"
--        BEGIN
--            VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
--            VALUE "FileDescription", "The official C++ wrapper for gdk"
--            VALUE "FileVersion", "2.12.1"
--            VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
--            VALUE "OriginalFilename", "gdkmm-2.4"
--            VALUE "ProductName", "gtkmm"
--            VALUE "ProductVersion", "2.12.1"
--        END
--    END
--    BLOCK "VarFileInfo"
--    BEGIN
--        VALUE "Translation", 0x409, 1200
--    END
--END
--
--#endif    // English (U.S.) resources
--
--#ifndef APSTUDIO_INVOKED
--
--#endif    // not APSTUDIO_INVOKED
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gdkmm/Makefile.in gtkmm-2.12.1/MSVC_Net2003/gdkmm/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/gdkmm/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gdkmm/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/gdkmm/Makefile.in gtkmm-2.12.2/MSVC_Net2003/gdkmm/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/gdkmm/Makefile.in	2007-11-05 17:08:38.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/gdkmm/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -130,6 +130,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21290,9 +18674,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gendef/Makefile.in gtkmm-2.12.1/MSVC_Net2003/gendef/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/gendef/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gendef/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/gendef/Makefile.in gtkmm-2.12.2/MSVC_Net2003/gendef/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/gendef/Makefile.in	2007-11-05 17:08:38.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/gendef/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -129,6 +129,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21301,137 +18685,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gtkmm/gtkmmconfig.h gtkmm-2.12.1/MSVC_Net2003/gtkmm/gtkmmconfig.h
---- gtkmm-2.12.1.orig/MSVC_Net2003/gtkmm/gtkmmconfig.h	2007-10-05 16:44:26.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gtkmm/gtkmmconfig.h	1970-01-01 08:00:00.000000000 +0800
-@@ -1,48 +0,0 @@
--/* gtk/gtkmmconfig.h.  Generated from gtkmmconfig.h.in by configure.  */
--#ifndef _GTKMM_CONFIG_H
--#define _GTKMM_CONFIG_H 1
--
--#include <gdkmmconfig.h>
--
--/* version numbers */
--#define GTKMM_MAJOR_VERSION 2
--#define GTKMM_MINOR_VERSION 12
--#define GTKMM_MICRO_VERSION 1
--
--#define GTKMM_ATKMM_ENABLED 1
--/* #undef GTKMM_MAEMO_EXTENSIONS_ENABLED */
--
--
--#ifdef GLIBMM_CONFIGURE
--/* compiler feature tests that are used during compile time and run-time
--   by gtkmm only. */
--
--/* SUN Forte, AIX, and Tru64 have the problem with flockfile and
--   funlockfile - configure finds it but the compiler can not find it
--   while compiling demowindow.cc. undef HAVE_FLOCKFILE and
--   HAVE_FUNLOCKFILE for now, so that it builds on those platforms. */
--	
--#define HAVE_FLOCKFILE 1
--#define HAVE_FUNLOCKFILE 1
--#define HAVE_MKFIFO 1
--/* #undef GETC_UNLOCKED */
--
--#endif /* GLIBMM_CONFIGURE */
--
--
--#ifdef GLIBMM_DLL
--  #if defined(GTKMM_BUILD) && defined(_WINDLL)
--    // Do not dllexport as it is handled by gendef on MSVC
--    #define GTKMM_API 
--  #elif !defined(GTKMM_BUILD)
--    #define GTKMM_API __declspec(dllimport)
--  #else
--    /* Build a static library */
--    #define GTKMM_API
--  #endif /* GTKMM_BUILD - _WINDLL */
--#else
--  #define GTKMM_API
--#endif /* GLIBMM_DLL */
--
--#endif /* _GTKMM_CONFIG_H */
--
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gtkmm/gtkmm.rc gtkmm-2.12.1/MSVC_Net2003/gtkmm/gtkmm.rc
---- gtkmm-2.12.1.orig/MSVC_Net2003/gtkmm/gtkmm.rc	2007-10-05 16:14:49.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gtkmm/gtkmm.rc	1970-01-01 08:00:00.000000000 +0800
-@@ -1,72 +0,0 @@
--#include "resource.h"
--
--#define APSTUDIO_READONLY_SYMBOLS
--
--#include "afxres.h"
--
--#undef APSTUDIO_READONLY_SYMBOLS
--
--#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
--#ifdef _WIN32
--LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
--#pragma code_page(1252)
--#endif //_WIN32
--
--#ifdef APSTUDIO_INVOKED
--
--1 TEXTINCLUDE 
--BEGIN
--    "resource.h\0"
--END
--
--2 TEXTINCLUDE 
--BEGIN
--    "#include ""afxres.h""\r\n"
--    "\0"
--END
--
--3 TEXTINCLUDE 
--BEGIN
--    "\r\n"
--    "\0"
--END
--
--#endif    // APSTUDIO_INVOKED
--
--VS_VERSION_INFO VERSIONINFO
-- FILEVERSION 2,12,1,1
-- PRODUCTVERSION 2,12,1,1
-- FILEFLAGSMASK 0x17L
--#ifdef _DEBUG
-- FILEFLAGS 0x1L
--#else
-- FILEFLAGS 0x0L
--#endif
-- FILEOS 0x4L
-- FILETYPE 0x2L
-- FILESUBTYPE 0x0L
--BEGIN
--    BLOCK "StringFileInfo"
--    BEGIN
--        BLOCK "040904b0"
--        BEGIN
--            VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
--            VALUE "FileDescription", "The official C++ wrapper for gtk+"
--            VALUE "FileVersion", "2.12.1"
--            VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
--            VALUE "OriginalFilename", "gtkmm-2.4"
--            VALUE "ProductName", "gtkmm"
--            VALUE "ProductVersion", "2.12.1"
--        END
--    END
--    BLOCK "VarFileInfo"
--    BEGIN
--        VALUE "Translation", 0x409, 1200
--    END
--END
--
--#endif    // English (U.S.) resources
--
--#ifndef APSTUDIO_INVOKED
--
--#endif    // not APSTUDIO_INVOKED
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/gtkmm/Makefile.in gtkmm-2.12.1/MSVC_Net2003/gtkmm/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/gtkmm/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/gtkmm/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/gtkmm/Makefile.in gtkmm-2.12.2/MSVC_Net2003/gtkmm/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/gtkmm/Makefile.in	2007-11-05 17:08:38.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/gtkmm/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -130,6 +130,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21440,9 +18696,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/Makefile.in gtkmm-2.12.1/MSVC_Net2003/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/Makefile.in	2007-10-05 16:14:06.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/Makefile.in	2007-10-16 20:05:19.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/Makefile.in gtkmm-2.12.2/MSVC_Net2003/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/Makefile.in	2007-11-05 17:08:34.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/Makefile.in	2007-11-05 20:58:36.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21451,9 +18707,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/pangomm/Makefile.in gtkmm-2.12.1/MSVC_Net2003/pangomm/Makefile.in
---- gtkmm-2.12.1.orig/MSVC_Net2003/pangomm/Makefile.in	2007-10-05 16:14:08.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/pangomm/Makefile.in	2007-10-16 20:05:20.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/MSVC_Net2003/pangomm/Makefile.in gtkmm-2.12.2/MSVC_Net2003/pangomm/Makefile.in
+--- gtkmm-2.12.2.orig/MSVC_Net2003/pangomm/Makefile.in	2007-11-05 17:08:38.000000000 +0800
++++ gtkmm-2.12.2/MSVC_Net2003/pangomm/Makefile.in	2007-11-05 20:58:38.000000000 +0800
 @@ -130,6 +130,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21462,85 +18718,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/MSVC_Net2003/pangomm/pangomm.rc gtkmm-2.12.1/MSVC_Net2003/pangomm/pangomm.rc
---- gtkmm-2.12.1.orig/MSVC_Net2003/pangomm/pangomm.rc	2007-10-05 16:14:48.000000000 +0800
-+++ gtkmm-2.12.1/MSVC_Net2003/pangomm/pangomm.rc	1970-01-01 08:00:00.000000000 +0800
-@@ -1,72 +0,0 @@
--#include "resource.h"
--
--#define APSTUDIO_READONLY_SYMBOLS
--
--#include "afxres.h"
--
--#undef APSTUDIO_READONLY_SYMBOLS
--
--#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
--#ifdef _WIN32
--LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
--#pragma code_page(1252)
--#endif //_WIN32
--
--#ifdef APSTUDIO_INVOKED
--
--1 TEXTINCLUDE 
--BEGIN
--    "resource.h\0"
--END
--
--2 TEXTINCLUDE 
--BEGIN
--    "#include ""afxres.h""\r\n"
--    "\0"
--END
--
--3 TEXTINCLUDE 
--BEGIN
--    "\r\n"
--    "\0"
--END
--
--#endif    // APSTUDIO_INVOKED
--
--VS_VERSION_INFO VERSIONINFO
-- FILEVERSION 2,12,1,1
-- PRODUCTVERSION 2,12,1,1
-- FILEFLAGSMASK 0x17L
--#ifdef _DEBUG
-- FILEFLAGS 0x1L
--#else
-- FILEFLAGS 0x0L
--#endif
-- FILEOS 0x4L
-- FILETYPE 0x2L
-- FILESUBTYPE 0x0L
--BEGIN
--    BLOCK "StringFileInfo"
--    BEGIN
--        BLOCK "040904b0"
--        BEGIN
--            VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
--            VALUE "FileDescription", "The official C++ wrapper for pango"
--            VALUE "FileVersion", "2.12.1"
--            VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
--            VALUE "OriginalFilename", "pangomm-1.4"
--            VALUE "ProductName", "gtkmm"
--            VALUE "ProductVersion", "2.12.1"
--        END
--    END
--    BLOCK "VarFileInfo"
--    BEGIN
--        VALUE "Translation", 0x409, 1200
--    END
--END
--
--#endif    // English (U.S.) resources
--
--#ifndef APSTUDIO_INVOKED
--
--#endif    // not APSTUDIO_INVOKED
-diff -Naur gtkmm-2.12.1.orig/pango/Makefile.in gtkmm-2.12.1/pango/Makefile.in
---- gtkmm-2.12.1.orig/pango/Makefile.in	2007-10-05 16:14:27.000000000 +0800
-+++ gtkmm-2.12.1/pango/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/pango/Makefile.in gtkmm-2.12.2/pango/Makefile.in
+--- gtkmm-2.12.2.orig/pango/Makefile.in	2007-11-05 17:09:07.000000000 +0800
++++ gtkmm-2.12.2/pango/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21549,9 +18729,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/pango/pangomm/Makefile.in gtkmm-2.12.1/pango/pangomm/Makefile.in
---- gtkmm-2.12.1.orig/pango/pangomm/Makefile.in	2007-10-05 16:14:27.000000000 +0800
-+++ gtkmm-2.12.1/pango/pangomm/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/pango/pangomm/Makefile.in gtkmm-2.12.2/pango/pangomm/Makefile.in
+--- gtkmm-2.12.2.orig/pango/pangomm/Makefile.in	2007-11-05 17:09:08.000000000 +0800
++++ gtkmm-2.12.2/pango/pangomm/Makefile.in	2007-11-05 20:58:52.000000000 +0800
 @@ -206,6 +206,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21560,9 +18740,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/pango/pangomm/private/Makefile.in gtkmm-2.12.1/pango/pangomm/private/Makefile.in
---- gtkmm-2.12.1.orig/pango/pangomm/private/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/pango/pangomm/private/Makefile.in	2007-10-16 20:05:35.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/pango/pangomm/private/Makefile.in gtkmm-2.12.2/pango/pangomm/private/Makefile.in
+--- gtkmm-2.12.2.orig/pango/pangomm/private/Makefile.in	2007-11-05 17:09:08.000000000 +0800
++++ gtkmm-2.12.2/pango/pangomm/private/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -150,6 +150,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21571,9 +18751,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/pango/src/Makefile.in gtkmm-2.12.1/pango/src/Makefile.in
---- gtkmm-2.12.1.orig/pango/src/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/pango/src/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/pango/src/Makefile.in gtkmm-2.12.2/pango/src/Makefile.in
+--- gtkmm-2.12.2.orig/pango/src/Makefile.in	2007-11-05 17:09:08.000000000 +0800
++++ gtkmm-2.12.2/pango/src/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -140,6 +140,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21582,9 +18762,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/scripts/Makefile.in gtkmm-2.12.1/scripts/Makefile.in
---- gtkmm-2.12.1.orig/scripts/Makefile.in	2007-10-05 16:14:30.000000000 +0800
-+++ gtkmm-2.12.1/scripts/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/scripts/Makefile.in gtkmm-2.12.2/scripts/Makefile.in
+--- gtkmm-2.12.2.orig/scripts/Makefile.in	2007-11-05 17:09:11.000000000 +0800
++++ gtkmm-2.12.2/scripts/Makefile.in	2007-11-05 20:58:55.000000000 +0800
 @@ -130,6 +130,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21593,9 +18773,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/child_widget/Makefile.in gtkmm-2.12.1/tests/child_widget/Makefile.in
---- gtkmm-2.12.1.orig/tests/child_widget/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/tests/child_widget/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/child_widget/Makefile.in gtkmm-2.12.2/tests/child_widget/Makefile.in
+--- gtkmm-2.12.2.orig/tests/child_widget/Makefile.in	2007-11-05 17:09:08.000000000 +0800
++++ gtkmm-2.12.2/tests/child_widget/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -160,6 +160,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21604,9 +18784,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/child_widget2/Makefile.in gtkmm-2.12.1/tests/child_widget2/Makefile.in
---- gtkmm-2.12.1.orig/tests/child_widget2/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/tests/child_widget2/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/child_widget2/Makefile.in gtkmm-2.12.2/tests/child_widget2/Makefile.in
+--- gtkmm-2.12.2.orig/tests/child_widget2/Makefile.in	2007-11-05 17:09:08.000000000 +0800
++++ gtkmm-2.12.2/tests/child_widget2/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21615,9 +18795,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/child_widget_managed/Makefile.in gtkmm-2.12.1/tests/child_widget_managed/Makefile.in
---- gtkmm-2.12.1.orig/tests/child_widget_managed/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/tests/child_widget_managed/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/child_widget_managed/Makefile.in gtkmm-2.12.2/tests/child_widget_managed/Makefile.in
+--- gtkmm-2.12.2.orig/tests/child_widget_managed/Makefile.in	2007-11-05 17:09:09.000000000 +0800
++++ gtkmm-2.12.2/tests/child_widget_managed/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21626,9 +18806,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/delete_cpp_child/Makefile.in gtkmm-2.12.1/tests/delete_cpp_child/Makefile.in
---- gtkmm-2.12.1.orig/tests/delete_cpp_child/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/tests/delete_cpp_child/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/delete_cpp_child/Makefile.in gtkmm-2.12.2/tests/delete_cpp_child/Makefile.in
+--- gtkmm-2.12.2.orig/tests/delete_cpp_child/Makefile.in	2007-11-05 17:09:09.000000000 +0800
++++ gtkmm-2.12.2/tests/delete_cpp_child/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21637,9 +18817,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/dialog/Makefile.in gtkmm-2.12.1/tests/dialog/Makefile.in
---- gtkmm-2.12.1.orig/tests/dialog/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/tests/dialog/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/dialog/Makefile.in gtkmm-2.12.2/tests/dialog/Makefile.in
+--- gtkmm-2.12.2.orig/tests/dialog/Makefile.in	2007-11-05 17:09:09.000000000 +0800
++++ gtkmm-2.12.2/tests/dialog/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21648,9 +18828,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/dialog_deletethis/Makefile.in gtkmm-2.12.1/tests/dialog_deletethis/Makefile.in
---- gtkmm-2.12.1.orig/tests/dialog_deletethis/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/dialog_deletethis/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/dialog_deletethis/Makefile.in gtkmm-2.12.2/tests/dialog_deletethis/Makefile.in
+--- gtkmm-2.12.2.orig/tests/dialog_deletethis/Makefile.in	2007-11-05 17:09:09.000000000 +0800
++++ gtkmm-2.12.2/tests/dialog_deletethis/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21659,9 +18839,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/main_with_options/Makefile.in gtkmm-2.12.1/tests/main_with_options/Makefile.in
---- gtkmm-2.12.1.orig/tests/main_with_options/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/main_with_options/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/main_with_options/Makefile.in gtkmm-2.12.2/tests/main_with_options/Makefile.in
+--- gtkmm-2.12.2.orig/tests/main_with_options/Makefile.in	2007-11-05 17:09:09.000000000 +0800
++++ gtkmm-2.12.2/tests/main_with_options/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -151,6 +151,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21670,9 +18850,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/Makefile.in gtkmm-2.12.1/tests/Makefile.in
---- gtkmm-2.12.1.orig/tests/Makefile.in	2007-10-05 16:14:28.000000000 +0800
-+++ gtkmm-2.12.1/tests/Makefile.in	2007-10-16 20:05:36.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/Makefile.in gtkmm-2.12.2/tests/Makefile.in
+--- gtkmm-2.12.2.orig/tests/Makefile.in	2007-11-05 17:09:08.000000000 +0800
++++ gtkmm-2.12.2/tests/Makefile.in	2007-11-05 20:58:53.000000000 +0800
 @@ -141,6 +141,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21681,9 +18861,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/menu_destruction/Makefile.in gtkmm-2.12.1/tests/menu_destruction/Makefile.in
---- gtkmm-2.12.1.orig/tests/menu_destruction/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/menu_destruction/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/menu_destruction/Makefile.in gtkmm-2.12.2/tests/menu_destruction/Makefile.in
+--- gtkmm-2.12.2.orig/tests/menu_destruction/Makefile.in	2007-11-05 17:09:09.000000000 +0800
++++ gtkmm-2.12.2/tests/menu_destruction/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21692,9 +18872,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/property_notification/Makefile.in gtkmm-2.12.1/tests/property_notification/Makefile.in
---- gtkmm-2.12.1.orig/tests/property_notification/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/property_notification/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/property_notification/Makefile.in gtkmm-2.12.2/tests/property_notification/Makefile.in
+--- gtkmm-2.12.2.orig/tests/property_notification/Makefile.in	2007-11-05 17:09:10.000000000 +0800
++++ gtkmm-2.12.2/tests/property_notification/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21703,9 +18883,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/refcount_dialog/Makefile.in gtkmm-2.12.1/tests/refcount_dialog/Makefile.in
---- gtkmm-2.12.1.orig/tests/refcount_dialog/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/refcount_dialog/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/refcount_dialog/Makefile.in gtkmm-2.12.2/tests/refcount_dialog/Makefile.in
+--- gtkmm-2.12.2.orig/tests/refcount_dialog/Makefile.in	2007-11-05 17:09:10.000000000 +0800
++++ gtkmm-2.12.2/tests/refcount_dialog/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21714,9 +18894,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/scrolledwindow/Makefile.in gtkmm-2.12.1/tests/scrolledwindow/Makefile.in
---- gtkmm-2.12.1.orig/tests/scrolledwindow/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/scrolledwindow/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/scrolledwindow/Makefile.in gtkmm-2.12.2/tests/scrolledwindow/Makefile.in
+--- gtkmm-2.12.2.orig/tests/scrolledwindow/Makefile.in	2007-11-05 17:09:10.000000000 +0800
++++ gtkmm-2.12.2/tests/scrolledwindow/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21725,9 +18905,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tests/wrap_existing/Makefile.in gtkmm-2.12.1/tests/wrap_existing/Makefile.in
---- gtkmm-2.12.1.orig/tests/wrap_existing/Makefile.in	2007-10-05 16:14:29.000000000 +0800
-+++ gtkmm-2.12.1/tests/wrap_existing/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tests/wrap_existing/Makefile.in gtkmm-2.12.2/tests/wrap_existing/Makefile.in
+--- gtkmm-2.12.2.orig/tests/wrap_existing/Makefile.in	2007-11-05 17:09:10.000000000 +0800
++++ gtkmm-2.12.2/tests/wrap_existing/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -156,6 +156,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21736,9 +18916,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tools/extra_defs_gen/Makefile.in gtkmm-2.12.1/tools/extra_defs_gen/Makefile.in
---- gtkmm-2.12.1.orig/tools/extra_defs_gen/Makefile.in	2007-10-05 16:14:30.000000000 +0800
-+++ gtkmm-2.12.1/tools/extra_defs_gen/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tools/extra_defs_gen/Makefile.in gtkmm-2.12.2/tools/extra_defs_gen/Makefile.in
+--- gtkmm-2.12.2.orig/tools/extra_defs_gen/Makefile.in	2007-11-05 17:09:11.000000000 +0800
++++ gtkmm-2.12.2/tools/extra_defs_gen/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -152,6 +152,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21747,9 +18927,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tools/m4/Makefile.in gtkmm-2.12.1/tools/m4/Makefile.in
---- gtkmm-2.12.1.orig/tools/m4/Makefile.in	2007-10-05 16:14:30.000000000 +0800
-+++ gtkmm-2.12.1/tools/m4/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tools/m4/Makefile.in gtkmm-2.12.2/tools/m4/Makefile.in
+--- gtkmm-2.12.2.orig/tools/m4/Makefile.in	2007-11-05 17:09:11.000000000 +0800
++++ gtkmm-2.12.2/tools/m4/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -143,6 +143,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@
@@ -21758,9 +18938,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
-diff -Naur gtkmm-2.12.1.orig/tools/Makefile.in gtkmm-2.12.1/tools/Makefile.in
---- gtkmm-2.12.1.orig/tools/Makefile.in	2007-10-05 16:14:30.000000000 +0800
-+++ gtkmm-2.12.1/tools/Makefile.in	2007-10-16 20:05:37.000000000 +0800
+diff -Naur gtkmm-2.12.2.orig/tools/Makefile.in gtkmm-2.12.2/tools/Makefile.in
+--- gtkmm-2.12.2.orig/tools/Makefile.in	2007-11-05 17:09:10.000000000 +0800
++++ gtkmm-2.12.2/tools/Makefile.in	2007-11-05 20:58:54.000000000 +0800
 @@ -144,6 +144,7 @@
  PERL_PATH = @PERL_PATH@
  PKG_CONFIG = @PKG_CONFIG@




More information about the pkg-gnome-commits mailing list